From 128459e55f70ec8c350c4b8e553ad04cb7f36270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Mon, 22 Jul 2019 11:30:59 +0200
Subject: [PATCH] test
---
.docker/Dockerfile | 2 +-
.docker/docker-compose.yml | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 5c61787..3e9474f 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 56de33a..4efc13b 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:
--
GitLab