diff --git a/package/Dockerfile-helm-project-operator b/package/Dockerfile-helm-project-operator index c7925455..d75d4a5e 100644 --- a/package/Dockerfile-helm-project-operator +++ b/package/Dockerfile-helm-project-operator @@ -4,7 +4,7 @@ FROM --platform=$BUILDPLATFORM rancher/mirrored-tonistiigi-xx:1.3.0 AS xx FROM --platform=$BUILDPLATFORM registry.suse.com/bci/golang:1.22 AS helm # Clone repository once, and reuse it for target archs. -ARG HELM_VERSION=release-v3.9.0 +ARG HELM_VERSION=v3.13.3-rancher1 ADD --keep-git-dir=true https://github.com/rancher/helm.git#${HELM_VERSION} /helm RUN cd /helm && go mod download @@ -27,11 +27,11 @@ ENV YQ_VERSION=v4.25.1 RUN zypper -n install git curl wget make RUN export ARCH=$(go env GOHOSTARCH) RUN wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -O /usr/bin/yq && chmod +x /usr/bin/yq; -COPY --from=helm /helm/bin/helm /usr/local/bin/ +COPY --from=helm ./helm/bin/helm /usr/local/bin/ COPY go.mod go.sum ./ RUN go mod download COPY . . -RUN make build +RUN ./scripts/build FROM registry.suse.com/bci/bci-micro:latest RUN echo 'helmprojectoperator:x:1000:1000::/home/helmprojectoperator:/bin/bash' >> /etc/passwd && \ diff --git a/package/Dockerfile-prometheus-federator b/package/Dockerfile-prometheus-federator index 2c9dc53f..adbabc02 100644 --- a/package/Dockerfile-prometheus-federator +++ b/package/Dockerfile-prometheus-federator @@ -27,8 +27,8 @@ ARG REPO='' ENV EMBEDDED_CHART_VERSION=$EMBEDDED_CHART_VERSION TAG=$TAG REPO=$REPO WORKDIR /usr/src/app -COPY --from=helm ./helm/bin/helm /usr/local/bin/ RUN zypper -n install git vim less file curl wget patch +COPY --from=helm ./helm/bin/helm /usr/local/bin/ COPY go.mod go.sum ./ RUN go mod download COPY . .