diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 5c61787c3de694cf5f5ae89af21bee847b13e773..3e9474fdc9fcdab36f9a29c6c61cdac80db5f50e 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -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 -- tox +CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- pytest tests/test_misc.py diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 56de33a5c1280c82e954e97965e07efbeb40303c..4efc13b57c102d2b0dc0ae0494ab46c1462b6f43 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -7,7 +7,7 @@ services: networks: - caosnet caosdb-server: - image: "$CI_REGISTRY/caosdb:$CAOSDB_TAG" + image: "caosdb:$CAOSDB_TAG" depends_on: - sqldb networks: @@ -20,6 +20,8 @@ services: # - "from_outside:from_inside" - "10443:10443" - "10080:10080" + environment: + DEBUG: 1 networks: caosnet: