Skip to content

Commit

Permalink
Merge branch '65-build-fails' into 'master'
Browse files Browse the repository at this point in the history
Resolve "Build fails"

Closes #65

See merge request open/stapled!48
  • Loading branch information
Mart van Santen committed Aug 12, 2019
2 parents 4efdeae + 0e92278 commit 7fac046
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ variables:
build:compile-container:
image: docker:stable-git
services:
- docker:stable-dind
#- docker:stable-dind
- docker:18-dind # Hotfix for https://gitlab.com/gitlab-org/gitlab-runner/issues/4501
stage: build-containers
variables:
GIT_STRATEGY: fetch
Expand All @@ -33,7 +34,8 @@ build:test-container:
stage: build-containers
image: docker:stable-git
services:
- docker:stable-dind
#- docker:stable-dind
- docker:18-dind # Hotfix for https://gitlab.com/gitlab-org/gitlab-runner/issues/4501
variables:
GIT_STRATEGY: fetch
script:
Expand Down

0 comments on commit 7fac046

Please sign in to comment.