From 1d74c3fd53d588054308e11fc560558d9372112e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Nussbaumer?= Date: Fri, 25 Oct 2024 12:08:50 +0200 Subject: [PATCH] build(trident): simplify image name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit proves once again that naming is hard Signed-off-by: Clément Nussbaumer --- .github/workflows/trident.yaml | 2 +- trident-distrowith/makefile.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trident.yaml b/.github/workflows/trident.yaml index 290265e..76c2b10 100644 --- a/.github/workflows/trident.yaml +++ b/.github/workflows/trident.yaml @@ -42,7 +42,7 @@ jobs: env: BUILD_TYPE: stable run: | - export CUSTOM_IMAGE_TAG=pf-$(echo $GITHUB_REF_NAME | tr "/" "-") && \ + export CUSTOM_IMAGE_TAG=$(echo $GITHUB_REF_NAME | tr "/" "-") && \ make images - name: List docker images diff --git a/trident-distrowith/makefile.patch b/trident-distrowith/makefile.patch index 9d5fb32..2e87d75 100644 --- a/trident-distrowith/makefile.patch +++ b/trident-distrowith/makefile.patch @@ -16,7 +16,7 @@ +CUSTOM_IMAGE_TAG ?= # tag variables -TRIDENT_TAG := $(REGISTRY)/$(TRIDENT_IMAGE):$(TRIDENT_VERSION) -+TRIDENT_TAG := $(REGISTRY)/$(TRIDENT_IMAGE)-$(TRIDENT_VERSION):$(CUSTOM_IMAGE_TAG) ++TRIDENT_TAG := $(REGISTRY)/$(TRIDENT_IMAGE):$(TRIDENT_VERSION)-$(CUSTOM_IMAGE_TAG) OPERATOR_TAG := $(REGISTRY)/$(OPERATOR_IMAGE):$(TRIDENT_VERSION) TRIDENT_IMAGE_REPO := $(REGISTRY)/$(TRIDENT_IMAGE): DEFAULT_OPERATOR_TAG := $(DEFAULT_REGISTRY)/$(OPERATOR_IMAGE):$(VERSION)