Commit 7d17388e authored by Björn Bartels's avatar Björn Bartels

Merge branch 'master' into 'release'

Master

See merge request !18
parents 0f54b801 96c14b88
......@@ -169,8 +169,8 @@ docker:
- 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} .
- docker push harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:${BUILD_LABEL}
- if [[ -z "${CI_COMMIT_TAG}" ]] ; then docker image tag harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:${BUILD_LABEL} harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:latest ; fi
- if [[ -z "${CI_COMMIT_TAG}" ]] ; then docker push harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:latest ; fi
- if [[ ! -z "${CI_COMMIT_TAG}" ]] ; then docker image tag harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:${BUILD_LABEL} harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:latest ; fi
- if [[ ! -z "${CI_COMMIT_TAG}" ]] ; then docker push harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:latest ; fi
dev-docker-image:
......@@ -179,6 +179,7 @@ dev-docker-image:
#when: manual
except:
- master
- release
- tags
dependencies:
- init
......
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