diff --git a/Dockerfile b/Dockerfile index 060b3f4..c099396 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM debian:bookworm-slim +COPY ca-bundle /tmp/ca-bundle + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive \ apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales binutils && \ @@ -27,10 +29,9 @@ RUN apt-get update && \ mkdir -p /usr/local/openjdk && \ cd /usr/local/openjdk && \ tar -xf /tmp/openjdk.tar.gz --strip-components=1 && \ - curl -LfsSo /tmp/noenv.ca.crt https://noenv.com/ca.pem && \ - echo "2ecfa5dafd7d5e47313953ae0278f59657f9e3c8f8ee8b99b9cf5d31d45fd4dd */tmp/noenv.ca.crt" | sha256sum -c - && \ - /usr/local/openjdk/bin/keytool -import -noprompt -trustcacerts -cacerts -storepass changeit -alias noenvca -file /tmp/noenv.ca.crt && \ - rm -rf /tmp/openjdk.tar.gz /tmp/noenv.ca.crt && \ + /usr/local/openjdk/bin/keytool -import -noprompt -trustcacerts -cacerts -storepass changeit -alias noenv_ca -file /tmp/ca-bundle/noenv.pem && \ + /usr/local/openjdk/bin/keytool -import -noprompt -trustcacerts -cacerts -storepass changeit -alias goldrush_ca -file /tmp/ca-bundle/goldrush.pem && \ + rm -rf /tmp/openjdk.tar.gz /tmp/ca-bundle && \ ln -s /usr/local/openjdk /docker-java-home ENV LANG=en_US.UTF-8 \ diff --git a/Dockerfile.server b/Dockerfile.server index de324c4..89cb32e 100644 --- a/Dockerfile.server +++ b/Dockerfile.server @@ -37,10 +37,11 @@ RUN /usr/local/openjdk/bin/jlink \ --compress zip-6 \ --output /usr/local/openjdk-slim -RUN curl -LfsSo /tmp/noenv.ca.crt https://noenv.com/ca.pem && \ - echo "2ecfa5dafd7d5e47313953ae0278f59657f9e3c8f8ee8b99b9cf5d31d45fd4dd */tmp/noenv.ca.crt" | sha256sum -c - && \ - /usr/local/openjdk/bin/keytool -import -noprompt -trustcacerts -keystore /usr/local/openjdk-slim/lib/security/cacerts -storepass changeit -alias noenvca -file /tmp/noenv.ca.crt && \ - rm -rf /tmp/noenv.ca.crt +COPY ca-bundle /tmp/ca-bundle + +RUN /usr/local/openjdk/bin/keytool -import -noprompt -trustcacerts -keystore /usr/local/openjdk-slim/lib/security/cacerts -storepass changeit -alias noenv_ca -file /tmp/ca-bundle/noenv.pem && \ + /usr/local/openjdk/bin/keytool -import -noprompt -trustcacerts -keystore /usr/local/openjdk-slim/lib/security/cacerts -storepass changeit -alias goldrush_ca -file /tmp/ca-bundle/goldrush.pem && \ + rm -rf /tmp/ca-bundle FROM debian:bookworm-slim diff --git a/ca-bundle/goldrush.pem b/ca-bundle/goldrush.pem new file mode 100644 index 0000000..43a478e --- /dev/null +++ b/ca-bundle/goldrush.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC1zCCAjqgAwIBAgIJAK9B8i7TpFnkMAoGCCqGSM49BAMEMHkxCzAJBgNVBAYT +AlVTMRMwEQYDVQQIDApOZXcgSmVyc2V5MRUwEwYDVQQKDAxHb2xkcnVzaCBMTEMx +IzAhBgNVBAsMGlJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRkwFwYDVQQDDBBH +b2xkcnVzaCBSb290IDAxMCAXDTI0MDgwNTIyMjAzOVoYDzIwNTQwNzI5MjIyMDM5 +WjB5MQswCQYDVQQGEwJVUzETMBEGA1UECAwKTmV3IEplcnNleTEVMBMGA1UECgwM +R29sZHJ1c2ggTExDMSMwIQYDVQQLDBpSb290IENlcnRpZmljYXRlIEF1dGhvcml0 +eTEZMBcGA1UEAwwQR29sZHJ1c2ggUm9vdCAwMTCBmzAQBgcqhkjOPQIBBgUrgQQA +IwOBhgAEAB/+MJOG29Sz01i26ZoAZuSykxWzy5Ac2ErEyTiiNlKH5V/oaL+gZeKe +vdjEt6RsAu4+Pm08ugE/Kem4XE66qgxxAGn9cLO7V8hc/Q7M0l7lTxMGwI1nC0/R +6Ukl1A/en79J0mcBOzuQbtWmK9aqLqxGUeDlidMQMxBCOq+SfIwLBxyFo2YwZDAd +BgNVHQ4EFgQU/KVD0LdwP608nv9nvAUSfx4rZHowHwYDVR0jBBgwFoAU/KVD0Ldw +P608nv9nvAUSfx4rZHowEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMC +AYYwCgYIKoZIzj0EAwQDgYoAMIGGAkESKp4YdRgKY9Sqsvb9LTrLK4WwPXoDOsqW +k3e0+Hkgnd+htLT3OIYBANGEd8WYUKCnUfAfA/hrWGN2ofL6KcaRcwJBFWgBrJZr +1/WdzaJWnfMX8Cp17w78Se2st+I63l7m8ifcv+7AK4fvLRgoXrx2RH/+GdfCV8Iq +BdE84UY1BShDcO0= +-----END CERTIFICATE----- diff --git a/ca-bundle/noenv.pem b/ca-bundle/noenv.pem new file mode 100644 index 0000000..84e2556 --- /dev/null +++ b/ca-bundle/noenv.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICljCCAfigAwIBAgIJAK0oe+f4DaojMAoGCCqGSM49BAMEMFkxCzAJBgNVBAYT +AkFUMQ8wDQYDVQQIDAZWaWVubmExDjAMBgNVBAoMBU5vRW52MSkwJwYDVQQLDCBO +b0VudiBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eTAeFw0xNjEwMjcxNTAwNTFa +Fw00NjEwMjAxNTAwNTFaMFkxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmEx +DjAMBgNVBAoMBU5vRW52MSkwJwYDVQQLDCBOb0VudiBSb290IENlcnRpZmljYXRl +IEF1dGhvcml0eTCBmzAQBgcqhkjOPQIBBgUrgQQAIwOBhgAEAHpsMQth12N0d+aE +FIFRd8in4MTYZNSQEyQ4fuPDNq0Zb+4TXpUmedLZQJKkAQxorak8ESC/tXuQJDUL +OoKa+R6NAT4EKR1aaVVd7clC9rfGqVwGYslppycy9zsN6O4XLUiripamQF78FzRF +8wRZvkwYhzud+jpV6shgEMw3zmcwDSYKo2YwZDAdBgNVHQ4EFgQUD96n//91CReu +Cz1K0qics6aNFV0wHwYDVR0jBBgwFoAUD96n//91CReuCz1K0qics6aNFV0wEgYD +VR0TAQH/BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAYYwCgYIKoZIzj0EAwQDgYsA +MIGHAkFOxsApSB7fn8ZnYG/EUscn/uAkjxHsvdEkPKCC+XYCKMssW4YP2kR6gZjo +J8vaOAJZwNevBe/R9J8zMvsAWRJmWgJCAKLedGLnBuJOK9jjnKBwbVm5OIQfApMA +I2mJVnNXvS12w4DTZlP0K1t63WxsykBBTOIVXnYdPkdZvvnoAIcfA7iM +-----END CERTIFICATE-----