From e0d31b121793bcb0ee0b2909400a3923fc09b414 Mon Sep 17 00:00:00 2001 From: dd di cesare Date: Mon, 4 Nov 2024 13:58:39 +0100 Subject: [PATCH] [make] Building docker catalog with specific opm base image Signed-off-by: dd di cesare --- make/catalog.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/make/catalog.mk b/make/catalog.mk index fe9e0ef4..db28e550 100644 --- a/make/catalog.mk +++ b/make/catalog.mk @@ -3,12 +3,20 @@ # The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v0.2.0). CATALOG_IMG ?= $(IMAGE_TAG_BASE)-catalog:$(IMAGE_TAG) +OPM_DOCKERFILE_VERSION ?= 1.28.0 + +ifeq ($(origin CATALOG_ARCH),undefined) +OPM_DOCKERFILE_TAG = latest +else +OPM_DOCKERFILE_TAG = v$(OPM_DOCKERFILE_VERSION)-$(CATALOG_ARCH) +endif + CATALOG_FILE = $(PROJECT_DIR)/catalog/authorino-operator-catalog/operator.yaml CATALOG_DOCKERFILE = $(PROJECT_DIR)/catalog/authorino-operator-catalog.Dockerfile $(CATALOG_DOCKERFILE): $(OPM) -mkdir -p $(PROJECT_DIR)/catalog/authorino-operator-catalog - cd $(PROJECT_DIR)/catalog && $(OPM) generate dockerfile authorino-operator-catalog + cd $(PROJECT_DIR)/catalog && $(OPM) generate dockerfile authorino-operator-catalog -i "quay.io/operator-framework/opm:${OPM_DOCKERFILE_TAG}" catalog-dockerfile: $(CATALOG_DOCKERFILE) ## Generate catalog dockerfile. $(CATALOG_FILE): $(OPM) $(YQ)