@@ -65,16 +65,18 @@ BIN_PLATFORMS := $(DOCKER_PLATFORMS) linux/arm windows/amd64 darwin/amd64 dar
6565OS := $(if $(GOOS ) ,$(GOOS ) ,$(shell go env GOOS) )
6666ARCH := $(if $(GOARCH ) ,$(GOARCH ) ,$(shell go env GOARCH) )
6767
68- # BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12
6968BASEIMAGE_PROD ?= alpine
7069BASEIMAGE_DBG ?= debian:12
70+ BASEIMAGE_UBI ?= registry.access.redhat.com/ubi10/ubi-minimal
7171
7272IMAGE := $(REGISTRY ) /$(BIN )
7373VERSION_PROD := $(VERSION )
7474VERSION_DBG := $(VERSION ) -dbg
75+ VERSION_UBI := $(VERSION ) -ubi
7576TAG := $(VERSION ) _$(OS ) _$(ARCH )
7677TAG_PROD := $(TAG )
7778TAG_DBG := $(VERSION ) -dbg_$(OS ) _$(ARCH )
79+ TAG_UBI := $(VERSION ) -ubi_$(OS ) _$(ARCH )
7880
7981GO_VERSION ?= 1.25
8082BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION )
@@ -96,6 +98,7 @@ BUILD_DIRS := bin/$(OS)_$(ARCH) \
9698
9799DOCKERFILE_PROD = Dockerfile.in
98100DOCKERFILE_DBG = Dockerfile.dbg
101+ DOCKERFILE_UBI = Dockerfile.ubi
99102
100103DOCKER_REPO_ROOT := /go/src/$(GO_PKG ) /$(REPO )
101104
@@ -290,7 +293,7 @@ endif
290293# Used to track state in hidden files.
291294DOTFILE_IMAGE = $(subst /,_,$(IMAGE ) ) -$(TAG )
292295
293- container : bin/.container-$(DOTFILE_IMAGE ) -PROD bin/.container-$(DOTFILE_IMAGE ) -DBG
296+ container : bin/.container-$(DOTFILE_IMAGE ) -PROD bin/.container-$(DOTFILE_IMAGE ) -DBG bin/.container- $( DOTFILE_IMAGE ) -UBI
294297ifeq (,$(SRC_REG ) )
295298bin/.container-$(DOTFILE_IMAGE ) -% : bin/$(BIN ) -$(OS ) -$(ARCH ) $(DOCKERFILE_% )
296299 @echo " container: $( IMAGE) :$( TAG_$* ) "
@@ -310,7 +313,7 @@ bin/.container-$(DOTFILE_IMAGE)-%:
310313 @echo
311314endif
312315
313- push : bin/.push-$(DOTFILE_IMAGE ) -PROD bin/.push-$(DOTFILE_IMAGE ) -DBG
316+ push : bin/.push-$(DOTFILE_IMAGE ) -PROD bin/.push-$(DOTFILE_IMAGE ) -DBG bin/.push- $( DOTFILE_IMAGE ) -UBI
314317bin/.push-$(DOTFILE_IMAGE ) -% : bin/.container-$(DOTFILE_IMAGE ) -%
315318 @docker push $(IMAGE ) :$(TAG_$* )
316319 @echo " pushed: $( IMAGE) :$( TAG_$* ) "
@@ -324,10 +327,13 @@ docker-manifest:
324327 @$(MAKE ) docker-manifest-DBG \
325328 --no-print-directory \
326329 BIN=konnector
330+ @$(MAKE ) docker-manifest-UBI \
331+ --no-print-directory \
332+ BIN=konnector
327333
328334docker-manifest-% :
329- docker manifest create -a $(IMAGE ) :$(VERSION_$* ) $(foreach PLATFORM,$(DOCKER_PLATFORMS ) ,$(IMAGE ) :$(VERSION_$* ) _$(subst /,_,$(PLATFORM ) ) )
330- docker manifest push $(IMAGE ) :$(VERSION_$* )
335+ @ docker manifest create -a $(IMAGE ) :$(VERSION_$* ) $(foreach PLATFORM,$(DOCKER_PLATFORMS ) ,$(IMAGE ) :$(VERSION_$* ) _$(subst /,_,$(PLATFORM ) ) )
336+ @ docker manifest push $(IMAGE ) :$(VERSION_$* )
331337
332338.PHONY : test
333339test : unit-tests e2e-tests
0 commit comments