Retag only on non-multiarch

Signed-off-by: Evan Lezar <elezar@nvidia.com>
NVIDIA · Nov 3, 2023 · 930c6ec · 930c6ec
1 parent 749fcd1
commit 930c6ec
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/deployments/container/Makefile b/deployments/container/Makefile
@@ -91,13 +91,8 @@ build-ubuntu%: DOCKERFILE_SUFFIX := ubuntu
 
 build-ubi8: DOCKERFILE_SUFFIX := ubi8
 
-# Handle the default build target
+# Handle the default build target.
 .PHONY: build
 build: $(DEFAULT_PUSH_TARGET)
-$(DEFAULT_PUSH_TARGET): DIST = $(DEFAULT_PUSH_TARGET)
-# For the default distribution we also retag the image.
-# Note: This needs to be updated for multi-arch images.
-ifeq ($(IMAGE_TAG),$(VERSION)-$(DIST))
 $(DEFAULT_PUSH_TARGET): build-$(DEFAULT_PUSH_TARGET)
-	$(DOCKER) tag $(IMAGE) $(subst :$(IMAGE_TAG),:$(VERSION),$(IMAGE))
-endif
+$(DEFAULT_PUSH_TARGET): DIST = $(DEFAULT_PUSH_TARGET)
diff --git a/deployments/container/native-only.mk b/deployments/container/native-only.mk
@@ -21,3 +21,10 @@ $(PUSH_TARGETS): push-%:
 push-short:
 	$(DOCKER) tag "$(IMAGE_NAME):$(VERSION)-$(DEFAULT_PUSH_TARGET)" "$(OUT_IMAGE_NAME):$(OUT_IMAGE_VERSION)"
 	$(DOCKER) push "$(OUT_IMAGE_NAME):$(OUT_IMAGE_VERSION)"
+
+# For the default distribution we also retag the image.
+# Note: This needs to be updated for multi-arch images.
+ifeq ($(IMAGE_TAG),$(VERSION)-$(DIST))
+$(DEFAULT_PUSH_TARGET):
+	$(DOCKER) tag $(IMAGE) $(subst :$(IMAGE_TAG),:$(VERSION),$(IMAGE))
+endif