From c34f50ae6065f02ef0f6f5da89c8bf33c2c34849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Thu, 18 Jul 2019 15:45:18 +0200
Subject: [PATCH] ci
---
.docker/Dockerfile | 2 +-
.docker/docker-compose.yml | 4 ++++
.gitlab-ci.yml | 1 -
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 44192be..603ec47 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -6,6 +6,6 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
RUN git clone https://gitlab.gwdg.de/bmp-caosdb/caosdb-pylib.git && \
cd caosdb-pylib && pip3 install .
COPY . /git
-RUN rm -r /git/.git && mv /git/.docker/.pycaosdb.ini /git && mv /git/.docker/cert /opt/caosdb/cert
+RUN rm -r /git/.git && mv /git/.docker/.pycaosdb.ini /git
WORKDIR /git
CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 9d4c72e..81bc32d 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -12,6 +12,10 @@ services:
- sqldb
networks:
- caosnet
+ volumes:
+ - type: bind
+ source: ".docker/cert"
+ target: /opt/caosdb/cert
ports:
# - "from_outside:from_inside"
- "10443:10443"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5092166..464a1cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,7 +64,6 @@ test:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- cd .docker
- CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
- - docker cp -a docker_caosdb-server_1:/opt/caosdb/cert/ cert
- docker-compose -f tester.yml run tester
- rc=$?
- docker-compose down
--
GitLab