From d49209de2b1b30f7c470401ff902f3a80b2ca80d Mon Sep 17 00:00:00 2001 From: Drew Minnear Date: Wed, 15 Oct 2025 16:30:36 -0400 Subject: [PATCH] container now based on ubi10 instead of alpine --- Containerfile | 9 ++++----- Makefile | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Containerfile b/Containerfile index dfc6916..4f34a50 100644 --- a/Containerfile +++ b/Containerfile @@ -1,9 +1,8 @@ -ARG GO_VERSION=1.24-alpine -ARG ALPINE_VERSION=latest +ARG GO_VERSION=1.24 ARG GOARCH=amd64 # Build stage -FROM docker.io/library/golang:${GO_VERSION} AS builder +FROM registry.access.redhat.com/ubi10/go-toolset:${GO_VERSION} AS builder WORKDIR /build @@ -14,9 +13,9 @@ COPY src/ . RUN CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} go build -a -installsuffix cgo -o patternizer . # Runtime stage -FROM docker.io/library/alpine:${ALPINE_VERSION} +FROM registry.access.redhat.com/ubi10/ubi-minimal:10.0 -RUN apk --no-cache add git +RUN microdnf --disableplugin=subscription-manager install -y git COPY --from=builder /build/patternizer /usr/local/bin/patternizer diff --git a/Makefile b/Makefile index 13c6340..556f42c 100644 --- a/Makefile +++ b/Makefile @@ -133,7 +133,7 @@ docs: ## Generate Go documentation check: lint-fmt lint-vet build test-unit ## Quick check (format, vet, build, unit tests) .PHONY: all -all: clean deps lint build test local-container-build ## Run everything +all: clean deps lint build test podman-build ## Run everything ##@ Conatiner-related tasks .PHONY: manifest @@ -149,7 +149,7 @@ amd64: manifest podman-build-amd64 ## Build the container on amd64 arm64: manifest podman-build-arm64 ## Build the container on arm64 .PHONY: podman-build -podman-build: podman-build-amd64 podman-build-arm64 ## Build both amd64 and arm64 +podman-build: manifest podman-build-amd64 podman-build-arm64 ## Build both amd64 and arm64 .PHONY: podman-build-amd64 podman-build-amd64: ## build the container in amd64