Merge branch 'master' into 'release'

Merge branch 'release' into 'master'

See merge request !15

.gitlab-ci.yml

@@ -169,7 +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 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: