Merge branch 'rework' into 'master'

remove notls tag

See merge request caosdb/caosdb-advanced-user-tools!12

.docker/run.sh

@@ -2,4 +2,5 @@
 
 docker-compose -f tester.yml run tester 
 rv=$?
+echo "result value is "$rv
 echo $rv > result

.gitlab-ci.yml

@@ -21,13 +21,12 @@
 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:18.09.7-dind
+  - docker:19.03.0-dind
 
 stages: 
   - setup
@@ -36,11 +35,9 @@ stages:
   - test
 
 test:
-  tags: [notls]
+  tags: [docker]
   stage: test
-  image: 
-    name: docker/compose:1.24.1
-    entrypoint: ["/bin/sh", "-c"]
+  image: registry.indiscale.com/caosdb-glaz_awi-testenv
   script:
       - if [[ "$CAOSDB_TAG" == "" ]]; then
             CAOSDB_TAG=dev-latest;
@@ -56,7 +53,7 @@ test:
       - docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
       - docker logs docker_sqldb_1 &> ../mariadb_log.txt
       - docker-compose -f .docker/docker-compose.yml down
-      - rc=`cat result`  
+      - rc=`cat .docker/result`  
       - exit $rc
   dependencies: [cert]
   artifacts:
@@ -70,19 +67,18 @@ build-testenv:
   tags: [notls]
   image: docker:18.09
   stage: setup
+  only:
+      - schedules
   script: 
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
         # use here general latest or specific branch latest...
-      - docker pull $CI_REGISTRY_IMAGE:latest || true
       - docker build 
-        --pull
         --file .docker/Dockerfile
-        --cache-from $CI_REGISTRY_IMAGE:latest 
         -t $CI_REGISTRY_IMAGE:latest .
       - docker push $CI_REGISTRY_IMAGE:latest
 
 cert:
-  tags: [notls]
+  tags: [docker]
   stage: cert
   image: $CI_REGISTRY_IMAGE:latest
   artifacts: