From 28527a08db8ddfb2405529a9ff9bf51f9346f77d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Thu, 18 Jul 2019 14:04:18 +0200
Subject: [PATCH] ci
---
.docker/docker-compose.yml | 4 ++++
.gitlab-ci.yml | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 9edd0fc..f6beede 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 0ab093e..3faa5cd 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:
--
GitLab