diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 9edd0fc9e2332a34340a9e7ab1892d1227896280..f6beededed9132332695cdf2783aa823bdb9ee20 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -12,3 +12,7 @@ services: # - "from_outside:from_inside" - "10443:10443" - "10080:10080" + +networks: + caosnet: + driver: bridge diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ab093e6614e8309892d72a5b5f5b82701e92c6e..3faa5cd0c32794dbc26b43626d0bcdcf2aa49066 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,10 @@ test: #- rc=$? #- docker-compose down #- exit $rc - - ./wait-for-it.sh $HOSTNAME:10443 -t 60 -- curl https://$HOSTNAME:10443 + - docker network inspect caosnet + - docker ps + - docker inspect docker_caosdb-server_1 + - ./wait-for-it.sh $HOSTNAME:10443 -t 120 -- curl https://$HOSTNAME:10443 - cd .. build-testenv: