Skip to content
Snippets Groups Projects
Commit 174ca831 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

fix cert

parent b77b75cf
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ services: ...@@ -15,7 +15,7 @@ services:
- caosnet - caosnet
volumes: volumes:
- type: bind - type: bind
source: "$EXEPATH/.docker/cert" source: ./cert
target: /opt/caosdb/cert target: /opt/caosdb/cert
- type: bind - type: bind
source: "$EXEPATH/integrationtests/full_test/extroot" source: "$EXEPATH/integrationtests/full_test/extroot"
......
...@@ -31,6 +31,7 @@ services: ...@@ -31,6 +31,7 @@ services:
stages: stages:
- setup - setup
- cert
- style - style
- test - test
...@@ -42,7 +43,7 @@ test: ...@@ -42,7 +43,7 @@ test:
entrypoint: ["/bin/sh", "-c"] entrypoint: ["/bin/sh", "-c"]
script: script:
- if [[ "$CAOSDB_TAG" == "" ]]; then - if [[ "$CAOSDB_TAG" == "" ]]; then
CAOSDB_TAG=master-latest; CAOSDB_TAG=dev-latest;
fi fi
- echo $CAOSDB_TAG - echo $CAOSDB_TAG
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
...@@ -57,6 +58,7 @@ test: ...@@ -57,6 +58,7 @@ test:
- docker-compose -f .docker/docker-compose.yml down - docker-compose -f .docker/docker-compose.yml down
- rc=`cat result` - rc=`cat result`
- exit $rc - exit $rc
dependencies: [cert]
artifacts: artifacts:
paths: paths:
- caosdb_log.txt - caosdb_log.txt
...@@ -79,7 +81,17 @@ build-testenv: ...@@ -79,7 +81,17 @@ build-testenv:
-t $CI_REGISTRY_IMAGE:latest . -t $CI_REGISTRY_IMAGE:latest .
- docker push $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: style:
tags: [notls] tags: [notls]
stage: style stage: style
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment