diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index facbe4d16ae25bc743b5165a4e27da8139042e1f..18a7746cd06ebe1cba4869fb4c5b0c0e9b87a819 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -5,7 +5,7 @@ services: environment: MYSQL_ROOT_PASSWORD: caosdb1234 caosdb-server: - image: "caosdb:default" + image: "$CI_REGISTRY/caosdb:$CAOSDB_TAG" depends_on: - sqldb ports: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7495058d55c05be0ffb522417d3b1b192c19c878..4c941bd6b46fe611639d9e4ce1922eabf691cb33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,6 +42,7 @@ variables: # When using dind, it's wise to use the overlayfs driver for # improved performance. DOCKER_DRIVER: overlay2 + CAOSDB_TAG: latest services: - docker:dind @@ -56,6 +57,7 @@ test: name: docker/compose:1.24.1 entrypoint: ["/bin/sh", "-c"] script: + - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker-compose -f .docker/docker-compose.yml up build-testenv: