Merge branch 'develop' into develop-jbr25

Containerfile

@@ -8,6 +8,7 @@ ENV JAVA_OPTS=
 ENV ENABLE_HOTSWAP=true
 ENV ENABLE_JDWP=true
 ENV DISABLE_HOTSWAP_PLUGINS=
+ENV CACERT_INSTALL_PATH=/usr/local/share/ca-certificates
 
 # Install curl & essentials
 RUN apt update && \
@@ -22,6 +23,16 @@ RUN mkdir -p /usr/local/lib/jvm && \
         mkdir -p java-openjdk-jbr/lib/hotswap && \
         rm java-openjdk-jbr.tar.gz
 
+# Configure `cacerts`
+RUN apt -y install ca-certificates-java && \
+        cd /usr/local/bin && \
+        ln -s ../lib/jvm/java-openjdk-jbr/bin/java . && \
+        ln -s ../lib/jvm/java-openjdk-jbr/bin/keytool . && \
+        update-ca-certificates && \
+        cd ../lib/jvm/java-openjdk-jbr/lib/security && \
+        rm cacerts && \
+        ln -s /etc/ssl/certs/java/cacerts .
+
 # Download Hotswap Agent
 RUN curl -L https://github.com/HotswapProjects/HotswapAgent/releases/download/RELEASE-${hotswap.version}/hotswap-agent-${hotswap.version}.jar -o /usr/local/lib/jvm/java-openjdk-jbr/lib/hotswap/hotswap-agent.jar
 

src/main/containerd/containerd-entrypoint.sh

@@ -1,6 +1,9 @@
 #!/bin/sh
 . /usr/local/bin/${namespace.prefix}-setenv.sh
 
+# update cacerts with any custom certs in /usr/local/share/ca-certificates
+update-ca-certificates
+
 if [ -z $1 ]; then
     exec /bin/bash
 else