From 74904e8b058b5f27ef49cc644c833830ea1de059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Mon, 18 Nov 2019 14:58:01 +0100
Subject: [PATCH] up
---
.docker/docker-compose.yml | 2 +-
.docker/pycaosdb.ini | 1 -
.docker/tester.yml | 4 ++++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 5cdfc4d1..f6285b2c 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -15,7 +15,7 @@ services:
- caosnet
volumes:
- type: bind
- source: ./cert
+ source: .docker/cert
target: /opt/caosdb/cert
- type: bind
source: "$EXEPATH/integrationtests/full_test/extroot"
diff --git a/.docker/pycaosdb.ini b/.docker/pycaosdb.ini
index c3aaf904..1e5ba293 100644
--- a/.docker/pycaosdb.ini
+++ b/.docker/pycaosdb.ini
@@ -5,7 +5,6 @@ test_server_side_scripting.bin_dir=../caosdb-server/test_scripting/bin/
url=https://caosdb-server:10443
username=admin
cacert=/opt/caosdb/cert/caosdb.cert.pem
-#cacert=/etc/ssl/cert.pem
debug=0
passwordmethod=plain
diff --git a/.docker/tester.yml b/.docker/tester.yml
index 7eb8d4d6..75f86048 100644
--- a/.docker/tester.yml
+++ b/.docker/tester.yml
@@ -2,6 +2,10 @@ version: '3.6'
services:
tester:
image: "$CI_REGISTRY_IMAGE:latest"
+ volumes:
+ - type: bind
+ source: .docker/cert
+ target: /opt/caosdb/cert
networks:
- docker_caosnet
networks:
--
GitLab