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

Merge branch 'fix_ci' into 'dev'

fix gitlab ci by setting docker versions

See merge request bmp-caosdb/caosdb-server!12
parents ab8ec4c9 df2f8f79
No related branches found
No related tags found
No related merge requests found
...@@ -24,14 +24,12 @@ ...@@ -24,14 +24,12 @@
variables: variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-server-testenv:latest CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-server-testenv:latest
# 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:dind - docker:19.03-dind
image: $CI_REGISTRY_IMAGE image: $CI_REGISTRY_IMAGE
stages: stages:
...@@ -66,7 +64,7 @@ trigger_build: ...@@ -66,7 +64,7 @@ trigger_build:
# Build a docker image in which tests for this repository can run # Build a docker image in which tests for this repository can run
build-testenv: build-testenv:
tags: [ docker ] tags: [ docker ]
image: docker:latest image: docker:19.03
stage: setup stage: setup
script: script:
- cd src/test/docker - cd src/test/docker
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment