From a7f8f8edd4c950f94bba54890410195a8e91cb57 Mon Sep 17 00:00:00 2001 From: Lukas Eipert Date: Tue, 30 Oct 2018 17:56:10 +0100 Subject: [PATCH 1/2] Fix gitlab-qa image with mirror --- Dockerfile.gitlab-qa | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.gitlab-qa b/Dockerfile.gitlab-qa index 69b4494..dd868de 100644 --- a/Dockerfile.gitlab-qa +++ b/Dockerfile.gitlab-qa @@ -2,6 +2,7 @@ FROM ruby:2.4 WORKDIR /home/qa -RUN wget -q https://get.docker.com/builds/Linux/x86_64/docker-1.12.1.tgz && \ +RUN wget -q https://npm.taobao.org/mirrors/moby/Linux/x86_64/docker-1.12.1.tgz && \ tar -zxf docker-1.12.1.tgz && mv docker/docker /usr/local/bin/docker && \ + echo "0c6b9b39a87a82794f7165ce85860bacd7454171cd034f913b95e60f542716f0 /usr/local/bin/docker" | sha256sum -c - && \ rm docker-1.12.1.tgz From 5bd352d1961707032c5926e0597505eaf3ec8c00 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 30 Oct 2018 10:24:51 -0700 Subject: [PATCH 2/2] Bypass Cloudfront and use S3 bucket for Docker client Related issue: https://github.com/docker/for-linux/issues/470 --- Dockerfile.gitlab-qa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.gitlab-qa b/Dockerfile.gitlab-qa index dd868de..7b66906 100644 --- a/Dockerfile.gitlab-qa +++ b/Dockerfile.gitlab-qa @@ -2,7 +2,7 @@ FROM ruby:2.4 WORKDIR /home/qa -RUN wget -q https://npm.taobao.org/mirrors/moby/Linux/x86_64/docker-1.12.1.tgz && \ +RUN wget -q http://get.docker.com.s3.amazonaws.com/builds/Linux/x86_64/docker-1.12.1.tgz && \ tar -zxf docker-1.12.1.tgz && mv docker/docker /usr/local/bin/docker && \ echo "0c6b9b39a87a82794f7165ce85860bacd7454171cd034f913b95e60f542716f0 /usr/local/bin/docker" | sha256sum -c - && \ rm docker-1.12.1.tgz