ci

.docker/Dockerfile

@@ -3,4 +3,4 @@ RUN apt-get update && \
 	apt-get install docker.io tox curl python3-pip -y
 RUN pip3 install docker-compose
 COPY wait-for-it.sh /wait-for-it.sh
-CMD /bin/bash
+CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- curl https://caosdb-server:10443

.gitlab-ci.yml

@@ -52,10 +52,10 @@ stages:
 
 test:
   tags: [docker]
-  #image: 
-  #  name: docker/compose:1.24.1
-  #  entrypoint: ["/bin/sh", "-c"]
-  image: $CI_REGISTRY_IMAGE:latest
+  image: 
+    name: docker/compose:1.24.1
+    entrypoint: ["/bin/sh", "-c"]
+  #image: $CI_REGISTRY_IMAGE:latest
   script:
       - if [[ "$CAOSDB_TAG" == "" ]]; then
             CAOSDB_TAG=latest;
@@ -64,12 +64,10 @@ test:
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
       - cd .docker
       - CAOSDB_TAG=$CAOSDB_TAG docker-compose  up -d
-        #- docker-compose -f tester.yml run tester
-        #- rc=$?
-        #- docker-compose  down
-        #- exit $rc
-      - dip=`docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' docker_caosdb-server_1`
-      - ./wait-for-it.sh $dip:10443 -t 120 -- curl https://$dip:10443
+      - docker-compose -f tester.yml run tester 
+      - rc=$?
+      - docker-compose  down
+      - exit $rc
       - cd ..
 
 build-testenv: