diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2019-08-02 14:28:50 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2019-08-02 14:28:50 +0000 |
| commit | 0fec9a4fc7fae7480a92d6402d3ad144b4bd7233 (patch) | |
| tree | a7ebb9a079e93e88042b5b55d169646accf93dc1 | |
| parent | 6e031332317c991e8ca47ed9ce10f3842059cf43 (diff) | |
| parent | 7b4c88edee1a7f41fd65eff59fb62e39dc641049 (diff) | |
| download | gitlab-ce-0fec9a4fc7fae7480a92d6402d3ad144b4bd7233.tar.gz | |
Merge branch 'leipert-remove-docker-host' into 'master'
Resolve docker in docker problems
See merge request gitlab-org/gitlab-ce!31417
| -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 2bdde9fedaf..a0db84bd25a 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 076858e6c8a..6b60c993640 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 |