From 7ad5b6ce2108fd66c25809d502331ae9588a6ceb 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:57:11 +0200
Subject: [PATCH] ci
---
.docker/docker-compose.yml | 2 +-
.gitlab-ci.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index d44820e..56de33a 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -14,7 +14,7 @@ services:
- caosnet
volumes:
- type: bind
- source: "cert"
+ source: "$CERTPATH"
target: /opt/caosdb/cert
ports:
# - "from_outside:from_inside"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 464a1cf..0592a7a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,7 +63,7 @@ test:
- echo $CAOSDB_TAG
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- cd .docker
- - CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
+ - CERTPATH=/git/.docker/cert CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
- docker-compose -f tester.yml run tester
- rc=$?
- docker-compose down
--
GitLab