From b8ce6d0f97f15fbab8735ceb6a4a6f2b293b2008 Mon Sep 17 00:00:00 2001
From: Dave Enyeart <enyeart@us.ibm.com>
Date: Tue, 3 Oct 2023 11:30:26 -0400
Subject: [PATCH] Tag docker images with release (#4460)

When calling "make docker", tag the images with the
Fabric version and Fabric two-digit version number.
This will ensure that the correct ccenv and baseos
images can be found when building chaincode images.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 12259e894bb..6a95fec4f0d 100644
--- a/Makefile
+++ b/Makefile
@@ -249,7 +249,10 @@ $(BUILD_DIR)/images/%/$(DUMMY):
 		--build-arg TARGETARCH=$(ARCH) \
 		--build-arg TARGETOS=linux \
 		$(BUILD_ARGS) \
-		-t $(DOCKER_NS)/fabric-$* ./$(BUILD_CONTEXT)
+		-t $(DOCKER_NS)/fabric-$* \
+		-t $(DOCKER_NS)/fabric-$*:$(FABRIC_VER) \
+		-t $(DOCKER_NS)/fabric-$*:$(TWO_DIGIT_VERSION) \
+		./$(BUILD_CONTEXT)
 
 # builds release packages for the host platform
 .PHONY: release