diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index f6beededed9132332695cdf2783aa823bdb9ee20..9d4c72e93ce8ca44ad9f7e0213722122e215efcf 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -4,10 +4,14 @@ services: image: mariadb:10.4 environment: MYSQL_ROOT_PASSWORD: caosdb1234 + networks: + - caosnet caosdb-server: image: "$CI_REGISTRY/caosdb:$CAOSDB_TAG" depends_on: - sqldb + networks: + - caosnet ports: # - "from_outside:from_inside" - "10443:10443" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3faa5cd0c32794dbc26b43626d0bcdcf2aa49066..2d981967ca1f68de84e891b33678592aa39bda73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,6 +68,7 @@ test: #- rc=$? #- docker-compose down #- exit $rc + - docker network ls - docker network inspect caosnet - docker ps - docker inspect docker_caosdb-server_1