From d3306c4c475f2b76053cf8ba583e2f5b67728ff7 Mon Sep 17 00:00:00 2001 From: Anna Strukova Date: Wed, 22 Nov 2023 17:22:57 +0100 Subject: [PATCH 1/2] Add 2nd tag with major and minor versions to the image in at kamu-web-ui stage --- images/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/Makefile b/images/Makefile index 173978e7..2fa0fa4b 100644 --- a/images/Makefile +++ b/images/Makefile @@ -5,6 +5,9 @@ IMAGE_REPO = ghcr.io/kamu-data KAMU_WEB_UI_VERSION = $(shell cat ../package.json | jq -r '.version') KAMU_WEB_UI_IMAGE = $(IMAGE_REPO)/kamu-web-ui +KAMU_WEB_UI_MAJOR_VERSION = $(shell echo $(KAMU_WEB_UI_VERSION) | cut -d. -f 1) +KAMU_WEB_UI_MINOR_VERSION = $(shell echo $(KAMU_WEB_UI_VERSION) | cut -d. -f 2) + ######################################################################################### .PHONY: kamu-web-ui @@ -12,6 +15,7 @@ kamu-web-ui: docker build \ --build-arg KAMU_WEB_UI_VERSION=$(KAMU_WEB_UI_VERSION) \ -t $(KAMU_WEB_UI_IMAGE):$(KAMU_WEB_UI_VERSION) \ + -t $(KAMU_WEB_UI_IMAGE):$(KAMU_WEB_UI_MAJOR_VERSION).$(KAMU_WEB_UI_MINOR_VERSION) \ kamu-web-ui/ From 8f64bc0063459ef9c8fbc3c1543f20af96668fe9 Mon Sep 17 00:00:00 2001 From: Anna Strukova Date: Thu, 23 Nov 2023 20:53:12 +0100 Subject: [PATCH 2/2] Push image with major.minor tag --- images/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/images/Makefile b/images/Makefile index 2fa0fa4b..26a295de 100644 --- a/images/Makefile +++ b/images/Makefile @@ -22,6 +22,7 @@ kamu-web-ui: .PHONY: kamu-web-ui-push kamu-web-ui-push: docker push $(KAMU_WEB_UI_IMAGE):$(KAMU_WEB_UI_VERSION) + docker push $(KAMU_WEB_UI_IMAGE):$(KAMU_WEB_UI_MAJOR_VERSION).$(KAMU_WEB_UI_MINOR_VERSION) docker tag $(KAMU_WEB_UI_IMAGE):$(KAMU_WEB_UI_VERSION) $(KAMU_WEB_UI_IMAGE):latest docker push $(KAMU_WEB_UI_IMAGE):latest