diff --git a/build-ubi.jenkins b/build-ubi.jenkins index 902f666..aa1b816 100644 --- a/build-ubi.jenkins +++ b/build-ubi.jenkins @@ -53,7 +53,13 @@ spec: for (image in ubiImages) { container("kaniko") { stage ("Build " + image + ":" + rhOS) { - def DF = """FROM registry.access.redhat.com//ubi${rhOS}/${image}:latest + if (image == "ubi-minimal") { + def updateCmd = "microdnf" + } else { + def updateCmd = "dnf" + } + + def DF = """FROM registry.access.redhat.com/ubi${rhOS}/${image}:latest RUN printf '%s\\n' "-----BEGIN CERTIFICATE-----" \\ "MIICLTCCAbOgAwIBAgIDAYagMAoGCCqGSM49BAMEME0xCzAJBgNVBAYTAlVTMScw" \\ @@ -70,8 +76,21 @@ RUN printf '%s\\n' "-----BEGIN CERTIFICATE-----" \\ "UOemMEg3PjcKNsN65W2WVon5HIZx2XVfGRPjf5ZTVWzZ" \\ "-----END CERTIFICATE-----" > /etc/pki/ca-trust/source/anchors/test-chamber-13.lan.root.crt && \\ update-ca-trust extract && \\ - microdnf update -y && \\ - microdnf clean all + ${updateCmd} update -y && \\ + ${updateCmd} clean all && \\ + printf '%s\\n' "W3ViaS04LWJhc2Vvc10KbmFtZSA9IFJlZCBIYXQgVW5pdmVyc2FsIEJhc2UgSW1hZ2UgOCAoUlBN" \\ + "cykgLSBCYXNlT1MKYmFzZXVybCA9IGh0dHBzOi8vcmhlbDpwYXNzd29yZEByaGVsLnNtb290aG5l" \\ + "dC5vcmcvcmhlbC91YmktOC1iYXNlb3MKZW5hYmxlZCA9IDEKZ3Bna2V5ID0gZmlsZTovLy9ldGMv" \\ + "cGtpL3JwbS1ncGcvUlBNLUdQRy1LRVktcmVkaGF0LXJlbGVhc2UKZ3BnY2hlY2sgPSAxCgpbdWJp" \\ + "LTgtYXBwc3RyZWFtXQpuYW1lID0gUmVkIEhhdCBVbml2ZXJzYWwgQmFzZSBJbWFnZSA4IChSUE1z" \\ + "KSAtIEFwcFN0cmVhbQpiYXNldXJsID0gaHR0cHM6Ly9yaGVsOnBhc3N3b3JkQHJoZWwuc21vb3Ro" \\ + "bmV0Lm9yZy9yaGVsL3ViaS04LWFwcHN0cmVhbSAKZW5hYmxlZCA9IDEKZ3Bna2V5ID0gZmlsZTov" \\ + "Ly9ldGMvcGtpL3JwbS1ncGcvUlBNLUdQRy1LRVktcmVkaGF0LXJlbGVhc2UKZ3BnY2hlY2sgPSAx" \\ + "CgpbdWJpLTgtY29kZXJlYWR5LWJ1aWxkZXJdCm5hbWUgPSBSZWQgSGF0IFVuaXZlcnNhbCBCYXNl" \\ + "IEltYWdlIDggKFJQTXMpIC0gQ29kZVJlYWR5IEJ1aWxkZXIKYmFzZXVybCA9IGh0dHBzOi8vcmhl" \\ + "bDpwYXNzd29yZEByaGVsLnNtb290aG5ldC5vcmcvcmhlbC91YmktOC1jb2RlcmVhZHktYnVpbGRl" \\ + "cgplbmFibGVkID0gMQpncGdrZXkgPSBmaWxlOi8vL2V0Yy9wa2kvcnBtLWdwZy9SUE0tR1BHLUtF" \\ + "WS1yZWRoYXQtcmVsZWFzZQpncGdjaGVjayA9IDEK" | base64 -d > /etc/yum.repos.d/ubi.repo """ writeFile(file: workspace + '/Dockerfile', text: DF)