From ecc8a81db1bbb6006535ac8b859fca8050209b76 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Thu, 14 Jan 2021 13:38:08 +0000 Subject: [PATCH] Update Docker (CLI) to 20.10.2 in GitLab QA build images Signed-off-by: Takuya Noguchi --- Dockerfile.gitlab-qa-alpine-ruby-2.7 | 6 +++--- Dockerfile.gitlab-qa-alpine-ruby-3.0 | 6 +++--- Dockerfile.gitlab-qa-ruby-2.7 | 15 +++++++++++---- Dockerfile.gitlab-qa-ruby-3.0 | 15 +++++++++++---- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/Dockerfile.gitlab-qa-alpine-ruby-2.7 b/Dockerfile.gitlab-qa-alpine-ruby-2.7 index 96991ff..639d6c2 100644 --- a/Dockerfile.gitlab-qa-alpine-ruby-2.7 +++ b/Dockerfile.gitlab-qa-alpine-ruby-2.7 @@ -8,10 +8,10 @@ MAINTAINER GitLab Quality Team WORKDIR /home/qa -ENV DOCKER_VERSION="18.06.1" -ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}-ce.tgz" +ENV DOCKER_VERSION="20.10.2" +ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz" ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}" -ENV DOCKER_CHECKSUM="2d92728714d794f78619785a2c638b58b0b15e60b340de51886bf6d3730f31f0" +ENV DOCKER_CHECKSUM="893e0b05e347dee1d857022181831c6ec3798e9a49fda9a319b2f5a6fb79c42d" ENV DOCKER_BIN="/usr/local/bin/docker" # Install dependencies diff --git a/Dockerfile.gitlab-qa-alpine-ruby-3.0 b/Dockerfile.gitlab-qa-alpine-ruby-3.0 index 89b61c0..87e6901 100644 --- a/Dockerfile.gitlab-qa-alpine-ruby-3.0 +++ b/Dockerfile.gitlab-qa-alpine-ruby-3.0 @@ -8,10 +8,10 @@ MAINTAINER GitLab Quality Team WORKDIR /home/qa -ENV DOCKER_VERSION="18.06.1" -ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}-ce.tgz" +ENV DOCKER_VERSION="20.10.2" +ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz" ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}" -ENV DOCKER_CHECKSUM="2d92728714d794f78619785a2c638b58b0b15e60b340de51886bf6d3730f31f0" +ENV DOCKER_CHECKSUM="893e0b05e347dee1d857022181831c6ec3798e9a49fda9a319b2f5a6fb79c42d" ENV DOCKER_BIN="/usr/local/bin/docker" # Install dependencies diff --git a/Dockerfile.gitlab-qa-ruby-2.7 b/Dockerfile.gitlab-qa-ruby-2.7 index f23c553..9c5293a 100644 --- a/Dockerfile.gitlab-qa-ruby-2.7 +++ b/Dockerfile.gitlab-qa-ruby-2.7 @@ -6,7 +6,14 @@ ENV LANG C.UTF-8 WORKDIR /home/qa -RUN wget -q https://download.docker.com/linux/static/stable/x86_64/docker-19.03.1.tgz && \ - tar -zxf docker-19.03.1.tgz && mv docker/docker /usr/local/bin/docker && \ - echo "9b6191f64cb89e706dc29390408260d643e88f7f853d8878b2fb0360186b2ac3 /usr/local/bin/docker" | sha256sum -c - && \ - rm docker-19.03.1.tgz +ENV DOCKER_VERSION="20.10.2" +ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz" +ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}" +ENV DOCKER_CHECKSUM="893e0b05e347dee1d857022181831c6ec3798e9a49fda9a319b2f5a6fb79c42d" +ENV DOCKER_BIN="/usr/local/bin/docker" + +RUN wget -q ${DOCKER_URL} && \ + tar -zxf ${DOCKER_ARCHIVE} && \ + mv docker/docker ${DOCKER_BIN} && \ + echo "${DOCKER_CHECKSUM} ${DOCKER_BIN}" | sha256sum -c - && \ + rm ${DOCKER_ARCHIVE} diff --git a/Dockerfile.gitlab-qa-ruby-3.0 b/Dockerfile.gitlab-qa-ruby-3.0 index cda9991..39340f1 100644 --- a/Dockerfile.gitlab-qa-ruby-3.0 +++ b/Dockerfile.gitlab-qa-ruby-3.0 @@ -6,7 +6,14 @@ ENV LANG C.UTF-8 WORKDIR /home/qa -RUN wget -q https://download.docker.com/linux/static/stable/x86_64/docker-19.03.1.tgz && \ - tar -zxf docker-19.03.1.tgz && mv docker/docker /usr/local/bin/docker && \ - echo "9b6191f64cb89e706dc29390408260d643e88f7f853d8878b2fb0360186b2ac3 /usr/local/bin/docker" | sha256sum -c - && \ - rm docker-19.03.1.tgz +ENV DOCKER_VERSION="20.10.2" +ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz" +ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}" +ENV DOCKER_CHECKSUM="893e0b05e347dee1d857022181831c6ec3798e9a49fda9a319b2f5a6fb79c42d" +ENV DOCKER_BIN="/usr/local/bin/docker" + +RUN wget -q ${DOCKER_URL} && \ + tar -zxf ${DOCKER_ARCHIVE} && \ + mv docker/docker ${DOCKER_BIN} && \ + echo "${DOCKER_CHECKSUM} ${DOCKER_BIN}" | sha256sum -c - && \ + rm ${DOCKER_ARCHIVE}