Revert "Revert "Switch to internal mirror for docker-ee packages""
This reverts commit af944c594a66a411adc2450d627c18817f44f899.
Related-Prod: PRODX-00000
Change-Id: I733573e0aa9867b8f07613db2ebca743bfbd1f8f
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 6f281a8..ffa401c 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -112,8 +112,8 @@
function install_docker {
function install_retry {
- curl --retry 6 --retry-delay 5 -fsSL "${DOCKER_URL}/ubuntu/gpg" | sudo apt-key add -
- add-apt-repository "deb [arch=amd64] ${DOCKER_URL}/ubuntu ${OS_CODENAME} ${DOCKER_RELEASE}"
+ curl --retry 6 --retry-delay 5 -fsSL "${DOCKER_URL}/gpg" | sudo apt-key add -
+ add-apt-repository "deb [arch=amd64] ${DOCKER_URL}/ ${OS_CODENAME} ${DOCKER_RELEASE}"
apt update
apt install -y ${DOCKER_PACKAGES}
}
@@ -271,13 +271,12 @@
cat << EOF >> /etc/iptables/rules.v4
-A DOCKER-USER -d ${net} -j ACCEPT
-A DOCKER-USER -s ${net} -j ACCEPT
--A DOCKER-USER -j RETURN
-COMMIT
EOF
done
cat << EOF >> /etc/iptables/rules.v4
-A DOCKER-USER -j RETURN
+COMMIT
EOF
sudo netfilter-persistent reload
}
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index d2c4048..6705980 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -140,7 +140,8 @@
default: ''
docker_ee_url:
type: string
- default: 'https://s3-us-west-2.amazonaws.com/internal-docker-ee-builds/docker-ee-linux'
+ default: 'http://mirror-us.mcp.mirantis.net/.snapshots/docker-ee-bionic-latest'
+# default: 'https://s3-us-west-2.amazonaws.com/internal-docker-ee-builds/docker-ee-linux/ubuntu'
docker_ee_release:
type: string
default: 'stable-19.03'