From 9558a486e2e9c6967ab0fe39adccc701d6bbd041 Mon Sep 17 00:00:00 2001 From: Bohdan Pysarenko Date: Wed, 4 Feb 2026 10:53:42 +0200 Subject: [PATCH 1/6] update dockerfile with dhi --- installer-image/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/installer-image/Dockerfile b/installer-image/Dockerfile index 36930ae02..c4dc59c11 100644 --- a/installer-image/Dockerfile +++ b/installer-image/Dockerfile @@ -1,17 +1,16 @@ -FROM golang:1.24.6 AS go-build +FROM octopusdeploy/dhi-golang:1.24-alpine3.23-dev AS go-build RUN go install github.com/davidrjonas/semver-cli@latest \ && cp $GOPATH/bin/semver-cli /usr/local/bin/ #bookworm-slim -FROM debian:13-slim +FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian-13 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections ARG CF_CLI_VERSION=v0.2.16 ARG TARGETARCH -RUN apt-get update && apt-get install curl jq -y RUN curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/${CF_CLI_VERSION}/cf-linux-${TARGETARCH}.tar.gz | tar zx && mv ./cf-linux-${TARGETARCH} /usr/local/bin/cf COPY --from=go-build /usr/local/bin/semver-cli /usr/local/bin/semver-cli From e22770fd4fcc38658568a20092568e51425c0a3e Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Wed, 4 Feb 2026 16:41:19 +0400 Subject: [PATCH 2/6] build: refactor Dockerfile --- installer-image/Dockerfile | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/installer-image/Dockerfile b/installer-image/Dockerfile index c4dc59c11..243a2f06e 100644 --- a/installer-image/Dockerfile +++ b/installer-image/Dockerfile @@ -1,21 +1,14 @@ -FROM octopusdeploy/dhi-golang:1.24-alpine3.23-dev AS go-build +# syntax=docker/dockerfile:1 +FROM octopusdeploy/dhi-golang:1.24-alpine3.23-dev AS go-build RUN go install github.com/davidrjonas/semver-cli@latest \ && cp $GOPATH/bin/semver-cli /usr/local/bin/ -#bookworm-slim +# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base/customizations/-1316986597936591264 FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian-13 - -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections - ARG CF_CLI_VERSION=v0.2.16 ARG TARGETARCH - -RUN curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/${CF_CLI_VERSION}/cf-linux-${TARGETARCH}.tar.gz | tar zx && mv ./cf-linux-${TARGETARCH} /usr/local/bin/cf -COPY --from=go-build /usr/local/bin/semver-cli /usr/local/bin/semver-cli - -COPY --from=bitnamilegacy/kubectl:1.33.4 /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/ - -RUN useradd -m -s /bin/bash codefresh -USER codefresh +ADD --unpack=true --chown=nonroot:nonroot --chmod=755 https://github.com/codefresh-io/cli-v2/releases/download/${CF_CLI_VERSION}/cf-linux-${TARGETARCH}.tar.gz /usr/local/bin/cf +COPY --from=go-build --chown=nonroot:nonroot --chmod=755 /usr/local/bin/semver-cli /usr/local/bin/semver-cli +USER nonroot WORKDIR /home/codefresh From a1c13f2f3f300dc78a0e747de078f99391b5f7d7 Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Wed, 4 Feb 2026 16:44:39 +0400 Subject: [PATCH 3/6] build: change customization --- installer-image/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installer-image/Dockerfile b/installer-image/Dockerfile index 243a2f06e..c59b2f274 100644 --- a/installer-image/Dockerfile +++ b/installer-image/Dockerfile @@ -4,8 +4,8 @@ FROM octopusdeploy/dhi-golang:1.24-alpine3.23-dev AS go-build RUN go install github.com/davidrjonas/semver-cli@latest \ && cp $GOPATH/bin/semver-cli /usr/local/bin/ -# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base/customizations/-1316986597936591264 -FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian-13 +# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base/customizations/8106437942896324135 +FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian13 ARG CF_CLI_VERSION=v0.2.16 ARG TARGETARCH ADD --unpack=true --chown=nonroot:nonroot --chmod=755 https://github.com/codefresh-io/cli-v2/releases/download/${CF_CLI_VERSION}/cf-linux-${TARGETARCH}.tar.gz /usr/local/bin/cf From 6855e4f4abe3a3e2f1b244790ecbc068f4d05ae1 Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Thu, 5 Feb 2026 10:34:53 +0400 Subject: [PATCH 4/6] build: refactor Dockerfile --- installer-image/Dockerfile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/installer-image/Dockerfile b/installer-image/Dockerfile index c59b2f274..c5fbbd829 100644 --- a/installer-image/Dockerfile +++ b/installer-image/Dockerfile @@ -1,14 +1,18 @@ # syntax=docker/dockerfile:1 -FROM octopusdeploy/dhi-golang:1.24-alpine3.23-dev AS go-build + +FROM octopusdeploy/dhi-golang:1.25-debian13-dev AS build +ARG TARGETARCH +ARG CF_CLI_VERSION=v0.2.16 RUN go install github.com/davidrjonas/semver-cli@latest \ - && cp $GOPATH/bin/semver-cli /usr/local/bin/ + && cp $GOPATH/bin/semver-cli /tmp/semver-cli +ADD --unpack=true --chown=nonroot:nonroot --chmod=755 https://github.com/codefresh-io/cli-v2/releases/download/${CF_CLI_VERSION}/cf-linux-${TARGETARCH}.tar.gz /tmp/cf/ + # DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base/customizations/8106437942896324135 -FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian13 -ARG CF_CLI_VERSION=v0.2.16 +FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian13 AS production ARG TARGETARCH -ADD --unpack=true --chown=nonroot:nonroot --chmod=755 https://github.com/codefresh-io/cli-v2/releases/download/${CF_CLI_VERSION}/cf-linux-${TARGETARCH}.tar.gz /usr/local/bin/cf -COPY --from=go-build --chown=nonroot:nonroot --chmod=755 /usr/local/bin/semver-cli /usr/local/bin/semver-cli -USER nonroot +COPY --from=build --chown=nonroot:nonroot --chmod=755 /tmp/cf/cf-linux-${TARGETARCH} /usr/local/bin/cf +COPY --from=build --chown=nonroot:nonroot --chmod=755 /tmp/semver-cli /usr/local/bin/semver-cli WORKDIR /home/codefresh +USER nonroot From d073a42c079d4e8eb894b1b8feb3fe50eeb33ac2 Mon Sep 17 00:00:00 2001 From: Bohdan Pysarenko Date: Thu, 5 Feb 2026 09:55:33 +0200 Subject: [PATCH 5/6] add hash --- installer-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer-image/Dockerfile b/installer-image/Dockerfile index c5fbbd829..169e83bbf 100644 --- a/installer-image/Dockerfile +++ b/installer-image/Dockerfile @@ -10,7 +10,7 @@ ADD --unpack=true --chown=nonroot:nonroot --chmod=755 https://github.com/codefre # DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base/customizations/8106437942896324135 -FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian13 AS production +FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian13@sha256:e72836b4e4c408f04caf8ac6e34824d90e192b7cecedab9aeed647e14d0cd599 AS production ARG TARGETARCH COPY --from=build --chown=nonroot:nonroot --chmod=755 /tmp/cf/cf-linux-${TARGETARCH} /usr/local/bin/cf COPY --from=build --chown=nonroot:nonroot --chmod=755 /tmp/semver-cli /usr/local/bin/semver-cli From 20671d233bdd2bf6ee0b778dcde6709830039d04 Mon Sep 17 00:00:00 2001 From: Bohdan Pysarenko Date: Thu, 5 Feb 2026 10:05:15 +0200 Subject: [PATCH 6/6] update codeowners --- CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 2c5f66a4c..385e6dc2d 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,4 +1,4 @@ -* @codefresh-io/teamleads +* @codefresh-io/teamleads @masontikhonov .github @codefresh-io/DevOps @@ -7,4 +7,4 @@ /charts/gitops-runtime/tests @codefresh-io/DevOps # gitops operator crd changes can be approved by some other people -/charts/gitops-runtime/templates/_components/gitops-operator/crds @codefresh-io/DevOps @dmaizel @eti-codefresh @chen-keinan @scme0 \ No newline at end of file +/charts/gitops-runtime/templates/_components/gitops-operator/crds @codefresh-io/DevOps @dmaizel @eti-codefresh @chen-keinan @scme0 @masontikhonov \ No newline at end of file