From 1f8619ecf81d410622918c44e570d2c34a714569 Mon Sep 17 00:00:00 2001 From: Andrew DeMaria Date: Mon, 11 Feb 2019 21:51:04 -0700 Subject: [PATCH] Add JAVA_MAJOR_VERSION Signed-off-by: Andrew DeMaria --- java/images.yml | 6 +++++- java/images/centos-java11/Dockerfile | 1 + java/images/centos/Dockerfile | 1 + java/images/fedora-java11/Dockerfile | 1 + java/images/rhel/Dockerfile | 1 + java/templates/Dockerfile | 5 +++-- 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/java/images.yml b/java/images.yml index 33119c11..890e397a 100644 --- a/java/images.yml +++ b/java/images.yml @@ -15,6 +15,7 @@ config: javaSecurity: "/usr/lib/jvm/java/conf/security/java.security" description: "Fedora S2I Java builder image with OpenJDK 11" version: + javaPackage: "11" javaMajor: "11" java: "" # empty means latest maven: "3.6.0" @@ -28,6 +29,7 @@ config: javaSecurity: "/usr/lib/jvm/java/conf/security/java.security" description: "CentOS 7.6 S2I Java builder image with OpenJDK 11" version: + javaPackage: "11" javaMajor: "11" java: "" # empty means latest maven: "3.6.0" @@ -41,7 +43,8 @@ config: javaSecurity: "/usr/lib/jvm/java/jre/lib/security/java.security" description: "CentOS 7.5 S2I Java builder image with OpenJDK 8" version: - javaMajor: "1.8.0" + javaPackage: "1.8.0" + javaMajor: "8" java: "" # empty means latest maven: "3.5.4" jolokia: "1.6.0" @@ -55,6 +58,7 @@ config: javaSecurity: "/usr/lib/jvm/java/jre/lib/security/java.security" description: "RHEL S2I Java builder image with OpenJDK 8" version: + javaMajor: "8" maven: "3.3.3-1.el7" jolokia: 1.5.0 jmxexporter: "0.10" diff --git a/java/images/centos-java11/Dockerfile b/java/images/centos-java11/Dockerfile index 5037e421..d748116b 100644 --- a/java/images/centos-java11/Dockerfile +++ b/java/images/centos-java11/Dockerfile @@ -8,6 +8,7 @@ ENV JOLOKIA_VERSION="1.6.0" \ PATH=$PATH:"/usr/local/s2i" \ AB_JOLOKIA_PASSWORD_RANDOM="true" \ AB_JOLOKIA_AUTH_OPENSHIFT="true" \ + JAVA_MAJOR_VERSION="11" \ JAVA_DATA_DIR="/deployments/data" # Some version information diff --git a/java/images/centos/Dockerfile b/java/images/centos/Dockerfile index 71f8f132..eb5d0025 100644 --- a/java/images/centos/Dockerfile +++ b/java/images/centos/Dockerfile @@ -8,6 +8,7 @@ ENV JOLOKIA_VERSION="1.6.0" \ PATH=$PATH:"/usr/local/s2i" \ AB_JOLOKIA_PASSWORD_RANDOM="true" \ AB_JOLOKIA_AUTH_OPENSHIFT="true" \ + JAVA_MAJOR_VERSION="8" \ JAVA_DATA_DIR="/deployments/data" # Some version information diff --git a/java/images/fedora-java11/Dockerfile b/java/images/fedora-java11/Dockerfile index 0df76638..d91c6b8d 100644 --- a/java/images/fedora-java11/Dockerfile +++ b/java/images/fedora-java11/Dockerfile @@ -8,6 +8,7 @@ ENV JOLOKIA_VERSION="1.6.0" \ PATH=$PATH:"/usr/local/s2i" \ AB_JOLOKIA_PASSWORD_RANDOM="true" \ AB_JOLOKIA_AUTH_OPENSHIFT="true" \ + JAVA_MAJOR_VERSION="11" \ JAVA_DATA_DIR="/deployments/data" # Some version information diff --git a/java/images/rhel/Dockerfile b/java/images/rhel/Dockerfile index c5401384..7d12cd3f 100644 --- a/java/images/rhel/Dockerfile +++ b/java/images/rhel/Dockerfile @@ -8,6 +8,7 @@ ENV JOLOKIA_VERSION="1.5.0" \ PATH=$PATH:"/usr/local/s2i" \ AB_JOLOKIA_PASSWORD_RANDOM="true" \ AB_JOLOKIA_AUTH_OPENSHIFT="true" \ + JAVA_MAJOR_VERSION="8" \ JAVA_DATA_DIR="/deployments/data" # Some version information diff --git a/java/templates/Dockerfile b/java/templates/Dockerfile index 5a54b4f6..3f28819f 100644 --- a/java/templates/Dockerfile +++ b/java/templates/Dockerfile @@ -11,6 +11,7 @@ ENV JOLOKIA_VERSION="{{= fp.config.base.version.jolokia }}" \ PATH=$PATH:"/usr/local/s2i" \ AB_JOLOKIA_PASSWORD_RANDOM="true" \ AB_JOLOKIA_AUTH_OPENSHIFT="true" \ + JAVA_MAJOR_VERSION="{{= fp.config.base.version.javaMajor}}" \ JAVA_DATA_DIR="/deployments/data" # Some version information @@ -43,8 +44,8 @@ RUN yum -y update \ RUN yum -y update \ && yum install -y --setopt=skip_missing_names_on_install=False \ unzip rsync \ - 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}} \ + java-{{= fp.config.base.version.javaPackage}}-openjdk{{= fp.config.base.version.java}} \ + java-{{= fp.config.base.version.javaPackage}}-openjdk-devel{{= fp.config.base.version.java}} \ && yum clean all \ && curl https://archive.apache.org/dist/maven/maven-3/{{= mavenVersion }}/binaries/apache-maven-{{= mavenVersion }}-bin.tar.gz | \ tar -xzf - -C /opt \