From 1f0ed177aea89b5f7adfe2488a92fbb73337a7f9 Mon Sep 17 00:00:00 2001 From: sylwit Date: Mon, 9 Jun 2025 12:54:14 -0400 Subject: [PATCH] feat: bump alpine to 3.22 and go to 1.24 [RL-342] --- Dockerfile | 8 ++++---- README.md | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index db277915e..cc84615eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -ARG GO_VERSION=1.19 -ARG XX_VERSION=1.1.0 +ARG GO_VERSION=1.24 +ARG XX_VERSION=1.6.1 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx -FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine as builder +FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS builder # Copy the build utilities. COPY --from=xx / / @@ -31,7 +31,7 @@ COPY internal/ internal/ ENV CGO_ENABLED=0 RUN xx-go build -trimpath -a -o kustomize-controller main.go -FROM alpine:3.17 +FROM alpine:3.22 # Uses GnuPG from edge to patch CVE-2022-3515. RUN apk add --no-cache ca-certificates tini git openssh-client && \ diff --git a/README.md b/README.md index d79a193ab..37aaf50fa 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,16 @@ [![license](https://img.shields.io/github/license/fluxcd/kustomize-controller.svg)](https://github.com/fluxcd/kustomize-controller/blob/main/LICENSE) [![release](https://img.shields.io/github/release/fluxcd/kustomize-controller/all.svg)](https://github.com/fluxcd/kustomize-controller/releases) +## VGS fork + +``` +today=$(date +%Y%m%d) +export IMG="190066226418.dkr.ecr.us-east-1.amazonaws.com/infra/kustomize-controller:v0.33.0-$today" +make docker-build +assume presidio/infra +make docker-push +``` + The kustomize-controller is a [Flux](https://github.com/fluxcd/flux2) component, specialized in running continuous delivery pipelines for infrastructure and workloads defined with Kubernetes manifests and assembled with Kustomize.