NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-11 02:52:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '52-docker-cli-20.10.2' into 'master'

Browse source 
Update Docker (CLI) from 18.06/19.03 to 20.10.2 in GitLab QA build images

Closes #52

See merge request gitlab-org/gitlab-build-images!353
This commit is contained in:
Rémy Coutable 2021-01-18 11:03:12 +00:00
commit 00bf5fc02c
4 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile.gitlab-qa-alpine-ruby-2.7
View file

@ -8,10 +8,10 @@ MAINTAINER GitLab Quality Team
WORKDIR /home/qa WORKDIR /home/qa
ENV DOCKER_VERSION="18.06.1" ENV DOCKER_VERSION="20.10.2"
ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}-ce.tgz" ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz"
ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}" 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" ENV DOCKER_BIN="/usr/local/bin/docker"
# Install dependencies # Install dependencies

6
Dockerfile.gitlab-qa-alpine-ruby-3.0
View file

@ -8,10 +8,10 @@ MAINTAINER GitLab Quality Team
WORKDIR /home/qa WORKDIR /home/qa
ENV DOCKER_VERSION="18.06.1" ENV DOCKER_VERSION="20.10.2"
ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}-ce.tgz" ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz"
ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}" 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" ENV DOCKER_BIN="/usr/local/bin/docker"
# Install dependencies # Install dependencies

15
Dockerfile.gitlab-qa-ruby-2.7
View file

@ -6,7 +6,14 @@ ENV LANG C.UTF-8
WORKDIR /home/qa WORKDIR /home/qa
RUN wget -q https://download.docker.com/linux/static/stable/x86_64/docker-19.03.1.tgz && \ ENV DOCKER_VERSION="20.10.2"
tar -zxf docker-19.03.1.tgz && mv docker/docker /usr/local/bin/docker && \ ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz"
echo "9b6191f64cb89e706dc29390408260d643e88f7f853d8878b2fb0360186b2ac3 /usr/local/bin/docker" | sha256sum -c - && \ ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}"
rm docker-19.03.1.tgz 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}

15
Dockerfile.gitlab-qa-ruby-3.0
View file

@ -6,7 +6,14 @@ ENV LANG C.UTF-8
WORKDIR /home/qa WORKDIR /home/qa
RUN wget -q https://download.docker.com/linux/static/stable/x86_64/docker-19.03.1.tgz && \ ENV DOCKER_VERSION="20.10.2"
tar -zxf docker-19.03.1.tgz && mv docker/docker /usr/local/bin/docker && \ ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz"
echo "9b6191f64cb89e706dc29390408260d643e88f7f853d8878b2fb0360186b2ac3 /usr/local/bin/docker" | sha256sum -c - && \ ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}"
rm docker-19.03.1.tgz 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}