Merge branch 'fix_ci' into 'master'

fix gitlab ci by setting docker versions

See merge request bmp-caosdb/caosdb-advanced-user-tools!5

.gitlab-ci.yml

@@ -20,12 +20,14 @@
 
 variables:
    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
    # improved performance.
    DOCKER_DRIVER: overlay2
 
 services:
-  - docker:19.03-dind
+  - docker:18.09.7-dind
 
 stages: 
   - setup
@@ -33,7 +35,7 @@ stages:
   - test
 
 test:
-  tags: [thindind]
+  tags: [notls]
   stage: test
   image: 
     name: docker/compose:1.24.1
@@ -53,8 +55,8 @@ test:
       - exit $rc
 
 build-testenv:
-  tags: [docker]
-  image: docker:19.03
+  tags: [notls]
+  image: docker:18.09
   stage: setup
   script: 
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -69,7 +71,7 @@ build-testenv:
 
 
 style:
-  tags: [docker]
+  tags: [notls]
   stage: style
   image: $CI_REGISTRY_IMAGE:latest
   script: