Commit 7d17388e authored by Björn Bartels's avatar Björn Bartels 👩🏻
Browse files

Merge branch 'master' into 'release' 

Master

See merge request !18
parents 0f54b801 96c14b88

.gitlab-ci.yml

+3 −2
Original line number Diff line number Diff line
@@ -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