Commit 63aa0b9e authored by William Tucker's avatar William Tucker
Browse files

Revert "Added separate Java 11 images" 

This reverts commit c5285b8e.
parent 6f46ffe7

images/jdk/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -12,5 +12,5 @@ FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION} 
USER root



RUN yum makecache && \

    yum install -y java-1.8.0-openjdk-devel-1.8.0.322.b06 && \

    yum install -y java-11-openjdk-devel-11.0.15.0.9 && \

    yum clean all

images/jdk11/Dockerfile

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
#####

## Image containing the full JDK

##

## Intended for use by builder images that need to unpack war files

## Runtime Java images should use the JRE only

#####



ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest

FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION}



USER root



RUN yum makecache && \

    yum install -y java-11-openjdk-devel-11.0.15.0.9 && \

    yum clean all

images/jre/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION} 
USER root



RUN yum makecache && \

    yum install -y java-1.8.0-openjdk-headless-1.8.0.322.b06 && \

    yum install -y java-11-openjdk-headless-11.0.15.0.9 && \

    yum clean all



USER $ESGF_UID

images/jre11/Dockerfile

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
#####

## Image containing the JRE

##

## Intended for use as a base image for runtime Java images

#####



ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest

FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION}



USER root



RUN yum makecache && \

    yum install -y java-11-openjdk-headless-11.0.15.0.9 && \

    yum clean all



USER $ESGF_UID