Skip to content

Commit e7cf16f

Browse files
feat: move runtime-installer images to dhi (#1091)
* update dockerfile with dhi * update codeowners --------- Co-authored-by: Zhenya Tikhonov <masontikhonov@gmail.com>
1 parent 9c10669 commit e7cf16f

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* @codefresh-io/teamleads
1+
* @codefresh-io/teamleads @masontikhonov
22

33
.github @codefresh-io/DevOps
44

@@ -7,4 +7,4 @@
77
/charts/gitops-runtime/tests @codefresh-io/DevOps
88

99
# gitops operator crd changes can be approved by some other people
10-
/charts/gitops-runtime/templates/_components/gitops-operator/crds @codefresh-io/DevOps @dmaizel @eti-codefresh @chen-keinan @scme0
10+
/charts/gitops-runtime/templates/_components/gitops-operator/crds @codefresh-io/DevOps @dmaizel @eti-codefresh @chen-keinan @scme0 @masontikhonov

installer-image/Dockerfile

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
1-
FROM golang:1.24.6 AS go-build
1+
# syntax=docker/dockerfile:1
22

3+
FROM octopusdeploy/dhi-golang:1.25-debian13-dev AS build
4+
ARG TARGETARCH
5+
ARG CF_CLI_VERSION=v1.0.1
36
RUN go install github.com/davidrjonas/semver-cli@latest \
4-
&& cp $GOPATH/bin/semver-cli /usr/local/bin/
5-
6-
#bookworm-slim
7-
FROM debian:13-slim
7+
&& cp $GOPATH/bin/semver-cli /tmp/semver-cli
8+
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/
89

9-
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
1010

11-
ARG CF_CLI_VERSION=v0.2.16
11+
# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base/customizations/8106437942896324135
12+
FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian13@sha256:e72836b4e4c408f04caf8ac6e34824d90e192b7cecedab9aeed647e14d0cd599 AS production
1213
ARG TARGETARCH
13-
14-
RUN apt-get update && apt-get install curl jq -y
15-
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
16-
COPY --from=go-build /usr/local/bin/semver-cli /usr/local/bin/semver-cli
17-
18-
COPY --from=bitnamilegacy/kubectl:1.33.4 /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
19-
20-
RUN useradd -m -s /bin/bash codefresh
21-
USER codefresh
14+
COPY --from=build --chown=nonroot:nonroot --chmod=755 /tmp/cf/cf-linux-${TARGETARCH} /usr/local/bin/cf
15+
COPY --from=build --chown=nonroot:nonroot --chmod=755 /tmp/semver-cli /usr/local/bin/semver-cli
2216
WORKDIR /home/codefresh
17+
USER nonroot

0 commit comments

Comments
 (0)