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

Merge branch 'fixing_ci' into 'dev'

fix gitlab ci by setting docker versions

See merge request bmp-caosdb/caosdb-pyinttest!12
parents 07b3ae7f 37c8944c
No related branches found
No related tags found
No related merge requests found
......@@ -58,7 +58,7 @@ variables:
DOCKER_DRIVER: overlay2
services:
- docker:dind
- docker:18.09.7-dind
stages:
- setup
......@@ -66,7 +66,7 @@ stages:
- test
test:
tags: [docker]
tags: [notls]
stage: test
image:
name: docker/compose:1.24.1
......@@ -87,8 +87,8 @@ test:
- exit $rc
build-testenv:
tags: [docker]
image: docker:latest
tags: [notls]
image: docker:18.09
stage: setup
script:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -102,7 +102,7 @@ build-testenv:
- docker push $CI_REGISTRY_IMAGE:latest
style:
tags: [docker]
tags: [notls]
stage: style
image: $CI_REGISTRY_IMAGE:latest
script:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment