Replace deprecated java Docker container with openjdk

sbt · Sep 18, 2016 · 60ad44f · 60ad44f
1 parent bd7b6f1
commit 60ad44f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala
@@ -72,7 +72,7 @@ object DockerPlugin extends AutoPlugin {
   override def projectConfigurations: Seq[Configuration] = Seq(Docker)
 
   override lazy val projectSettings = Seq(
-    dockerBaseImage := "java:latest",
+    dockerBaseImage := "openjdk:latest",
     dockerExposedPorts := Seq(),
     dockerExposedVolumes := Seq(),
     dockerRepository := None,

diff --git a/src/sbt-test/docker/override-commands/build.sbt b/src/sbt-test/docker/override-commands/build.sbt
@@ -9,7 +9,7 @@ version := "0.1.0"
 maintainer := "Gary Coady <[email protected]>"
 
 dockerCommands := Seq(
-  Cmd("FROM", "dockerfile/java:latest"),
+  Cmd("FROM", "dockerfile/openjdk:latest"),
   Cmd("MAINTAINER", maintainer.value),
   ExecCmd("CMD", "echo", "Hello, World from Docker")
 )
diff --git a/src/sphinx/formats/docker.rst b/src/sphinx/formats/docker.rst
@@ -166,7 +166,7 @@ Docker Base Image
 
 .. code-block:: scala
 
-    dockerBaseImage := "dockerfile/java"
+    dockerBaseImage := "dockerfile/openjdk"
 
 Docker Repository
 ~~~~~~~~~~~~~~~~~
@@ -210,7 +210,7 @@ In your sbt console type
 .. code-block:: bash
 
     > show dockerCommands
-    [info] List(Cmd(FROM,dockerfile/java:latest), Cmd(MAINTAINER,Your Name <[email protected]>), ...)
+    [info] List(Cmd(FROM,dockerfile/openjdk:latest), Cmd(MAINTAINER,Your Name <[email protected]>), ...)
 
 
 
@@ -278,7 +278,7 @@ Now let's start adding some Docker commands.
   import com.typesafe.sbt.packager.docker._
 
   dockerCommands := Seq(
-    Cmd("FROM", "dockerfile/java:latest"),
+    Cmd("FROM", "dockerfile/openjdk:latest"),
     Cmd("MAINTAINER", maintainer.value),
     ExecCmd("CMD", "echo", "Hello, World from Docker")
   )