From b9a54300207c9ee7f46a0c84eadbe882f4523037 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Wed, 21 Nov 2018 16:08:24 +0100 Subject: [PATCH] add java-11-openjdk-jmods (#181) but do not install it on Java 8 --- java/images/centos-java11/Dockerfile | 3 +++ java/images/centos/Dockerfile | 1 + java/images/fedora-java11/Dockerfile | 3 +++ java/templates/Dockerfile | 3 +++ 4 files changed, 10 insertions(+) diff --git a/java/images/centos-java11/Dockerfile b/java/images/centos-java11/Dockerfile index 5037e421..a506b5f8 100644 --- a/java/images/centos-java11/Dockerfile +++ b/java/images/centos-java11/Dockerfile @@ -33,6 +33,9 @@ USER root RUN yum -y update \ && yum install -y --setopt=skip_missing_names_on_install=False \ unzip rsync \ + + java-11-openjdk-jmods \ + java-11-openjdk \ java-11-openjdk-devel \ && yum clean all \ diff --git a/java/images/centos/Dockerfile b/java/images/centos/Dockerfile index 71f8f132..e1556f07 100644 --- a/java/images/centos/Dockerfile +++ b/java/images/centos/Dockerfile @@ -33,6 +33,7 @@ USER root RUN yum -y update \ && yum install -y --setopt=skip_missing_names_on_install=False \ unzip rsync \ + java-1.8.0-openjdk \ java-1.8.0-openjdk-devel \ && yum clean all \ diff --git a/java/images/fedora-java11/Dockerfile b/java/images/fedora-java11/Dockerfile index 0df76638..4d8cd130 100644 --- a/java/images/fedora-java11/Dockerfile +++ b/java/images/fedora-java11/Dockerfile @@ -33,6 +33,9 @@ USER root RUN yum -y update \ && yum install -y --setopt=skip_missing_names_on_install=False \ unzip rsync \ + + java-11-openjdk-jmods \ + java-11-openjdk \ java-11-openjdk-devel \ && yum clean all \ diff --git a/java/templates/Dockerfile b/java/templates/Dockerfile index 5a54b4f6..9f3e0451 100644 --- a/java/templates/Dockerfile +++ b/java/templates/Dockerfile @@ -43,6 +43,9 @@ RUN yum -y update \ RUN yum -y update \ && yum install -y --setopt=skip_missing_names_on_install=False \ unzip rsync \ +{{? fp.config.base.version.javaMajor >= "11"}} + java-{{= fp.config.base.version.javaMajor}}-openjdk-jmods{{= 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}} \ && yum clean all \