diff --git a/build-gitea.jenkins b/build-gitea.jenkins index 20126a6..09aa295 100644 --- a/build-gitea.jenkins +++ b/build-gitea.jenkins @@ -25,12 +25,13 @@ pipeline { steps { script { workspace = pwd() - writeFile(file: workspace + "/test-chamber-13.lan.root.crt", text: functions.getLocalRootCA()) + writeFile(file: workspace + "/test-chamber-13.lan.root.crt", text: functions.getCurrentRootCA()) + writeFile(file: workspace + "/test-chamber-13.lan.ret.root.crt", text: functions.getRetiredRootCA()) dockerFile = """FROM ${repository}/dockerhub/gitea/gitea:latest-rootless USER root -COPY test-chamber-13.lan.root.crt /usr/local/share/ca-certificates/test-chamber-13.lan.root.crt +COPY test-chamber-13.lan.root.crt test-chamber-13.lan.ret.root.crt /usr/local/share/ca-certificates/ RUN apk add --no-cache --virtual=.packagecache ca-certificates && \\ update-ca-certificates --fresh && \\ diff --git a/build-kaniko.jenkins b/build-kaniko.jenkins index 1d4f1d5..3e2e478 100644 --- a/build-kaniko.jenkins +++ b/build-kaniko.jenkins @@ -44,7 +44,7 @@ LABEL org.opencontainers.image.base.name="gcr.io/kaniko-project/executor:debug" COPY ./kaniko-chain.crt /kaniko/ssl/certs/ca-certificates.crt """ - writeFile(file: workspace + "/test-chamber-13.lan.root.crt", text: functions.getLocalRootCA()) + //writeFile(file: workspace + "/test-chamber-13.lan.root.crt", text: functions.getLocalRootCA()) } } } @@ -54,7 +54,7 @@ COPY ./kaniko-chain.crt /kaniko/ssl/certs/ca-certificates.crt container ("kaniko") { script { sh """ - printf '%s\\n' "${functions.getLocalRootCA()}" >> /kaniko/ssl/certs/ca-certificates.crt + printf '%s\\n' "${functions.getCurrentRootCA()}" "${functions.getRetiredRootCA()}" >> /kaniko/ssl/certs/ca-certificates.crt cp "/kaniko/ssl/certs/ca-certificates.crt" "${workspace}/kaniko-chain.crt" """ }