diff --git a/Dockerfile b/Dockerfile index 85628d9..7426cad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Set default values for build arguments -ARG DEFRA_VERSION=1.3.4 +ARG DEFRA_VERSION=1.3.5 ARG BASE_VERSION=21.0.10_7-jre-noble FROM eclipse-temurin:$BASE_VERSION AS base @@ -10,10 +10,11 @@ ARG DEFRA_VERSION # Install Internal CA certificate RUN apt-get update -o APT::Update::Error-Mode=any && apt install -y ca-certificates && apt-get clean -COPY certificates/internal-ca.crt /usr/local/share/ca-certificates/internal-ca.crt -RUN chmod 644 /usr/local/share/ca-certificates/internal-ca.crt && update-ca-certificates +COPY certificates/*.crt /usr/local/share/ca-certificates/ +RUN chmod 644 /usr/local/share/ca-certificates/*.crt && update-ca-certificates RUN keytool -noprompt -keystore $([ -d $JAVA_HOME/lib/security ] && echo $JAVA_HOME || echo $JAVA_HOME/jre)/lib/security/cacerts -storepass changeit -importcert -alias defraRootCertificate -file /usr/local/share/ca-certificates/internal-ca.crt +RUN keytool -noprompt -keystore $([ -d $JAVA_HOME/lib/security ] && echo $JAVA_HOME || echo $JAVA_HOME/jre)/lib/security/cacerts -storepass changeit -importcert -alias defraPAsubcaCertificate -file /usr/local/share/ca-certificates/PAsubca.crt # Update all packages RUN apt-get -o APT::Update::Error-Mode=any -y upgrade && apt-get clean diff --git a/JOB.env b/JOB.env index 09a2eeb..6acc7e3 100644 --- a/JOB.env +++ b/JOB.env @@ -1,4 +1,4 @@ -DEFRA_VERSION=1.3.4 +DEFRA_VERSION=1.3.5 BASE_VERSION=21.0.10_7-jre-noble IMAGE_NAME=java \ No newline at end of file diff --git a/certificates/PAsubca.crt b/certificates/PAsubca.crt new file mode 100644 index 0000000..ece76cc --- /dev/null +++ b/certificates/PAsubca.crt @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIFAzCCA+ugAwIBAgITPgAAAj/9bB6L877SxwABAAACPzANBgkqhkiG9w0BAQsF +ADAiMSAwHgYDVQQDExdDU0MgSW50ZXJuYWwgSXNzdWluZyBDQTAeFw0yNTExMTcw +OTMxMjhaFw0yNzExMTcwOTQxMjhaMBIxEDAOBgNVBAMTB1BBc3ViY2EwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/TTZPIX6pbUQvwp6rYrIhLZ3SSHdU +K9RJy4HQZZY7oDsTH8naLugkqe3NkNmqtGJ6Pq1eJhw9h5+5veABIuRpVA55qvN4 +t8ze6Pq1LdEfN5cjlAC1PyWEHZuIcH60IwpuxFbiWWq4tdyhghXt+hRnL5kSDZ+W +5PQfJuvK2RSz5tXd6ZMiqa0nZnJrO7tMeiz+r1Fd9mKsCCcyOw5AMnrufuts9pFL +1K6VuVqzNZ7M87cwrzXKq1zs2Ea9+Bz0nrI/xSqDZcD2yuIW7upzrom2NLq7tsQG +Ag1QQEcBt1X/NSJfjn2uZayPBamy5jCNMzywDG8qQrJFdz78zxo3/0rhAgMBAAGj +ggJAMIICPDASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSyj4Rwzm3lTBAn +zqs+AMI90Ai+pjALBgNVHQ8EBAMCAaYwHwYDVR0jBBgwFoAUBOh8gJu66/W6IcL3 +5rX1+ujWeAswgacGA1UdHwSBnzCBnDCBmaCBlqCBk4ZNaHR0cDovL3BraS1pbnQu +YXp1cmUuZGVmcmEuY2xvdWQvQ2VydEVucm9sbC9DU0MlMjBJbnRlcm5hbCUyMElz +c3VpbmclMjBDQS5jcmyGQmh0dHA6Ly9jcmwuYXp1cmUuZGVmcmEuY2xvdWQvcGtp +L0NTQyUyMEludGVybmFsJTIwSXNzdWluZyUyMENBLmNybDCCARIGCCsGAQUFBwEB +BIIBBDCCAQAwbAYIKwYBBQUHMAKGYGh0dHA6Ly9wa2ktaW50LmF6dXJlLmRlZnJh +LmNsb3VkL0NlcnRFbnJvbGwvU1NWQ1NDSU5GU1IxMDAyX0NTQyUyMEludGVybmFs +JTIwSXNzdWluZyUyMENBKDEpLmNydDAtBggrBgEFBQcwAYYhaHR0cDovL3BraS5h +enVyZS5kZWZyYS5jbG91ZC9vY3NwMGEGCCsGAQUFBzAChlVodHRwOi8vY3JsLmF6 +dXJlLmRlZnJhLmNsb3VkL3BraS9TU1ZDU0NJTkZTUjEwMDJfQ1NDJTIwSW50ZXJu +YWwlMjBJc3N1aW5nJTIwQ0EoMSkuY3J0MBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIA +QwBBMA0GCSqGSIb3DQEBCwUAA4IBAQBzzZ5xg2cKi11v90PJ5cH+ms50MKY+QS9x +kdBMId65b5VQju0McEw8OrNhrlzQTE1fFRb9k7pFWWddB5QtykurucwxTK0RjOcK +xQIW8tZBpuvfXfLJYBI1SPK65VG78JjlyNtFKx3wRwaAhb+AQxzElznykDu8gaQE +JfFVe3i5aW7WId/u50oLw7b+lnOXfz1eBuod47+Qh4Zb5R9DgwWmQrtKCsu4SmFN +IJqFAabuFNSk3zrq+6snpEBu0HWpHj00OohYOF6Hu8YHn6prjb+NbPhJL0VN71JL +mIJmRA8aoM8MdSB3hwxm2vCa+nSPndq1jqbFvvFmtSmRdz4Y/3Ce +-----END CERTIFICATE-----