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

Update Docker CE to 19.03.1

Browse source 
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
This commit is contained in:
Takuya Noguchi 2019-08-12 13:18:20 +01:00
parent e46fa3a807
commit 1f1998947b
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.gitlab-ci.yml
View file

@ -68,11 +68,11 @@ ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-gr
ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-11-graphicsmagick-1.3.33 test: *test_custom
# gitlab:assets:compile step
ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-18.06.1 test: *test_custom
ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-19.03.1 test: *test_custom
# Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1 test: *test_custom
ruby-2.6.3-git-2.21-chrome-74.0-docker-18.06.1 test: *test_custom
ruby-2.4.5-git-2.18-chrome-69.0-docker-19.03.1 test: *test_custom
ruby-2.6.3-git-2.21-chrome-74.0-docker-19.03.1 test: *test_custom
# Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom
@ -117,11 +117,11 @@ ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-gr
ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-11-graphicsmagick-1.3.33: *build_and_deploy_custom
# gitlab:assets:compile step
ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-18.06.1: *build_and_deploy_custom
ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-19.03.1: *build_and_deploy_custom
# Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1: *build_and_deploy_custom
ruby-2.6.3-git-2.22-chrome-74.0-docker-18.06.1: *build_and_deploy_custom
ruby-2.4.5-git-2.18-chrome-69.0-docker-19.03.1: *build_and_deploy_custom
ruby-2.6.3-git-2.22-chrome-74.0-docker-19.03.1: *build_and_deploy_custom
# Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom

8
Dockerfile.gitlab-qa
View file

@ -2,7 +2,7 @@ FROM ruby:2.4
WORKDIR /home/qa
RUN wget -q https://download.docker.com/linux/static/stable/x86_64/docker-18.06.1-ce.tgz && \
tar -zxf docker-18.06.1-ce.tgz && mv docker/docker /usr/local/bin/docker && \
echo "2d92728714d794f78619785a2c638b58b0b15e60b340de51886bf6d3730f31f0 /usr/local/bin/docker" | sha256sum -c - && \
rm docker-18.06.1-ce.tgz
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

2
scripts/install-docker
View file

@ -21,7 +21,7 @@ apt-get update
PACKAGE_VERSION=$(apt-cache policy docker-ce | awk -v dv=${DOCKER_VERSION} '$1 ~ dv {print $1}')
apt-get install -y docker-ce=${PACKAGE_VERSION}
apt-get install -y docker-ce=${PACKAGE_VERSION} docker-ce-cli=${PACKAGE_VERSION}
apt-get -yq autoremove
apt-get clean -yqq
rm -rf /var/lib/apt/lists/*