Skip to content
Snippets Groups Projects
Commit 44c2266f authored by Henrik tom Woerden's avatar Henrik tom Woerden
Browse files

fix gitlab ci by setting docker versions

parent 219ad8bb
No related branches found
No related tags found
No related merge requests found
...@@ -20,12 +20,14 @@ ...@@ -20,12 +20,14 @@
variables: variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-advanced-testenv CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-advanced-testenv
# With dind the docker deamon is available on the network
DOCKER_HOST: tcp://docker:2375/
# When using dind, it's wise to use the overlayfs driver for # When using dind, it's wise to use the overlayfs driver for
# improved performance. # improved performance.
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
services: services:
- docker:19.03-dind - docker:18.09.7-dind
stages: stages:
- setup - setup
...@@ -33,7 +35,7 @@ stages: ...@@ -33,7 +35,7 @@ stages:
- test - test
test: test:
tags: [thindind] tags: [notls]
stage: test stage: test
image: image:
name: docker/compose:1.24.1 name: docker/compose:1.24.1
...@@ -53,8 +55,8 @@ test: ...@@ -53,8 +55,8 @@ test:
- exit $rc - exit $rc
build-testenv: build-testenv:
tags: [docker] tags: [notls]
image: docker:19.03 image: docker:18.09
stage: setup stage: setup
script: script:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
...@@ -69,7 +71,7 @@ build-testenv: ...@@ -69,7 +71,7 @@ build-testenv:
style: style:
tags: [docker] tags: [notls]
stage: style stage: style
image: $CI_REGISTRY_IMAGE:latest image: $CI_REGISTRY_IMAGE:latest
script: script:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment