Update Dockerfile, .gitlab-ci.yml files

.gitlab-ci.yml

@@ -43,12 +43,12 @@ stages:
 #########################
 
 .build-env-template: &build-env-job
-  image: harbor.bjoernbartels.earth:8013/k8s-demo/k8s-demo_build_env:latest
+  image: bbdrummer/k8s-demo_build_env:latest
   tags:
     - docker-runner
 
 .docker-dind-template: &dind-job
-  image: harbor.bjoernbartels.earth:8013/devops/ci-docker-kubectl:latest
+  image: bbdrummer/ci-docker-kubectl:latest
   #image: docker:stable
   services:
     - name: docker:dind
@@ -167,11 +167,11 @@ docker:
   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} .
-    - 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
+    - docker login -u "${CI_DOCKER_USERNAME}" -p "${CI_DOCKER_TOKEN}"
+    - docker build --no-cache --build-arg ARTIFACT_DIR=${BUILD_TARGET} -t bbdrummer/${PROJECTNAME}:${BUILD_LABEL} .
+    - docker push bbdrummer/${PROJECTNAME}:${BUILD_LABEL}
+    - if [[ ! -z "${CI_COMMIT_TAG}" ]] ; then docker image tag bbdrummer/${PROJECTNAME}:${BUILD_LABEL} bbdrummer/${PROJECTNAME}:latest ; fi
+    - if [[ ! -z "${CI_COMMIT_TAG}" ]] ; then docker push bbdrummer/${PROJECTNAME}:latest ; fi
 
 
 dev-docker-image:
@@ -187,6 +187,6 @@ dev-docker-image:
     - node-js
   script:
     # 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} .
-    - docker push harbor.bjoernbartels.earth:8013/${PROJECTNAMESPACE}/${PROJECTNAME}:${RELEASE}
+    - docker login -u "${CI_DOCKER_USERNAME}" -p "${CI_DOCKER_TOKEN}"
+    - docker build --no-cache --build-arg ARTIFACT_DIR=${BUILD_TARGET} -t bbdrummer/${PROJECTNAME}:${RELEASE} .
+    - docker push bbdrummer/${PROJECTNAME}:${RELEASE}

Dockerfile

 FROM nginx:alpine
 
+LABEL maintainer="Björn Bartels <coding@bjoernbartels.earth>"
+
 # Configure nginx
 COPY .docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf