Merge pull request #115 from infosiftr/openjdk

yosifkit · web-flow · commit 048d99f7f0a3 · 2016-08-12T12:56:32.000-07:00
Update FROM to use the new "openjdk" image instead of the deprecated "java"
diff --git a/1.5/Dockerfile b/1.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:8-jre
+FROM openjdk:8-jre
 
 # grab gosu for easy step-down from root
 ENV GOSU_VERSION 1.7
diff --git a/1.6/Dockerfile b/1.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:8-jre
+FROM openjdk:8-jre
 
 # grab gosu for easy step-down from root
 ENV GOSU_VERSION 1.7
diff --git a/1.7/Dockerfile b/1.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:8-jre
+FROM openjdk:8-jre
 
 # grab gosu for easy step-down from root
 ENV GOSU_VERSION 1.7
diff --git a/2.0/Dockerfile b/2.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:8-jre
+FROM openjdk:8-jre
 
 # grab gosu for easy step-down from root
 ENV GOSU_VERSION 1.7
diff --git a/2.1/Dockerfile b/2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:8-jre
+FROM openjdk:8-jre
 
 # grab gosu for easy step-down from root
 ENV GOSU_VERSION 1.7
diff --git a/2.2/Dockerfile b/2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:8-jre
+FROM openjdk:8-jre
 
 # grab gosu for easy step-down from root
 ENV GOSU_VERSION 1.7
diff --git a/2.3/Dockerfile b/2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:8-jre
+FROM openjdk:8-jre
 
 # grab gosu for easy step-down from root
 ENV GOSU_VERSION 1.7
diff --git a/5.0/Dockerfile b/5.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:8-jre
+FROM openjdk:8-jre
 
 # grab gosu for easy step-down from root
 ENV GOSU_VERSION 1.7
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM java:8-jre
+FROM openjdk:8-jre
 
 # grab gosu for easy step-down from root
 ENV GOSU_VERSION 1.7

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM java:8-jre`
	`1`	`+FROM openjdk:8-jre`
`2`	`2`
`3`	`3`	`# grab gosu for easy step-down from root`
`4`	`4`	`ENV GOSU_VERSION 1.7`