From da18158db815eb776b27ec4f75cb73a733429ce9 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 13 Jan 2023 16:48:50 +0800 Subject: [PATCH] dockerfiles/flux-cli.Dockerfile: update --- dockerfiles/flux-cli.Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dockerfiles/flux-cli.Dockerfile b/dockerfiles/flux-cli.Dockerfile index a190ae4..c2a37fd 100644 --- a/dockerfiles/flux-cli.Dockerfile +++ b/dockerfiles/flux-cli.Dockerfile @@ -1,7 +1,8 @@ -FROM ghcr.io/fluxcd/flux-cli:v0.31.3 - -RUN apk add --no-cache curl ca-certificates -RUN cd /usr/share/ca-certificates/ && curl http://certinfo.roche.com/rootcerts/Roche%20Root%20CA%201.cer -o RocheRootCA1.cer && curl http://certinfo.roche.com/rootcerts/RocheEnterpriseCA1.cer -o RocheEnterpriseCA1.cer && curl http://certinfo.roche.com/rootcerts/RocheEnterpriseCA2.cer -o RocheEnterpriseCA2.cer && curl http://certinfo.roche.com/rootcerts/Roche%20Root%20CA%201%20-%20G2.crt -o RocheRootCA1-G2.crt && curl http://certinfo.roche.com/rootcerts/Roche%20Enterprise%20CA%201%20-%20G2.crt -o RocheEnterpriseCA1-G2.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Root%20CA.crt -o RocheG3RootCA.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%201.crt -o RocheG3IssuingCA1.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%202.crt -o RocheG3IssuingCA2.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%203.crt -o RocheG3IssuingCA3.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%204.crt -o RocheG3IssuingCA4.crt && update-ca-certificates +FROM ghcr.io/fluxcd/flux-cli:v0.31.3 as build +FROM artifact.onwalk.net/k8s/alpine-ca:3.13 as prod +COPY --from=build /usr/local/bin/kubectl /usr/local/bin/ +COPY --from=build /usr/local/bin/flux /usr/local/bin/ USER 65534:65534 + ENTRYPOINT [ "flux" ]