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

fix openjdk11 build
fabric8io-images · Apr 10, 2019 · 1ae17b1 · 1ae17b1
2 parents 4ba18bf + dd73752
commit 1ae17b1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/images.yml b/images.yml
@@ -5,7 +5,7 @@ fish-pepper:
     - version
     - type
   name: "fabric8/java"
-  build: "1.5.5"
+  build: "1.6.1"
 
 # Used for escaping in 'agent-bond-opts' where the same delimiters are used
 abSepOpen: "{{"
@@ -50,7 +50,7 @@ config:
       description: "OpenJDK 8"
       major: 8
     openjdk11:
-      version: "11.0.2"
+      version: "11"
       description: "OpenJDK 11"
       major: 11
       fish-pepper:

diff --git a/images/centos/openjdk11/jdk/Dockerfile b/images/centos/openjdk11/jdk/Dockerfile
@@ -12,8 +12,8 @@ ENV JAVA_APP_DIR=/deployments \
 # /dev/urandom is used as random source, which is prefectly safe
 # according to http://www.2uo.de/myths-about-urandom/
 RUN yum install -y \
-       java-11.0.2-openjdk-11.0.2.7-0.el7_6 \ 
-       java-11.0.2-openjdk-devel-11.0.2.7-0.el7_6 \ 
+       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 \
     && yum clean all
 

diff --git a/images/centos/openjdk11/jdk/README.md b/images/centos/openjdk11/jdk/README.md
@@ -180,5 +180,5 @@ mvn clean install
 ### Versions:
 
 * Base-Image: **CentOS 7**
-* Java: **OpenJDK 11 11.0.2** (Java Development Kit (JDK))
+* Java: **OpenJDK 11 11** (Java Development Kit (JDK))
 * Agent-Bond: **1.2.0** (Jolokia 1.6.0, jmx_exporter 0.3.1)
diff --git a/images/centos/openjdk11/jre/Dockerfile b/images/centos/openjdk11/jre/Dockerfile
@@ -12,7 +12,7 @@ ENV JAVA_APP_DIR=/deployments \
 # /dev/urandom is used as random source, which is prefectly safe
 # according to http://www.2uo.de/myths-about-urandom/
 RUN yum install -y \
-       java-11.0.2-openjdk-11.0.2.7-0.el7_6 \ 
+       java-11-openjdk-11.0.2.7-0.el7_6 \ 
     && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
     && yum clean all
 

diff --git a/images/centos/openjdk11/jre/README.md b/images/centos/openjdk11/jre/README.md
@@ -180,5 +180,5 @@ mvn clean install
 ### Versions:
 
 * Base-Image: **CentOS 7**
-* Java: **OpenJDK 11 11.0.2** (Java Runtime Environment (JRE))
+* Java: **OpenJDK 11 11** (Java Runtime Environment (JRE))
 * Agent-Bond: **1.2.0** (Jolokia 1.6.0, jmx_exporter 0.3.1)