From 94dd494cfc8c0abb0e7e83408fc4d4b95e63b848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robotka=20Adri=C3=A1n?= <robotka@sch.bme.hu>
Date: Tue, 8 Sep 2020 11:00:26 +0200
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 45 +++++++++++++--------------------------------
1 file changed, 13 insertions(+), 32 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 799d788..b332388 100644
--- a/.gitlab-ci.yml
+++ b/.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
-docker hub:
- extends: .image-template
+dockerhub:
+ 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"
--
GitLab