From 80973299212cdb70d56a1dc66c3733154180014e Mon Sep 17 00:00:00 2001 From: nhyatt Date: Sat, 20 Aug 2022 09:38:11 -0500 Subject: [PATCH] updates certificates --- build-php.jenkins | 5 +++-- build-ubi.jenkins | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build-php.jenkins b/build-php.jenkins index 8a73837..e07b0ac 100644 --- a/build-php.jenkins +++ b/build-php.jenkins @@ -24,7 +24,8 @@ 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/library/php:apache LABEL org.opencontainers.image.authors="The_Spider " @@ -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.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 && \\ apt-get upgrade -y && \\ diff --git a/build-ubi.jenkins b/build-ubi.jenkins index 5625c3d..4828390 100644 --- a/build-ubi.jenkins +++ b/build-ubi.jenkins @@ -29,7 +29,8 @@ pipeline { ubiOS = ["8"] 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.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 && \\ ${updateCmd} update -y && \\