Commit 1539a0d8 authored by Björn Bartels's avatar Björn Bartels

Merge branch 'master' into 'release'

Master

See merge request !12
parents 6d266d57 ff82a130
......@@ -168,8 +168,8 @@ docker:
# build docker image and tag with version
- docker login harbor.bjoernbartels.earth:8013 -u "${CI_HARBOR_USERNAME}" -p "${CI_HARBOR_PASSWORD}"
- docker build --no-cache --build-arg ARTIFACT_DIR=${BUILD_TARGET} -t harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:${BUILD_LABEL} .
- if [[ ! -z "${CI_COMMIT_TAG}" ]] ; then docker build --no-cache --build-arg ARTIFACT_DIR=${BUILD_TARGET} -t harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:latest . ; fi
- docker push harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:${BUILD_LABEL}
- if [[ ! -z "${CI_COMMIT_TAG}" ]] ; then docker push harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:latest ; fi
dev-docker-image:
......
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