From eec148c71f7be229ca0d170c237805dde2a525f5 Mon Sep 17 00:00:00 2001 From: Nicolas Cantu Date: Wed, 10 Sep 2025 12:18:50 +0200 Subject: [PATCH] ci: pass DOCKER_TAG as explicit arg to build_and_push.sh (mandatory) --- .gitea/workflows/dev-test.yml | 3 +-- scripts/build_and_push.sh | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/dev-test.yml b/.gitea/workflows/dev-test.yml index 14911f4..dfa96d2 100644 --- a/.gitea/workflows/dev-test.yml +++ b/.gitea/workflows/dev-test.yml @@ -32,5 +32,4 @@ jobs: REGISTRY: git.4nkweb.com run: | DOCKER_TAG=$(if [ -f .ci/tag.env ]; then source .ci/tag.env && echo "$DOCKER_TAG"; else echo "${GITHUB_REF_NAME:-dev-test}"; fi) - export DOCKER_TAG - bash scripts/build_and_push.sh + bash scripts/build_and_push.sh "$DOCKER_TAG" diff --git a/scripts/build_and_push.sh b/scripts/build_and_push.sh index 5d242a1..9f854dd 100644 --- a/scripts/build_and_push.sh +++ b/scripts/build_and_push.sh @@ -4,8 +4,12 @@ IFS=$'\n\t' REGISTRY=${REGISTRY:-git.4nkweb.com} NAMESPACE=${NAMESPACE:-4nk} +# Support d'un paramètre positionnel prioritaire pour le tag +if [ "${1:-}" != "" ]; then + DOCKER_TAG="$1" +fi if [ -z "${DOCKER_TAG:-}" ]; then - echo "[docker][erreur] DOCKER_TAG non défini (obligatoire). Exportez DOCKER_TAG ou fournissez-le via l'environnement." >&2 + echo "[docker][erreur] DOCKER_TAG non défini (obligatoire). Fournissez-le en argument ou via l'environnement." >&2 exit 1 fi