introduce javaMajor variable in template (#160)

fabric8io-images · Nov 14, 2018 · 1752c44 · 1752c44
1 parent d11aee4
commit 1752c44
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/java/images.yml b/java/images.yml
@@ -14,7 +14,8 @@ config:
       home: "/opt/jboss"
       description: "CentOS S2I Java builder image with OpenJDK 8"
       version:
-        java: "1.8.0.181-3.b13.el7_5"
+        javaMajor: "1.8.0"
+        java: "-1.8.0.181-3.b13.el7_5"
         maven: "3.5.4"
         jolokia: "1.6.0"
         jmxexporter: "0.3.1"

diff --git a/java/images/centos/Dockerfile b/java/images/centos/Dockerfile
@@ -26,7 +26,7 @@ USER root
 
 
 
-# Dowload Maven from Apache
+# Install Java package & download Maven from Apache
 RUN yum install -y \
        java-1.8.0-openjdk-1.8.0.181-3.b13.el7_5 \
        java-1.8.0-openjdk-devel-1.8.0.181-3.b13.el7_5 \

diff --git a/java/templates/Dockerfile b/java/templates/Dockerfile
@@ -35,10 +35,10 @@ RUN yum install -y --enablerepo=jboss-rhel-rhscl rh-maven33-maven \
     && yum clean all \
     && ln -s /opt/rh/rh-maven33/root/bin/mvn /usr/local/bin/mvn
 {{??}}
-# Dowload Maven from Apache
+# Install Java package & download Maven from Apache
 RUN yum install -y \
-       java-1.8.0-openjdk-{{= fp.config.base.version.java}} \
-       java-1.8.0-openjdk-devel-{{= fp.config.base.version.java}} \
+       java-{{= fp.config.base.version.javaMajor}}-openjdk{{= fp.config.base.version.java}} \
+       java-{{= fp.config.base.version.javaMajor}}-openjdk-devel{{= fp.config.base.version.java}} \
   && curl https://archive.apache.org/dist/maven/maven-3/{{= mavenVersion }}/binaries/apache-maven-{{= mavenVersion }}-bin.tar.gz | \
     tar -xzf - -C /opt \
   && ln -s /opt/apache-maven-{{= mavenVersion }} /opt/maven \