From bac6721cababfa038f2081ca11803591ab0cc7d5 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:08:52 +0200
Subject: [PATCH] ci
---
.docker/docker-compose.yml | 4 ++++
.gitlab-ci.yml | 1 +
2 files changed, 5 insertions(+)
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index f6beede..9d4c72e 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 3faa5cd..2d98196 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
--
GitLab