From 8c05596424029286960eb5742f147b2e4b036e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org> Date: Mon, 22 Jul 2019 12:30:08 +0200 Subject: [PATCH] test --- .docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 7cbd4bf..60c5e5f 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,6 +1,6 @@ FROM debian:latest RUN apt-get update && \ - apt-get install docker.io tox curl python3-pip git python3-nose -y + apt-get install docker.io tox curl python3-pip git -y RUN pip3 install docker-compose COPY .docker/wait-for-it.sh /wait-for-it.sh RUN git clone https://gitlab.gwdg.de/bmp-caosdb/caosdb-pylib.git && \ @@ -8,4 +8,4 @@ RUN git clone https://gitlab.gwdg.de/bmp-caosdb/caosdb-pylib.git && \ COPY . /git RUN rm -r /git/.git && mv /git/.docker/pycaosdb.ini /git WORKDIR /git -CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- nosetests3 tests/test_misc.py +CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox -- GitLab