diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2019-08-02 14:28:50 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-08-05 15:38:47 +0000 |
| commit | db3ed5fe43e04ddbf729f7197339a4775b100e41 (patch) | |
| tree | 3b6165ab94375dda4e912aa1cce0e082db7c9f90 | |
| parent | 2f3800d291eb9afb3bb58f9b4aefac6d47b7c514 (diff) | |
| download | gitlab-ce-db3ed5fe43e04ddbf729f7197339a4775b100e41.tar.gz | |
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
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 2 |
2 files changed, 2 insertions, 2 deletions
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 |