Qualifying with new Centos8 Docker version.

1

@@ -0,0 +1,21 @@
+Qualifying with new Centos8 Docker version.
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# Date:      Wed Sep 23 14:50:09 2020 +0200
+#
+# On branch qualifyCentos82withdcos21
+# Changes to be committed:
+#	renamed:    centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/999-aws-ebs-nvme.rules -> centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/999-aws-ebs-nvme.rules
+#	renamed:    centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/cluster_profile.tfvars -> centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/cluster_profile.tfvars
+#	renamed:    centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/configure_dcos_system.sh -> centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/configure_dcos_system.sh
+#	renamed:    centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/dcos_images.yaml -> centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/dcos_images.yaml
+#	renamed:    centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/dcos_vol_setup.sh -> centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/dcos_vol_setup.sh
+#	renamed:    centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/ebs-nvme-mapping.sh -> centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/ebs-nvme-mapping.sh
+#	renamed:    centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/install_dcos_prerequisites.sh -> centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/install_dcos_prerequisites.sh
+#	renamed:    centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/install_dss_modules.sh -> centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/install_dss_modules.sh
+#	renamed:    centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/packer.json -> centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/packer.json
+#	renamed:    centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/packer_build_history.json -> centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/packer_build_history.json
+#	renamed:    centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/publish_and_test_config.yaml -> centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/publish_and_test_config.yaml
+#

centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/cluster_profile.tfvars → centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/cluster_profile.tfvars

@@ -13,7 +13,7 @@ num_of_masters = "1"
 num_of_private_agents = "2"
 num_of_public_agents = "1"
 
-custom_dcos_download_path = "https://downloads.dcos.io/dcos/stable/2.1.0/dcos_generate_config.sh"
+custom_dcos_download_path = "https://downloads.dcos.io/dcos/stable/2.1.1/dcos_generate_config.sh"
 enable_os_setup_script = false
 
 owner = "dcos-images"

centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/install_dcos_prerequisites.sh → centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/install_dcos_prerequisites.sh

@@ -3,10 +3,10 @@ sudo setenforce permissive && \
 sudo sed -i --follow-symlinks 's/^SELINUX=.*/SELINUX=permissive/g' /etc/sysconfig/selinux
 sudo tee /etc/yum.repos.d/docker.repo <<-'EOF'
 [dockerrepo]
-name=Docker Repository
-baseurl=https://download.docker.com/linux/centos/docker-ce.repo
+name=Docker CE Stable - $basearch
+baseurl=https://download.docker.com/linux/centos/8/$basearch/stable
 enabled=1
-gpgcheck=1
+gpgcheck=0
 gpgkey=https://download.docker.com/linux/centos/gpg
 EOF
 
@@ -17,15 +17,27 @@ ExecStart=
 ExecStart=/usr/bin/dockerd -H fd://
 EOF
 
+sudo yum remove docker \
+                  docker-client \
+                  docker-client-latest \
+                  docker-common \
+                  docker-latest \
+                  docker-latest-logrotate \
+                  docker-logrotate \
+                  docker-engine
+
 sudo yum install -y yum-utils \
   device-mapper-persistent-data \
   lvm2
 
-sudo yum-config-manager \
-    --add-repo \
-    https://download.docker.com/linux/centos/docker-ce.repo
+# Don't use this repo file because it is not containing centos 8 directories.
+#sudo yum-config-manager \
+#    --add-repo \
+#    https://download.docker.com/linux/centos/docker-ce.repo
 
-sudo yum install -y docker-ce-18.09.1 docker-ce-cli-18.09.1 containerd.io
+sudo yum install -y containerd.io-1.3.7
+sudo yum install -y docker-ce-19.03.13 docker-ce-cli-19.03.13
+sudo rm -rf /var/lib/docker
 sudo systemctl start docker
 sudo systemctl enable docker
 sudo yum install -y wget

centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive/packer.json → centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive/packer.json

@@ -14,7 +14,7 @@
       "secret_key": "{{user `aws_secret_key`}}",
       "ssh_username": "centos",
       "ami_name": "dcos-ami-{{timestamp}}",
-      "ami_description": "centos/8.2/aws/DCOS-2.1.0/docker-18.09.1-ce/selinux_permissive",
+      "ami_description": "centos/8.2/aws/DCOS-2.1.1/docker-19.03.13-ce/selinux_permissive",
       "ami_regions": [
         "us-west-2"
       ],