From fb505e9047c98da1f5f994e70fe93d4725b18dc0 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:45:42 +0200
Subject: [PATCH] ci
---
.docker/Dockerfile | 3 ++-
.docker/tester.yml | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 447469d..4252430 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -3,4 +3,5 @@ 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 /wait-for-it.sh caosdb-server:10443 -t 120 -- curl https://caosdb-server:10443
+COPY ../tests /tests
+CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox /tests
diff --git a/.docker/tester.yml b/.docker/tester.yml
index 50ea282..2d22c8b 100644
--- a/.docker/tester.yml
+++ b/.docker/tester.yml
@@ -2,3 +2,8 @@ version: '3.7'
services:
tester:
image: "$CI_REGISTRY_IMAGE:latest"
+ networks:
+ - docker_caosnet
+networks:
+ docker_caosnet:
+ external: true
--
GitLab