From cee99ba99e9f22208b7c7446d13e35746858c557 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Thu, 3 Jun 2021 03:03:02 +0200
Subject: [PATCH] Rework parameter handling
This patch moves the parameter for the registry format from a
pre-defined variable, that is supposed to be overwritten by users, to an
own variable, that is set by default for compatiblity reasons and users
can override if they want to.
---
gitlab-ci-template.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gitlab-ci-template.yml b/gitlab-ci-template.yml
index 55a0a83..85ee3b7 100644
--- a/gitlab-ci-template.yml
+++ b/gitlab-ci-template.yml
@@ -3,10 +3,12 @@ stages:
- tag
variables:
- CI_REGISTRY_BUILD_ARGS: "--format docker"
+ CI_REGISTRY_BUILD_ARGS: ""
container-build:
stage: build
+ variables:
+ CI_REGISTRY_CONTAINER_FORMAT: "docker"
inherit:
default: false
variables:
@@ -24,7 +26,7 @@ container-build:
- export VCS_URL=$CI_PROJECT_URL
script:
- si-fix "${CI_REGISTRY_BUILD_DOCKERFILE:-./Dockerfile}"
- - podman build --pull
+ - podman build --pull --format "$CI_REGISTRY_CONTAINER_FORMAT"
--label "org.opencontainers.image.source=$CI_PROJECT_URL"
--label "org.opencontainers.image.revision=$CI_COMMIT_SHA"
--label "org.opencontainers.image.created=$(date --rfc-3339 ns)"
--
GitLab