diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 4081372325ab0086b81db1418f68aefd0f1a8bc5..9edd0fc9e2332a34340a9e7ab1892d1227896280 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -12,7 +12,3 @@ services: # - "from_outside:from_inside" - "10443:10443" - "10080:10080" - tester: - image: "$CI_REGISTRY_IMAGE:latest" - depends_on: - - caosdb-server diff --git a/.docker/tester.yml b/.docker/tester.yml new file mode 100644 index 0000000000000000000000000000000000000000..50ea2822e5361429d3b807a0abf13b17f8b507c2 --- /dev/null +++ b/.docker/tester.yml @@ -0,0 +1,4 @@ +version: '3.7' +services: + tester: + image: "$CI_REGISTRY_IMAGE:latest" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c941bd6b46fe611639d9e4ce1922eabf691cb33..bda619400d8b279401a835c2135b60763cf9d28c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,12 @@ test: entrypoint: ["/bin/sh", "-c"] script: - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - docker-compose -f .docker/docker-compose.yml up + - cd .docker + - docker-compose up -d + - docker-compose -f tester.yml run tester + - rc=$? + - docker-compose down + - exit $rc build-testenv: tags: [docker]