@@ -65,17 +65,20 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
6565
6666BASEIMAGE_PROD ?= alpine
6767BASEIMAGE_DBG ?= debian:12
68+ BASEIMAGE_UBI ?= registry.access.redhat.com/ubi10/ubi-minimal
6869
6970IMAGE := $(REGISTRY ) /$(BIN )
7071VERSION_PROD := $(VERSION )
7172VERSION_DBG := $(VERSION ) -dbg
73+ VERSION_UBI := $(VERSION ) -ubi
7274TAG := $(VERSION ) _$(OS ) _$(ARCH )
7375TAG_PROD := $(TAG )
7476TAG_DBG := $(VERSION ) -dbg_$(OS ) _$(ARCH )
77+ TAG_UBI := $(VERSION ) -ubi_$(OS ) _$(ARCH )
7578
76- GO_VERSION ?= 1.24
79+ GO_VERSION ?= 1.25
7780BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION )
78- CHART_TEST_IMAGE ?= quay.io/helmpack/chart-testing:v3.11 .0
81+ CHART_TEST_IMAGE ?= quay.io/helmpack/chart-testing:v3.13 .0
7982
8083OUTBIN = bin/$(BIN ) -$(OS ) -$(ARCH )
8184ifeq ($(OS ) ,windows)
@@ -93,6 +96,7 @@ BUILD_DIRS := bin/$(OS)_$(ARCH) \
9396
9497DOCKERFILE_PROD = Dockerfile.in
9598DOCKERFILE_DBG = Dockerfile.dbg
99+ DOCKERFILE_UBI = Dockerfile.ubi
96100
97101DOCKER_REPO_ROOT := /go/src/$(GO_PKG ) /$(REPO )
98102
@@ -220,15 +224,16 @@ endif
220224# Used to track state in hidden files.
221225DOTFILE_IMAGE = $(subst /,_,$(IMAGE ) ) -$(TAG )
222226
223- container : bin/.container-$(DOTFILE_IMAGE ) -PROD bin/.container-$(DOTFILE_IMAGE ) -DBG
227+ container : bin/.container-$(DOTFILE_IMAGE ) -PROD bin/.container-$(DOTFILE_IMAGE ) -DBG bin/.container- $( DOTFILE_IMAGE ) -UBI
224228ifeq (,$(SRC_REG ) )
225229bin/.container-$(DOTFILE_IMAGE ) -% : bin/$(BIN ) -$(OS ) -$(ARCH ) $(DOCKERFILE_% )
226230 @echo " container: $( IMAGE) :$( TAG_$* ) "
227- @sed \
231+ @sed \
228232 -e ' s|{ARG_BIN}|$(BIN)|g' \
229233 -e ' s|{ARG_ARCH}|$(ARCH)|g' \
230234 -e ' s|{ARG_OS}|$(OS)|g' \
231235 -e ' s|{ARG_FROM}|$(BASEIMAGE_$*)|g' \
236+ -e ' s|{ARG_TAG}|$(TAG)|g' \
232237 $(DOCKERFILE_$* ) > bin/.dockerfile-$* -$(OS ) _$(ARCH )
233238 @docker buildx build --platform $(OS ) /$(ARCH ) --load --pull -t $(IMAGE ) :$(TAG_$* ) -f bin/.dockerfile-$* -$(OS ) _$(ARCH ) .
234239 @docker images -q $(IMAGE ) :$(TAG_$* ) > $@
@@ -240,17 +245,17 @@ bin/.container-$(DOTFILE_IMAGE)-%:
240245 @echo
241246endif
242247
243- push : bin/.push-$(DOTFILE_IMAGE ) -PROD bin/.push-$(DOTFILE_IMAGE ) -DBG
248+ push : bin/.push-$(DOTFILE_IMAGE ) -PROD bin/.push-$(DOTFILE_IMAGE ) -DBG bin/.push- $( DOTFILE_IMAGE ) -UBI
244249bin/.push-$(DOTFILE_IMAGE ) -% : bin/.container-$(DOTFILE_IMAGE ) -%
245250 @docker push $(IMAGE ) :$(TAG_$* )
246251 @echo " pushed: $( IMAGE) :$( TAG_$* ) "
247252 @echo
248253
249254.PHONY : docker-manifest
250- docker-manifest : docker-manifest-PROD docker-manifest-DBG
255+ docker-manifest : docker-manifest-PROD docker-manifest-DBG docker-manifest-UBI
251256docker-manifest-% :
252- docker manifest create -a $(IMAGE ) :$(VERSION_$* ) $(foreach PLATFORM,$(DOCKER_PLATFORMS ) ,$(IMAGE ) :$(VERSION_$* ) _$(subst /,_,$(PLATFORM ) ) )
253- docker manifest push $(IMAGE ) :$(VERSION_$* )
257+ @ docker manifest create -a $(IMAGE ) :$(VERSION_$* ) $(foreach PLATFORM,$(DOCKER_PLATFORMS ) ,$(IMAGE ) :$(VERSION_$* ) _$(subst /,_,$(PLATFORM ) ) )
258+ @ docker manifest push $(IMAGE ) :$(VERSION_$* )
254259
255260.PHONY : test
256261test : unit-tests
0 commit comments