Commit 0b1bfcac authored by Björn Bartels's avatar Björn Bartels

upd CI cfg

parent a143cf21
......@@ -59,6 +59,8 @@ stages:
.project-variables: &project-variables
before_script:
# build label
- if [ -f ${BUILD_LABEL_TMPFILE} ]; then export BUILD_LABEL=`cat ${BUILD_LABEL_TMPFILE}`; fi
# get k8s config
- if [[ ! -z "${KUBECONFIG_DEPLOYUSER}" ]] && [[ ! -z "${KUBECONFIG}" ]] ; then echo "$(echo ${KUBECONFIG_DEPLOYUSER} | base64 -d)" > ${KUBECONFIG} ; fi
# normalize var values
......@@ -96,9 +98,6 @@ variables:
BUILD_TARGET: public
BUILD_LABEL_TMPFILE: TMP_BUILD_LABEL
before_script:
- if [ -f ${BUILD_LABEL_TMPFILE} ]; then export BUILD_LABEL=`cat ${BUILD_LABEL_TMPFILE}`; fi
init:
<<: [*build-env-job, *pushcache]
......@@ -164,10 +163,8 @@ docker:
- init
- node-js
script:
- pwd
- ls -la
- docker login harbor.bjoernbartels.earth:8013 -u "${CI_HARBOR_USERNAME}" -p "${CI_HARBOR_PASSWORD}"
# 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} .
- docker push harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:${BUILD_LABEL}
......@@ -184,8 +181,6 @@ dev-docker-image:
- init
- node-js
script:
- export
- pwd
# build docker feature image
- 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}:${RELEASE} .
......
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