Commit 9f768067 authored by Stefan Wolfsheimer's avatar Stefan Wolfsheimer
Browse files

fixed: image name for env variable

parent 2ee2444b
......@@ -36,7 +36,6 @@ before_script:
- source .variables
- docker-compose -f ci/docker-compose.yml down -v
- docker-compose -f ci/docker-compose.yml pull
after_script:
- source .variables
......
......@@ -68,6 +68,10 @@ mkdir -p $PACKAGE_DIR
docker pull ${REGISTRY}/light_${VERSION}:latest
export DOCKER_IMAGE=light_${VERSION}:latest
docker-compose -f ci/docker-compose.yml up -d
docker exec ci_icat_1 mkdir -p /src/
......
......@@ -14,7 +14,7 @@ services:
hostname: handle.irods
icat:
image: ${REGISTRY}/b2safe_${CI_COMMIT_REF_NAME}_${VERSION}:latest
image: ${REGISTRY}/${DOCKER_IMAGE}
ports:
- "127.0.0.1:1247:1247"
depends_on:
......
......@@ -70,7 +70,8 @@ then
GIT_BRANCH=${CI_COMMIT_REF_NAME}
fi
IMAGE_NAME=${REGISTRY}/b2safe_${GIT_BRANCH}_${VERSION}:latest
export DOCKER_IMAGE=b2safe_${GIT_BRANCH}_${VERSION}:latest
IMAGE_NAME=${REGISTRY}/${DOCKER_IMAGE}
if [ -z "${SECRET_DIR}" ]
then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment