From 174ca83113fbc8f1cfa0d47709ad80c02bac0b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org> Date: Mon, 18 Nov 2019 11:21:08 +0100 Subject: [PATCH] fix cert --- .docker/docker-compose.yml | 2 +- .gitlab-ci.yml | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index ab20a078..5cdfc4d1 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -15,7 +15,7 @@ services: - caosnet volumes: - type: bind - source: "$EXEPATH/.docker/cert" + source: ./cert target: /opt/caosdb/cert - type: bind source: "$EXEPATH/integrationtests/full_test/extroot" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6df21a92..f0732fd2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,7 @@ services: stages: - setup + - cert - style - test @@ -42,7 +43,7 @@ test: entrypoint: ["/bin/sh", "-c"] script: - if [[ "$CAOSDB_TAG" == "" ]]; then - CAOSDB_TAG=master-latest; + CAOSDB_TAG=dev-latest; fi - echo $CAOSDB_TAG - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY @@ -57,6 +58,7 @@ test: - docker-compose -f .docker/docker-compose.yml down - rc=`cat result` - exit $rc + dependencies: [cert] artifacts: paths: - caosdb_log.txt @@ -79,7 +81,17 @@ build-testenv: -t $CI_REGISTRY_IMAGE:latest . - docker push $CI_REGISTRY_IMAGE:latest - +cert: + tags: [notls] + stage: cert + image: $CI_REGISTRY_IMAGE:latest + artifacts: + paths: + - .docker/cert/ + expire_in: 1 week + script: + - cd .docker + - CAOSHOSTNAME=caosdb-server ./cert.sh style: tags: [notls] stage: style -- GitLab