Merge pull request #343 from rfranco/feature/docker-java-latest

muuki88 · muuki88 · commit 8ac53de2262e · 2014-09-02T22:57:15.000+02:00
[docker] Java Latest
diff --git a/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala
@@ -156,7 +156,7 @@ trait DockerPlugin extends Plugin with UniversalPlugin {
   }
 
   def dockerSettings: Seq[Setting[_]] = Seq(
-    dockerBaseImage := "dockerfile/java",
+    dockerBaseImage := "dockerfile/java:latest",
     name in Docker <<= name,
     packageName in Docker <<= packageName,
     executableScriptName in Docker <<= executableScriptName,

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ trait DockerPlugin extends Plugin with UniversalPlugin {`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`def dockerSettings: Seq[Setting[_]] = Seq(`
`159`		`- dockerBaseImage := "dockerfile/java",`
	`159`	`+ dockerBaseImage := "dockerfile/java:latest",`
`160`	`160`	`name in Docker <<= name,`
`161`	`161`	`packageName in Docker <<= packageName,`
`162`	`162`	`executableScriptName in Docker <<= executableScriptName,`