Commit 3782bfb1 authored by Björn Bartels's avatar Björn Bartels

Merge branch 'master' into 'release'

Master

See merge request !7
parents 4d9abc6f be93f21b
......@@ -160,11 +160,11 @@ docker:
only:
- master
- tags
- release
dependencies:
- init
- node-js
script:
- if [[ ! -z "${CI_COMMIT_TAG}" ]] ; then export BUILD_LABEL="${CI_COMMIT_TAG}"; fi
# 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} .
......@@ -177,7 +177,6 @@ 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