Skip to content

Commit

Permalink
Replace deprecated java Docker container with openjdk (#877)
Browse files Browse the repository at this point in the history
  • Loading branch information
NeQuissimus authored and muuki88 committed Apr 30, 2017
1 parent 6be1d47 commit 3f18953
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,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,
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/docker/override-commands/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)
6 changes: 3 additions & 3 deletions src/sphinx/formats/docker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ Docker Base Image

.. code-block:: scala
dockerBaseImage := "dockerfile/java"
dockerBaseImage := "dockerfile/openjdk"
Docker Repository
~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -195,7 +195,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]>), ...)
Expand Down Expand Up @@ -260,7 +260,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")
)
Expand Down

0 comments on commit 3f18953

Please sign in to comment.