From 6e34555b112f37da60d1414a3a6e7acbb887d33f Mon Sep 17 00:00:00 2001 From: Dmytro Aleksandrov Date: Mon, 29 Sep 2014 14:54:07 +0300 Subject: [PATCH 1/2] resolve dockerfile/java#11 --- openjdk-6-jdk/Dockerfile | 3 +++ openjdk-6-jre/Dockerfile | 3 +++ openjdk-7-jdk/Dockerfile | 3 +++ openjdk-7-jre/Dockerfile | 3 +++ oracle-java6/Dockerfile | 3 +++ oracle-java7/Dockerfile | 3 +++ oracle-java8/Dockerfile | 3 +++ 7 files changed, 21 insertions(+) diff --git a/openjdk-6-jdk/Dockerfile b/openjdk-6-jdk/Dockerfile index ffcd2d6..874eec7 100644 --- a/openjdk-6-jdk/Dockerfile +++ b/openjdk-6-jdk/Dockerfile @@ -17,5 +17,8 @@ RUN \ # Define working directory. WORKDIR /data +# Define commonly used JAVA_HOME variable +ENV JAVA_HOME /usr/lib/jvm/java-6-openjdk-amd64 + # Define default command. CMD ["bash"] diff --git a/openjdk-6-jre/Dockerfile b/openjdk-6-jre/Dockerfile index 9414aeb..7a633bd 100644 --- a/openjdk-6-jre/Dockerfile +++ b/openjdk-6-jre/Dockerfile @@ -17,5 +17,8 @@ RUN \ # Define working directory. WORKDIR /data +# Define commonly used JAVA_HOME variable +ENV JAVA_HOME /usr/lib/jvm/java-6-openjdk-amd64 + # Define default command. CMD ["bash"] diff --git a/openjdk-7-jdk/Dockerfile b/openjdk-7-jdk/Dockerfile index f6e80d7..30fb562 100644 --- a/openjdk-7-jdk/Dockerfile +++ b/openjdk-7-jdk/Dockerfile @@ -17,5 +17,8 @@ RUN \ # Define working directory. WORKDIR /data +# Define commonly used JAVA_HOME variable +ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64 + # Define default command. CMD ["bash"] diff --git a/openjdk-7-jre/Dockerfile b/openjdk-7-jre/Dockerfile index 04d6ebf..10be788 100644 --- a/openjdk-7-jre/Dockerfile +++ b/openjdk-7-jre/Dockerfile @@ -17,5 +17,8 @@ RUN \ # Define working directory. WORKDIR /data +# Define commonly used JAVA_HOME variable +ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64 + # Define default command. CMD ["bash"] diff --git a/oracle-java6/Dockerfile b/oracle-java6/Dockerfile index 8f4152e..c24a4d5 100644 --- a/oracle-java6/Dockerfile +++ b/oracle-java6/Dockerfile @@ -19,5 +19,8 @@ RUN \ # Define working directory. WORKDIR /data +# Define commonly used JAVA_HOME variable +ENV JAVA_HOME /usr/lib/jvm/java-6-oracle + # Define default command. CMD ["bash"] diff --git a/oracle-java7/Dockerfile b/oracle-java7/Dockerfile index 0e5f7e7..3a43d82 100644 --- a/oracle-java7/Dockerfile +++ b/oracle-java7/Dockerfile @@ -19,5 +19,8 @@ RUN \ # Define working directory. WORKDIR /data +# Define commonly used JAVA_HOME variable +ENV JAVA_HOME /usr/lib/jvm/java-7-oracle + # Define default command. CMD ["bash"] diff --git a/oracle-java8/Dockerfile b/oracle-java8/Dockerfile index 543a041..cf3b572 100644 --- a/oracle-java8/Dockerfile +++ b/oracle-java8/Dockerfile @@ -19,5 +19,8 @@ RUN \ # Define working directory. WORKDIR /data +# Define commonly used JAVA_HOME variable +ENV JAVA_HOME /usr/lib/jvm/java-8-oracle + # Define default command. CMD ["bash"] From 0dd4b2006cc83ead743e912ab1becfb1c34e0ce2 Mon Sep 17 00:00:00 2001 From: Dmytro Aleksandrov Date: Wed, 1 Oct 2014 09:15:58 +0300 Subject: [PATCH 2/2] Cleaning install cache as proposed in dockerfile/java#13 --- oracle-java6/Dockerfile | 3 ++- oracle-java7/Dockerfile | 3 ++- oracle-java8/Dockerfile | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/oracle-java6/Dockerfile b/oracle-java6/Dockerfile index c24a4d5..c7b4bc3 100644 --- a/oracle-java6/Dockerfile +++ b/oracle-java6/Dockerfile @@ -14,7 +14,8 @@ RUN \ add-apt-repository -y ppa:webupd8team/java && \ apt-get update && \ apt-get install -y oracle-java6-installer && \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* && \ + rm -rf /var/cache/oracle-jdk6-installer # Define working directory. WORKDIR /data diff --git a/oracle-java7/Dockerfile b/oracle-java7/Dockerfile index 3a43d82..edf159f 100644 --- a/oracle-java7/Dockerfile +++ b/oracle-java7/Dockerfile @@ -14,7 +14,8 @@ RUN \ add-apt-repository -y ppa:webupd8team/java && \ apt-get update && \ apt-get install -y oracle-java7-installer && \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* && \ + rm -rf /var/cache/oracle-jdk7-installer # Define working directory. WORKDIR /data diff --git a/oracle-java8/Dockerfile b/oracle-java8/Dockerfile index cf3b572..2d9946f 100644 --- a/oracle-java8/Dockerfile +++ b/oracle-java8/Dockerfile @@ -14,7 +14,9 @@ RUN \ add-apt-repository -y ppa:webupd8team/java && \ apt-get update && \ apt-get install -y oracle-java8-installer && \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* && \ + rm -rf /var/cache/oracle-jdk8-installer + # Define working directory. WORKDIR /data