build: update base operator image to squid

With the stable release of v19.2.1, we update the Rook
operator base image to use this version to ensure
compatibility of ceph commands, in particular for
radosgw-admin.

Images pushed to the ceph quay repo are now manifested
so we can use the --platform flag when building the
docker image instead of pulling from separate repos.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit a6c4feb0af)
This commit is contained in:
Travis Nielsen authored and Mergify committed 2025-03-28 20:15:15 +00:00
1 parent 9b9fc19952
commit b705e57adf
1 file changed
+4 -8
+4 -8
View File
@@ -16,15 +16,11 @@ include ../image.mk
# ====================================================================================
# Image Build Options
CEPH_VERSION ?= v19.2.1-20250202
ifeq ($(GOARCH),amd64)
CEPH_VERSION ?= v18.2.4-20240723
else
CEPH_VERSION ?= v18.2.4-20240724
endif
REGISTRY_NAME = quay.io
BASEIMAGE = $(REGISTRY_NAME)/ceph/ceph-$(GOARCH):$(CEPH_VERSION)
CEPH_IMAGE = $(BUILD_REGISTRY)/ceph-$(GOARCH)
BASEIMAGE = $(REGISTRY_NAME)/ceph/ceph:$(CEPH_VERSION)
CEPH_IMAGE = $(BUILD_REGISTRY)/ceph
OPERATOR_SDK_VERSION = v1.25.0
# TODO: update to yq v4 - v3 end of life in Aug 2021 ; v4 removes the 'yq delete' cmd and changes syntax
YQv3_VERSION = 3.4.1
@@ -67,7 +63,7 @@ do.build:
@cp $(MANIFESTS_DIR)/create-external-cluster-resources.* $(BUILD_CONTEXT_DIR)/rook-external/
@cd $(BUILD_CONTEXT_DIR) && $(SED_IN_PLACE) 's|BASEIMAGE|$(BASEIMAGE)|g' Dockerfile
@if [ -z "$(BUILD_CONTAINER_IMAGE)" ]; then\
$(DOCKERCMD) build $(BUILD_ARGS) \
$(DOCKERCMD) build --platform linux/$(GOARCH) $(BUILD_ARGS) \
--build-arg S5CMD_VERSION=$(S5CMD_VERSION) \
--build-arg S5CMD_ARCH=$(S5CMD_ARCH) \
-t $(CEPH_IMAGE) \