Merge branch 'leipert-remove-docker-host' into 'master'

Resolve docker in docker problems See merge request gitlab-org/gitlab-ce!31417

Merge branch 'leipert-remove-docker-host' into 'master'
Resolve docker in docker problems See merge request gitlab-org/gitlab-ce!31417
0fec9a4f · Bob Van Landuyt · 6e031332 · 7b4c88ed · 0fec9a4f · 0fec9a4f
Commit 0fec9a4f authored Aug 02, 2019 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.gitlab/ci/frontend.gitlab-ci.yml .gitlab/ci/frontend.gitlab-ci.yml +1 -1

.gitlab/ci/review.gitlab-ci.yml .gitlab/ci/review.gitlab-ci.yml +1 -1

No files found.
--- 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"

--- 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