diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9b2b6d2cfb966c3a080798a6bb59f3bde9ada1a..81614024972d8c1dba0f6babcf5bd39f980df96c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,10 +46,10 @@ test: - time docker load < /image-cache/mariadb.tar || true - time docker load < /image-cache/caosdb.tar || true - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker login -u $INDISCALE_USER -p $INDISCALE_TOKEN $CI_REGISTRY_INDISCALE + - docker login -u gitlab+deploy-token-ci-pull -p $TOKEN_CI_PULL $CI_REGISTRY_INDISCALE - time docker pull $CI_REGISTRY_IMAGE - time docker pull mariadb:10.4 - - time docker pull $CI_REGISTRY/caosdb:$CAOSDB_TAG + - time docker pull $CI_REGISTRY_INDISCALE/caosdb/src/caosdb-deploy:$CAOSDB_TAG - EXEPATH=`pwd` CAOSDB_TAG=$CAOSDB_TAG docker-compose -f .docker/docker-compose.yml up -d - cd .docker