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

remove notls tag

parent f84d2907
Branches
Tags
No related merge requests found
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
docker-compose -f tester.yml run tester docker-compose -f tester.yml run tester
rv=$? rv=$?
echo "result value is "$rv
echo $rv > result echo $rv > result
...@@ -21,13 +21,12 @@ ...@@ -21,13 +21,12 @@
variables: variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-advanced-testenv CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-advanced-testenv
# With dind the docker deamon is available on the network # With dind the docker deamon is available on the network
DOCKER_HOST: tcp://docker:2375/
# When using dind, it's wise to use the overlayfs driver for # When using dind, it's wise to use the overlayfs driver for
# improved performance. # improved performance.
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
services: services:
- docker:18.09.7-dind - docker:19.03.0-dind
stages: stages:
- setup - setup
...@@ -36,11 +35,9 @@ stages: ...@@ -36,11 +35,9 @@ stages:
- test - test
test: test:
tags: [notls] tags: [docker]
stage: test stage: test
image: image: registry.indiscale.com/caosdb-glaz_awi-testenv
name: docker/compose:1.24.1
entrypoint: ["/bin/sh", "-c"]
script: script:
- if [[ "$CAOSDB_TAG" == "" ]]; then - if [[ "$CAOSDB_TAG" == "" ]]; then
CAOSDB_TAG=dev-latest; CAOSDB_TAG=dev-latest;
...@@ -56,7 +53,7 @@ test: ...@@ -56,7 +53,7 @@ test:
- docker logs docker_caosdb-server_1 &> ../caosdb_log.txt - docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
- docker logs docker_sqldb_1 &> ../mariadb_log.txt - docker logs docker_sqldb_1 &> ../mariadb_log.txt
- docker-compose -f .docker/docker-compose.yml down - docker-compose -f .docker/docker-compose.yml down
- rc=`cat result` - rc=`cat .docker/result`
- exit $rc - exit $rc
dependencies: [cert] dependencies: [cert]
artifacts: artifacts:
...@@ -70,19 +67,18 @@ build-testenv: ...@@ -70,19 +67,18 @@ build-testenv:
tags: [notls] tags: [notls]
image: docker:18.09 image: docker:18.09
stage: setup stage: setup
only:
- schedules
script: script:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# use here general latest or specific branch latest... # use here general latest or specific branch latest...
- docker pull $CI_REGISTRY_IMAGE:latest || true
- docker build - docker build
--pull
--file .docker/Dockerfile --file .docker/Dockerfile
--cache-from $CI_REGISTRY_IMAGE:latest
-t $CI_REGISTRY_IMAGE:latest . -t $CI_REGISTRY_IMAGE:latest .
- docker push $CI_REGISTRY_IMAGE:latest - docker push $CI_REGISTRY_IMAGE:latest
cert: cert:
tags: [notls] tags: [docker]
stage: cert stage: cert
image: $CI_REGISTRY_IMAGE:latest image: $CI_REGISTRY_IMAGE:latest
artifacts: artifacts:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment