From 247c20d982fd0e7da3276221c238d9d174dd9984 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: May 03 2018 13:37:33 +0000 Subject: Need cacert_url for waiverdb. Because it has to talk to resultsdb, and must trust its cert. --- diff --git a/Dockerfile b/Dockerfile index 85222d5..f0b7d2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,12 @@ RUN dnf -y install \ && dnf -y clean all \ && rm -f /tmp/* +RUN if [ "$cacert_url" != "undefined" ]; then \ + cd /etc/pki/ca-trust/source/anchors \ + && curl -O --insecure $cacert_url \ + && update-ca-trust extract; \ + fi + USER 1001 EXPOSE 8080 diff --git a/Jenkinsfile b/Jenkinsfile index b667b40..5ccd80c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -138,7 +138,7 @@ node('docker') { /* Note that the docker.build step has some magic to guess the * Dockerfile used, which will break if the build directory (here ".") * is not the final argument in the string. */ - def image = docker.build "factory2/waiverdb:internal-${appversion}", "--build-arg waiverdb_rpm=$f28_rpm --build-arg waiverdb_common_rpm=$waiverdb_common ." + def image = docker.build "factory2/waiverdb:internal-${appversion}", "--build-arg waiverdb_rpm=$f28_rpm --build-arg waiverdb_common_rpm=$waiverdb_common --build-arg cacert_url=https://password.corp.redhat.com/RH-IT-Root-CA.crt ." image.push() } docker.withRegistry(