diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index efaa0b27ddc0827cb5db9e01552de53eaaf81246..8ac36de4373e060ffaff29c917f7784e2eeba91a 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -7,7 +7,7 @@ services: networks: - caosnet caosdb-server: - image: "$CI_REGISTRY_INDISCALE/caosdb/src/caosdb-deploy:$CAOSDB_TAG" + image: "$CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG" user: 999:999 depends_on: - sqldb diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b964dafd1ccc17821cc5ebbc1621f29e04ee2240..fdee0e25818dceac06b87fea04293b16950bad69 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,12 +108,12 @@ test: - if [[ "$CAOSDB_TAG" == "" ]]; then if echo "$F_BRANCH" | grep -c "^f-" ; then CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest; - docker pull $CI_REGISTRY_INDISCALE/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEPLOY_REF}-latest ; + docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEPLOY_REF}-latest ; else CAOSDB_TAG=${DEPLOY_REF}-latest; fi; fi - - docker pull $CI_REGISTRY_INDISCALE/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=dev-latest ; + - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=dev-latest ; - echo $CAOSDB_TAG - time docker load < /image-cache/caosdb-pyint-testenv-${CI_COMMIT_REF_NAME}.tar || true @@ -217,7 +217,5 @@ store-version: only: - dev - master - # TODO remove - - f-versions - web