introduce javaMajor variable in template (#160)

fabric8io-images · Nov 7, 2018 · 5104a0d · 5104a0d
1 parent eed470b
commit 5104a0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/java/images.yml b/java/images.yml
@@ -14,6 +14,7 @@ config:
       home: "/opt/jboss"
       description: "Fedora S2I Java builder image with OpenJDK 8"
       version:
+        javaMajor: "1.8.0"
         java: "" # empty means latest, currently that's "1:1.8.0.191.b12-8.fc29"
         maven: "3.5.4"
         jolokia: "1.6.0"
@@ -25,6 +26,7 @@ config:
       home: "/opt/jboss"
       description: "CentOS S2I Java builder image with OpenJDK 8"
       version:
+        javaMajor: "1.8.0"
         java: "-1.8.0.181-3.b13.el7_5"
         maven: "3.5.4"
         jolokia: "1.6.0"

diff --git a/java/templates/Dockerfile b/java/templates/Dockerfile
@@ -37,8 +37,8 @@ RUN yum install -y --enablerepo=jboss-rhel-rhscl rh-maven33-maven \
 {{??}}
 # 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 \