@@ -69,13 +69,16 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
6969# BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12
7070BASEIMAGE_PROD ?= alpine
7171BASEIMAGE_DBG ?= debian:12
72+ BASEIMAGE_UBI ?= registry.access.redhat.com/ubi10/ubi-minimal
7273
7374IMAGE := $(REGISTRY ) /$(BIN )
7475VERSION_PROD := $(VERSION )
7576VERSION_DBG := $(VERSION ) -dbg
77+ VERSION_UBI := $(VERSION ) -ubi
7678TAG := $(VERSION ) _$(OS ) _$(ARCH )
7779TAG_PROD := $(TAG )
7880TAG_DBG := $(VERSION ) -dbg_$(OS ) _$(ARCH )
81+ TAG_UBI := $(VERSION ) -ubi_$(OS ) _$(ARCH )
7982
8083GO_VERSION ?= 1.25
8184BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION )
@@ -98,6 +101,7 @@ BUILD_DIRS := bin/$(OS)_$(ARCH) \
98101
99102DOCKERFILE_PROD = Dockerfile.in
100103DOCKERFILE_DBG = Dockerfile.dbg
104+ DOCKERFILE_UBI = Dockerfile.ubi
101105
102106DOCKER_REPO_ROOT := /go/src/$(GO_PKG ) /$(REPO )
103107
@@ -313,7 +317,7 @@ endif
313317# Used to track state in hidden files.
314318DOTFILE_IMAGE = $(subst /,_,$(IMAGE ) ) -$(TAG )
315319
316- container : bin/.container-$(DOTFILE_IMAGE ) -PROD bin/.container-$(DOTFILE_IMAGE ) -DBG
320+ container : bin/.container-$(DOTFILE_IMAGE ) -PROD bin/.container-$(DOTFILE_IMAGE ) -DBG bin/.container- $( DOTFILE_IMAGE ) -UBI
317321ifeq (,$(SRC_REG ) )
318322bin/.container-$(DOTFILE_IMAGE ) -% : bin/$(BIN ) -$(OS ) -$(ARCH ) $(DOCKERFILE_% )
319323 @echo " container: $( IMAGE) :$( TAG_$* ) "
@@ -333,17 +337,17 @@ bin/.container-$(DOTFILE_IMAGE)-%:
333337 @echo
334338endif
335339
336- push : bin/.push-$(DOTFILE_IMAGE ) -PROD bin/.push-$(DOTFILE_IMAGE ) -DBG
340+ push : bin/.push-$(DOTFILE_IMAGE ) -PROD bin/.push-$(DOTFILE_IMAGE ) -DBG bin/.push- $( DOTFILE_IMAGE ) -UBI
337341bin/.push-$(DOTFILE_IMAGE ) -% : bin/.container-$(DOTFILE_IMAGE ) -%
338342 @docker push $(IMAGE ) :$(TAG_$* )
339343 @echo " pushed: $( IMAGE) :$( TAG_$* ) "
340344 @echo
341345
342346.PHONY : docker-manifest
343- docker-manifest : docker-manifest-PROD docker-manifest-DBG
347+ docker-manifest : docker-manifest-PROD docker-manifest-DBG docker-manifest-UBI
344348docker-manifest-% :
345- docker manifest create -a $(IMAGE ) :$(VERSION_$* ) $(foreach PLATFORM,$(DOCKER_PLATFORMS ) ,$(IMAGE ) :$(VERSION_$* ) _$(subst /,_,$(PLATFORM ) ) )
346- docker manifest push $(IMAGE ) :$(VERSION_$* )
349+ @ docker manifest create -a $(IMAGE ) :$(VERSION_$* ) $(foreach PLATFORM,$(DOCKER_PLATFORMS ) ,$(IMAGE ) :$(VERSION_$* ) _$(subst /,_,$(PLATFORM ) ) )
350+ @ docker manifest push $(IMAGE ) :$(VERSION_$* )
347351
348352.PHONY : test
349353test : unit-tests e2e-tests
0 commit comments