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

updates certificates

Browse Source
This commit is contained in:
Hyatt 2022-08-20 09:38:11 -05:00
parent b158ccf1a7
commit 8097329921
Signed by: nhyatt
GPG Key ID: C50D0BBB5BC40BEA
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build-php.jenkins
View File

@ -24,7 +24,8 @@ 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/library/php:apache dockerFile = """FROM ${repository}/dockerhub/library/php:apache
LABEL org.opencontainers.image.authors="The_Spider <spider@smoothnet.org>" LABEL org.opencontainers.image.authors="The_Spider <spider@smoothnet.org>"
@ -32,7 +33,7 @@ LABEL org.opencontainers.image.title="php-mysqli"
LABEL org.opencontainers.image.description="Docker container for php with mysqli served by apache" LABEL org.opencontainers.image.description="Docker container for php with mysqli served by apache"
LABEL org.opencontainers.image.base.name="docker.io/library/php:apache" LABEL org.opencontainers.image.base.name="docker.io/library/php:apache"
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 apt-get update && \\ RUN apt-get update && \\
apt-get upgrade -y && \\ apt-get upgrade -y && \\

5
build-ubi.jenkins
View File

@ -29,7 +29,8 @@ pipeline {
ubiOS = ["8"] ubiOS = ["8"]
ubiImages = ["ubi-minimal", "ubi"] ubiImages = ["ubi-minimal", "ubi"]
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())
} }
} }
} }
@ -53,7 +54,7 @@ LABEL org.opencontainers.image.title="ubi${rhOS}/${image}"
LABEL org.opencontainers.image.description="Docker container for RHEL-UBI" LABEL org.opencontainers.image.description="Docker container for RHEL-UBI"
LABEL org.opencontainers.image.base.name="registry.access.redhat.com/ubi${rhOS}/${image}:latest" LABEL org.opencontainers.image.base.name="registry.access.redhat.com/ubi${rhOS}/${image}:latest"
COPY test-chamber-13.lan.root.crt /etc/pki/ca-trust/source/anchors/test-chamber-13.lan.root.crt COPY test-chamber-13.lan.root.crt test-chamber-13.lan.ret.root.crt /etc/pki/ca-trust/source/anchors/
RUN update-ca-trust extract && \\ RUN update-ca-trust extract && \\
${updateCmd} update -y && \\ ${updateCmd} update -y && \\