feat(base): use runtime base image variant (cryostatio#3)

* Use runtime base image variant * Install findutils Used by cryostat's entrypoint.sh
ebaron · Jul 9, 2021 · 0b8bb8f · 0b8bb8f
1 parent e2b8e3f
commit 0b8bb8f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Containerfile b/Containerfile
@@ -1,4 +1,14 @@
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.3-15
+ARG BASE_IMAGE=registry.access.redhat.com/ubi8/openjdk-11-runtime
+# 1.9-1.1622550112
+ARG IMAGE_TAG=@sha256:32219d7c7d82112481293d67951fa071f35e78453e01a5d3246cc040698adf49
+FROM ${BASE_IMAGE}${IMAGE_TAG}
+
+USER root
+
+RUN microdnf --disableplugin=subscription-manager -y install findutils && \
+    microdnf --disableplugin=subscription-manager -y clean all
+
+USER 185
 
 ENV CONF_DIR=/opt/cryostat.d
 

diff --git a/include/truststore-setup.sh b/include/truststore-setup.sh
@@ -16,7 +16,7 @@ pushd $CONF_DIR
 keytool -importkeystore \
     -noprompt \
     -storetype PKCS12 \
-    -srckeystore /usr/lib/jvm/java-11-openjdk/lib/security/cacerts \
+    -srckeystore /usr/lib/jvm/jre-11-openjdk/lib/security/cacerts \
     -srcstorepass changeit \
     -destkeystore "$SSL_TRUSTSTORE" \
     -deststorepass "$SSL_TRUSTSTORE_PASS"