nhyatt/build-containers
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adds new root ca

Browse Source
This commit is contained in:
Hyatt
2022-08-20 09:20:19 -05:00
parent 3f1d2cbf61
commit b158ccf1a7
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build-gitea.jenkins
View File

@@ -25,12 +25,13 @@ pipeline {
steps { steps {
script { script {
workspace = pwd() 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 dockerFile = """FROM ${repository}/dockerhub/gitea/gitea:latest-rootless
USER root 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 && \\ RUN apk add --no-cache --virtual=.packagecache ca-certificates && \\
update-ca-certificates --fresh && \\ update-ca-certificates --fresh && \\

4
build-kaniko.jenkins
View File

@@ -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 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") { container ("kaniko") {
script { script {
sh """ 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" cp "/kaniko/ssl/certs/ca-certificates.crt" "${workspace}/kaniko-chain.crt"
""" """
} }