Merge branch 'master' into 'release'

Master See merge request !18

Merge branch 'master' into 'release'
Master See merge request !18
7d17388e · Björn Bartels · 0f54b801 · 96c14b88 · 7d17388e
Commit 7d17388e authored Oct 28, 2020 by Björn Bartels
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

.gitlab-ci.yml .gitlab-ci.yml +3 -2

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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