From 8d4dd2a44b69a0fdad3adeb64a6107b08912d0cc Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Wed, 1 Mar 2023 14:34:02 +0800 Subject: [PATCH] image-builder-alpine: update Dockerfile --- .../image-builder-alpine/Dockerfile | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/oci/app-runner/image-builder-alpine/Dockerfile b/oci/app-runner/image-builder-alpine/Dockerfile index ecc110e..74cdbdb 100644 --- a/oci/app-runner/image-builder-alpine/Dockerfile +++ b/oci/app-runner/image-builder-alpine/Dockerfile @@ -1,20 +1,10 @@ -FROM gcr.io/kaniko-project/executor:v1.9.1-debug +FROM gcr.io/kaniko-project/executor:v1.9.1-debug as builder + +FROM artifact.onwalk.net/k8s/alpine-glibc:2.34 as prod MAINTAINER shenlan xz@onwalk.net -## add cert -RUN apk add --update --no-cache ca-certificates curl && \ - 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 +# add kaniko buider +COPY --from=builder /kaniko/ / # add jfrog cli RUN curl -Lo /usr/bin/jf https://api.bintray.com/content/jfrog/jfrog-cli-go/\$latest/jfrog-cli-linux-amd64/jfrog?bt_package=jfrog-cli-linux-amd64