Add Make target to re-push image

Author: thegridman

Makefile

@@ -59,18 +59,24 @@ GITHUB_REGISTRY         := ghcr.io/oracle
 OPERATOR_IMAGE_NAME     := coherence-operator
 OPERATOR_IMAGE_REGISTRY ?= $(ORACLE_REGISTRY)
 OPERATOR_IMAGE_ARM      := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)-arm64
+PREV_OPERATOR_IMAGE_ARM := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(PREV_VERSION)-arm64
 OPERATOR_IMAGE_AMD      := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)-amd64
+PREV_OPERATOR_IMAGE_AMD := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(PREV_VERSION)-amd64
 OPERATOR_IMAGE          := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)
+PREV_OPERATOR_IMAGE     := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(PREV_VERSION)
 OPERATOR_IMAGE_DELVE    := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):delve
 OPERATOR_IMAGE_DEBUG    := $(OPERATOR_IMAGE_REGISTRY)/$(OPERATOR_IMAGE_NAME):debug
 OPERATOR_BASE_IMAGE     ?= scratch
 
 # The registry we release (push) the operator images to, which can be different to the registry
 # used to build and test the operator.
-OPERATOR_RELEASE_REGISTRY ?= $(OPERATOR_IMAGE_REGISTRY)
-OPERATOR_RELEASE_IMAGE    := $(OPERATOR_RELEASE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)
-OPERATOR_RELEASE_ARM      := $(OPERATOR_RELEASE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)-arm64
-OPERATOR_RELEASE_AMD      := $(OPERATOR_RELEASE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)-amd64
+OPERATOR_RELEASE_REGISTRY   ?= $(OPERATOR_IMAGE_REGISTRY)
+OPERATOR_RELEASE_IMAGE      := $(OPERATOR_RELEASE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)
+PREV_OPERATOR_RELEASE_IMAGE := $(OPERATOR_RELEASE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(PREV_VERSION)
+OPERATOR_RELEASE_ARM        := $(OPERATOR_RELEASE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)-arm64
+PREV_OPERATOR_RELEASE_ARM   := $(OPERATOR_RELEASE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(PREV_VERSION)-arm64
+OPERATOR_RELEASE_AMD        := $(OPERATOR_RELEASE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(VERSION)-amd64
+PREV_OPERATOR_RELEASE_AMD   := $(OPERATOR_RELEASE_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(PREV_VERSION)-amd64
 
 # ----------------------------------------------------------------------------------------------------------------------
 # The Coherence image to use for deployments that do not specify an image
@@ -2667,6 +2673,30 @@ endif
 	&& export DOCKER_CMD=$(DOCKER_CMD) \
 	&& $(SCRIPTS_DIR)/buildah/run-buildah.sh PUSH
 
+.PHONY: rebuild-operator
+rebuild-operator: ## Rebuild the Coherence Operator image
+	@echo $(BUILD_DATE) > $(BUILD_OUTPUT)/build-date.txt
+	$(DOCKER_CMD) build --platform linux/amd64 --no-cache --build-arg BASE_IMAGE=$(PREV_OPERATOR_IMAGE) \
+		--load -t $(PREV_OPERATOR_IMAGE_AMD) .
+	$(DOCKER_CMD) build --platform linux/arm64 --no-cache --build-arg BASE_IMAGE=$(PREV_OPERATOR_IMAGE) \
+		--load -t $(PREV_OPERATOR_IMAGE_ARM) .
+
+.PHONY: re-push-operator-image
+re-push-operator-image: rebuild-operator
+ifneq ("$(OPERATOR_RELEASE_REGISTRY)","$(OPERATOR_IMAGE_REGISTRY)")
+	$(DOCKER_CMD) tag $(PREV_OPERATOR_IMAGE_ARM) $(PREV_OPERATOR_RELEASE_ARM)
+	$(DOCKER_CMD) tag $(PREV_OPERATOR_IMAGE_AMD) $(PREV_OPERATOR_RELEASE_AMD)
+endif
+	chmod +x $(SCRIPTS_DIR)/buildah/run-buildah.sh
+	export OPERATOR_IMAGE=$(PREV_OPERATOR_RELEASE_IMAGE) \
+	&& export OPERATOR_IMAGE_AMD=$(PREV_OPERATOR_RELEASE_AMD) \
+	&& export OPERATOR_IMAGE_ARM=$(PREV_OPERATOR_RELEASE_ARM) \
+	&& export OPERATOR_IMAGE_REGISTRY=$(PREV_OPERATOR_RELEASE_REGISTRY) \
+	&& export VERSION=$(PREV_VERSION) \
+	&& export REVISION=$(GITCOMMIT) \
+	&& export NO_DOCKER_DAEMON=$(NO_DOCKER_DAEMON) \
+	&& export DOCKER_CMD=$(DOCKER_CMD) \
+	&& $(SCRIPTS_DIR)/buildah/run-buildah.sh PUSH
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Push the Operator JIB Test Docker images

rebuild.Dockerfile

@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2019, 2025, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at
+# http://oss.oracle.com/licenses/upl.
+#
+ARG BASE_IMAGE
+FROM BASE_IMAGE
+
+COPY build/build-date.txt /files/build-date.txt