Update .gitlab-ci.yml

.gitlab-ci.yml

@@ -9,6 +9,11 @@ variables:
   # git tag or branch name
   CONTAINER_IMAGE: "registry.kszk.bme.hu/monitoring/pupak:$CI_COMMIT_REF_NAME"
 
+# include CI config from another repo
+include:
+  - project: kszk/sysadmin/ci
+    file: /docker-build.yaml
+
 pip:
   stage: Get dependencies
   script:
@@ -27,39 +32,15 @@ pylint:
     - pip install pylint
     - pylint -d C0301 *.py
 
-docker kszk:
-  extends: .image-template
+kszk registry:
+  extends: .docker-build
   variables:
-    REGISTRY: registry.kszk.bme.hu
-    REGISTRY_USER: "$KSZK_NEXUS_USERNAME"
-    REGISTRY_PASSWORD: "$KSZK_NEXUS_PASSWORD"
-    IMAGE: registry.kszk.bme.hu/monitoring/pupak:$CI_COMMIT_REF_NAME
+    IMAGE_NAME: monitoring/pupak:$CI_COMMIT_REF_NAME
 
 dockerhub:
-  extends: .image-template
+  extends: .docker-build
   variables:
+    IMAGE_NAME: robotka/pupak:$CI_COMMIT_REF_NAME
     REGISTRY: "https://index.docker.io/v1/"
-    REGISTRY_USER: "$HUB_USER"
-    REGISTRY_PASSWORD: "$HUB_PASS"
-    IMAGE: robotka/pupak:$CI_COMMIT_REF_NAME
-
-###################### Docker image build template #######################
-
-# hidden job, not gonna run, just for the inheritance
-.image-template:
-  stage: Docker build
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
-  script:
-    - echo "{\"auths\":{\"$REGISTRY\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}"
-      > /kaniko/.docker/config.json
-    - echo "Push $IMAGE to $REGISTRY"
-    - /kaniko/executor
-      --context $CI_PROJECT_DIR
-      --dockerfile $CI_PROJECT_DIR/Dockerfile
-      --destination "$IMAGE"
-  only:
-    - master
-    - tags
-
+    REGISTRY_USER: "$HUB_USERNAME"
+    REGISTRY_PASSWORD: "$HUB_PASSWORD"