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

fix registry

parent a76e1e91
No related branches found
No related tags found
1 merge request!1F fix pipeline
Pipeline #5275 passed
...@@ -7,7 +7,7 @@ services: ...@@ -7,7 +7,7 @@ services:
networks: networks:
- caosnet - caosnet
caosdb-server: caosdb-server:
image: "$CI_REGISTRY_INDISCALE/caosdb/src/caosdb-deploy:$CAOSDB_TAG" image: "$CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG"
user: 999:999 user: 999:999
depends_on: depends_on:
- sqldb - sqldb
......
...@@ -108,12 +108,12 @@ test: ...@@ -108,12 +108,12 @@ test:
- if [[ "$CAOSDB_TAG" == "" ]]; then - if [[ "$CAOSDB_TAG" == "" ]]; then
if echo "$F_BRANCH" | grep -c "^f-" ; then if echo "$F_BRANCH" | grep -c "^f-" ; then
CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest; 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 else
CAOSDB_TAG=${DEPLOY_REF}-latest; CAOSDB_TAG=${DEPLOY_REF}-latest;
fi; fi;
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 - echo $CAOSDB_TAG
- time docker load < /image-cache/caosdb-pyint-testenv-${CI_COMMIT_REF_NAME}.tar || true - time docker load < /image-cache/caosdb-pyint-testenv-${CI_COMMIT_REF_NAME}.tar || true
...@@ -217,7 +217,5 @@ store-version: ...@@ -217,7 +217,5 @@ store-version:
only: only:
- dev - dev
- master - master
# TODO remove
- f-versions
- web - web
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment