Merge pull request #44 from rhuss/pr/centos-openjdk11

Fix update of java.security
fabric8io-images · Apr 10, 2019 · 14e31db · 14e31db
2 parents 1ae17b1 + fdd9c54
commit 14e31db
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/blocks/java-pkg-centos.dck b/blocks/java-pkg-centos.dck
@@ -4,7 +4,7 @@
 RUN yum install -y \
        java-{{= fp.config.version.version }}-openjdk-{{= fp.config.base.javaPackage[major]}} \ {{? fp.param.type === "jdk" }}
        java-{{= fp.config.version.version }}-openjdk-devel-{{= fp.config.base.javaPackage[major]}} \ {{?}}
-    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/{{? fp.param.type === "jdk" }}java/{{?}}jre/lib/security/java.security \
+    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
     && yum clean all
 
 ENV JAVA_HOME /etc/alternatives/jre
diff --git a/images/centos/openjdk11/jdk/Dockerfile b/images/centos/openjdk11/jdk/Dockerfile
@@ -14,7 +14,7 @@ ENV JAVA_APP_DIR=/deployments \
 RUN yum install -y \
        java-11-openjdk-11.0.2.7-0.el7_6 \ 
        java-11-openjdk-devel-11.0.2.7-0.el7_6 \ 
-    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/java/jre/lib/security/java.security \
+    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
     && yum clean all
 
 ENV JAVA_HOME /etc/alternatives/jre

diff --git a/images/centos/openjdk7/jdk/Dockerfile b/images/centos/openjdk7/jdk/Dockerfile
@@ -14,7 +14,7 @@ ENV JAVA_APP_DIR=/deployments \
 RUN yum install -y \
        java-1.7.0-openjdk-1.7.0.201-2.6.16.1.el7_6 \ 
        java-1.7.0-openjdk-devel-1.7.0.201-2.6.16.1.el7_6 \ 
-    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/java/jre/lib/security/java.security \
+    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
     && yum clean all
 
 ENV JAVA_HOME /etc/alternatives/jre

diff --git a/images/centos/openjdk8/jdk/Dockerfile b/images/centos/openjdk8/jdk/Dockerfile
@@ -14,7 +14,7 @@ ENV JAVA_APP_DIR=/deployments \
 RUN yum install -y \
        java-1.8.0-openjdk-1.8.0.201.b09-2.el7_6 \ 
        java-1.8.0-openjdk-devel-1.8.0.201.b09-2.el7_6 \ 
-    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/java/jre/lib/security/java.security \
+    && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
     && yum clean all
 
 ENV JAVA_HOME /etc/alternatives/jre