From 1d0c1e51af4c125902efd09b2aaf06fb1977df6b Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Thu, 19 Sep 2019 09:09:05 +0200 Subject: CI: Use docker mirror proxy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TODO: Debian build still requires access to original repo. Change-Id: Ie4bac5334369a63793d36568a9d3a58a0cdc7667 Signed-off-by: Radosław Piliszek --- tools/setup_Debian.sh | 4 ++-- tools/setup_RedHat.sh | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'tools') 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 -- cgit v1.2.3