aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-09-23 09:36:38 +0000
committerGerrit Code Review <review@openstack.org>2019-09-23 09:36:38 +0000
commite3b2bb78084866a4b2c8966bacfd8ce47161dc18 (patch)
treef49e1b1fb1f7964ac321eda74bbbe4ade5c81c4e /tools
parent81c1f73511dc43e68af18140042b29dd726bad0d (diff)
parent1d0c1e51af4c125902efd09b2aaf06fb1977df6b (diff)
downloadkolla-e3b2bb78084866a4b2c8966bacfd8ce47161dc18.tar.gz
kolla-e3b2bb78084866a4b2c8966bacfd8ce47161dc18.zip
Merge "CI: Use docker mirror proxy"
Diffstat (limited to 'tools')
-rwxr-xr-xtools/setup_Debian.sh4
-rwxr-xr-xtools/setup_RedHat.sh10
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh
index 3a7e067c5..3fa8db98d 100755
--- a/tools/setup_Debian.sh
+++ b/tools/setup_Debian.sh
@@ -61,8 +61,8 @@ distro_codename=$(lsb_release -cs)
sudo apt-get update
sudo apt-get -y install apt-transport-https
-sudo add-apt-repository "deb https://download.docker.com/linux/${distro_id} ${distro_codename} stable"
-curl -fsSL https://download.docker.com/linux/${distro_id}/gpg | sudo apt-key add -
+sudo add-apt-repository "deb $DOCKER_REPOS_MIRROR_URL/${distro_id} ${distro_codename} stable"
+curl -fsSL $DOCKER_REPOS_MIRROR_URL/${distro_id}/gpg | sudo apt-key add -
sudo apt-get update
sudo apt-get -y install --no-install-recommends docker-ce
diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh
index 67f4ca9bb..1c96100a0 100755
--- a/tools/setup_RedHat.sh
+++ b/tools/setup_RedHat.sh
@@ -6,9 +6,13 @@ set -o errexit
# (SamYaple)TODO: Remove the path overriding
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-sudo yum-config-manager \
- --add-repo \
- https://download.docker.com/linux/centos/docker-ce.repo
+sudo tee /etc/yum.repos.d/docker-ce-stable.repo << EOF
+[docker-ce-stable]
+baseurl=$DOCKER_REPOS_MIRROR_URL/centos/7/\$basearch/stable
+enabled=1
+gpgcheck=1
+gpgkey=$DOCKER_REPOS_MIRROR_URL/centos/gpg
+EOF
sudo yum -y install libffi-devel openssl-devel docker-ce btrfs-progs