build(trident): simplify image name

proves once again that naming is hard Signed-off-by: Clément Nussbaumer <[email protected]>
postfinance · Oct 25, 2024 · 1d74c3f · 1d74c3f
1 parent 7a3f42a
commit 1d74c3f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)