diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 447469d4323836bc0cf9c4a61ea506985754eeca..42524301b70a2858dcc82867ea6585d57493382b 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 50ea2822e5361429d3b807a0abf13b17f8b507c2..2d22c8b32eabd3d2268b06e02929ea11542eb5fc 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