From f3a636bcd528c26bac57437a85db211b355c4871 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Mon, 16 Sep 2019 11:43:00 +0200
Subject: [PATCH] Use KANIKO_BUILD_IMAGENAME instead of KANIKO_IMAGENAME
---
.gitlab-ci.yml | 2 +-
.gitlab/ci_templates/kaniko.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da92db2ce..fe66ad30e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ variables:
ci_test_image:
variables:
KANIKO_CONTEXT: "test"
- KANIKO_IMAGENAME: "openappstack-ci"
+ KANIKO_BUILD_IMAGENAME: "openappstack-ci"
stage: build
image:
# We need a shell to provide the registry credentials, so we need to use the
diff --git a/.gitlab/ci_templates/kaniko.yml b/.gitlab/ci_templates/kaniko.yml
index 605697aa8..967b8b331 100644
--- a/.gitlab/ci_templates/kaniko.yml
+++ b/.gitlab/ci_templates/kaniko.yml
@@ -1,5 +1,5 @@
# Optional environment variables:
-# - KANIKO_IMAGENAME
+# - KANIKO_BUILD_IMAGENAME: Build/target image image
# - KANIKO_CONTEXT: The subdir which holds the Dockerfile, leave unset if
# the Dockerfile is located at root level of the project.
.kaniko_build:
@@ -11,4 +11,4 @@
entrypoint: [""]
script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- - /kaniko/executor --context ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.} --dockerfile ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.}/Dockerfile --destination $CI_REGISTRY_IMAGE/${KANIKO_IMAGENAME/#//}:${CI_COMMIT_REF_NAME}
+ - /kaniko/executor --context ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.} --dockerfile ${CI_PROJECT_DIR}/${KANIKO_CONTEXT:-.}/Dockerfile --destination $CI_REGISTRY_IMAGE/${KANIKO_BUILD_IMAGENAME/#//}:${CI_COMMIT_REF_NAME}
--
GitLab