From 74d9e6accc90a9d8ca5e018bfea475d24e3b0276 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Thu, 7 Nov 2019 12:57:12 +0100
Subject: [PATCH] Use shared kaniko build template
Closes: #10
---
.gitlab-ci.yml | 51 +++++++++++++++++++++++---------------------------
1 file changed, 23 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 195c8e7..fcb9b50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,55 +1,50 @@
+include:
+ - remote: https://open.greenhost.net/openappstack/openappstack/raw/master/.gitlab/ci_templates/kaniko.yml
+
stages:
- build
- build-test-images
- application-test
-consent-provider:
+consent_provider:
stage: build
- image:
- name: gcr.io/kaniko-project/executor:debug
- entrypoint: [""]
- script:
- - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- - /kaniko/executor --context ${CI_PROJECT_DIR}/consent_provider --dockerfile ${CI_PROJECT_DIR}/consent_provider/Dockerfile --destination $CI_REGISTRY_IMAGE/consent_provider:${CI_COMMIT_REF_NAME}
+ variables:
+ KANIKO_CONTEXT: "consent_provider"
+ KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
+ extends: .kaniko_build
only:
changes:
- consent_provider/**/*
- .gitlab-ci.yml
-login-provider:
+login_provider:
stage: build
- image:
- name: gcr.io/kaniko-project/executor:debug
- entrypoint: [""]
- script:
- - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- - /kaniko/executor --context ${CI_PROJECT_DIR}/login_provider --dockerfile ${CI_PROJECT_DIR}/login_provider/Dockerfile --destination $CI_REGISTRY_IMAGE/login_provider:${CI_COMMIT_REF_NAME}
+ variables:
+ KANIKO_CONTEXT: "login_provider"
+ KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
+ extends: .kaniko_build
only:
changes:
- login_provider/**/*
- .gitlab-ci.yml
-login-provider-mock:
+login_provider_mock:
stage: build-test-images
- image:
- name: gcr.io/kaniko-project/executor:debug
- entrypoint: [""]
- script:
- - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- - /kaniko/executor --context ${CI_PROJECT_DIR}/login_provider/test/behave --dockerfile ${CI_PROJECT_DIR}/login_provider/test/behave/Dockerfile --destination $CI_REGISTRY_IMAGE/login_provider_mock:${CI_COMMIT_REF_NAME} --build-arg baseimage=$CI_REGISTRY_IMAGE/login_provider:${CI_COMMIT_REF_NAME}
+ variables:
+ KANIKO_CONTEXT: "login_provider"
+ KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
+ extends: .kaniko_build
only:
changes:
- login_provider/**/*
- .gitlab-ci.yml
-login-provider-test:
+login_provider_test:
stage: build-test-images
- image:
- name: gcr.io/kaniko-project/executor:debug
- entrypoint: [""]
- script:
- - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- - /kaniko/executor --context ${CI_PROJECT_DIR}/login_provider/test --dockerfile ${CI_PROJECT_DIR}/login_provider/test/Dockerfile --destination $CI_REGISTRY_IMAGE/login_provider_ci_test:${CI_COMMIT_REF_NAME}
+ variables:
+ KANIKO_CONTEXT: "login_provider"
+ KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
+ extends: .kaniko_build
only:
changes:
- login_provider/**/*
--
GitLab