From 8889dc87c8795fe0eb0ecd8c573554c19522afcf Mon Sep 17 00:00:00 2001 From: Lauren Gorski Date: Thu, 21 Apr 2022 15:30:42 -0500 Subject: [PATCH] check if file exists, do not rely on TEMURIN_TAG exit if java.security path not found --- Dockerfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2f88d0e..5f43f70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,16 +2,18 @@ ARG TEMURIN_TAG FROM eclipse-temurin:$TEMURIN_TAG -ARG TEMURIN_TAG MAINTAINER Dwolla Engineering LABEL org.label-schema.vcs-url="https://github.com/Dwolla/docker-java" -RUN if [ "$TEMURIN_TAG" = "8u322-b06-jdk" ] ; then \ - SECURITY_FILE_PATH=$JAVA_HOME/jre/lib/security/java.security ; \ - elif [ "$TEMURIN_TAG" = "8u322-b06-jre" ] ; then \ - SECURITY_FILE_PATH=$JAVA_HOME/lib/security/java.security ; \ +RUN if [ -f "$JAVA_HOME/jre/lib/security/java.security" ] ; then \ + SECURITY_FILE_PATH=$JAVA_HOME/jre/lib/security/java.security ; \ + elif [ -f "$JAVA_HOME/lib/security/java.security" ] ; then \ + SECURITY_FILE_PATH=$JAVA_HOME/lib/security/java.security ; \ + elif [ -f "$JAVA_HOME/conf/security/java.security" ] ; then \ + SECURITY_FILE_PATH=$JAVA_HOME/conf/security/java.security ; \ else \ - SECURITY_FILE_PATH=$JAVA_HOME/conf/security/java.security; \ + echo 'java.security file path not found' ; \ + exit 98 ; \ fi && \ apt-get update && \ apt-get install -y bash && \