From 177204854f5aa6c5854e4065ed456ae09148361f Mon Sep 17 00:00:00 2001 From: sylwit Date: Fri, 6 Jun 2025 17:01:26 -0400 Subject: [PATCH 1/3] feat: bump alpine to 3.22 [RL-342] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 72476d6df..77e14c025 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ COPY internal/ internal/ ENV CGO_ENABLED=0 RUN xx-go build -trimpath -a -o helm-controller main.go -FROM alpine:3.17 +FROM alpine:3.22 # link repo to the GitHub Container Registry image LABEL org.opencontainers.image.source="https://github.com/fluxcd/helm-controller" From f65a33693205539a602be7eca2e9d93c664f5d28 Mon Sep 17 00:00:00 2001 From: sylwit Date: Fri, 6 Jun 2025 17:49:53 -0400 Subject: [PATCH 2/3] feat: bump alpine to 3.22 and go to 1.24[RL-342] --- Dockerfile | 2 +- README.md | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 77e14c025..ea17b856d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.19 +ARG GO_VERSION=1.24 ARG XX_VERSION=1.1.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx diff --git a/README.md b/README.md index 1e9ff704c..29b34928a 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,15 @@ [![license](https://img.shields.io/github/license/fluxcd/helm-controller.svg)](https://github.com/fluxcd/helm-controller/blob/main/LICENSE) [![release](https://img.shields.io/github/release/fluxcd/helm-controller/all.svg)](https://github.com/fluxcd/helm-controller/releases) +## VGS fork + +``` +export IMG=190066226418.dkr.ecr.us-east-1.amazonaws.com/infra/helm-controller:v0.29.0-20250606 +make docker-build +assume presidio-infra +make docker-push +``` + The helm-controller is a Kubernetes operator, allowing one to declaratively manage Helm chart releases. It is part of a composable [GitOps toolkit](https://fluxcd.io/flux/components) and depends on [source-controller][] to acquire the Helm charts from Helm From 0db9642bb61f365a919d03e65fe141e790b5d8ab Mon Sep 17 00:00:00 2001 From: sylwit Date: Mon, 9 Jun 2025 11:55:52 -0400 Subject: [PATCH 3/3] feat: bump alpine to 3.22 and go to 1.24 [RL-342] --- Dockerfile | 4 ++-- README.md | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ea17b856d..f5915f7e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ ARG GO_VERSION=1.24 -ARG XX_VERSION=1.1.0 +ARG XX_VERSION=1.6.1 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx # Docker buildkit multi-arch build requires golang alpine -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 / / diff --git a/README.md b/README.md index 29b34928a..1b77f173b 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,10 @@ ## VGS fork ``` -export IMG=190066226418.dkr.ecr.us-east-1.amazonaws.com/infra/helm-controller:v0.29.0-20250606 +today=$(date +%Y%m%d) +export IMG="190066226418.dkr.ecr.us-east-1.amazonaws.com/infra/helm-controller:v0.29.0-$today" make docker-build -assume presidio-infra +assume presidio/infra make docker-push ```