From db3ed5fe43e04ddbf729f7197339a4775b100e41 Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Fri, 2 Aug 2019 14:28:50 +0000 Subject: Merge branch 'leipert-remove-docker-host' into 'master' Resolve docker in docker problems See merge request gitlab-org/gitlab-ce!31417 (cherry picked from commit 0fec9a4fc7fae7480a92d6402d3ad144b4bd7233) 7b4c88ed Use stable image version for dind --- .gitlab/ci/frontend.gitlab-ci.yml | 2 +- .gitlab/ci/review.gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '.gitlab/ci') diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 45a6a177943..b3e7c85385f 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -19,7 +19,7 @@ dependencies: - setup-test-env services: - - docker:stable-dind + - docker:19.03.0-dind variables: NODE_ENV: "production" RAILS_ENV: "production" diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 41d52c4e095..350644e2d2a 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -35,7 +35,7 @@ <<: *review-base image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine services: - - docker:stable-dind + - docker:19.03.0-dind tags: - gitlab-org - docker -- cgit v1.2.3