Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace deprecated java Docker container with openjdk (#877) #970

Merged
merged 1 commit into from
Apr 30, 2017
Merged

Replace deprecated java Docker container with openjdk (#877) #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version := "0.1.0"
maintainer := "Gary Coady <gary@lyranthe.org>"

dockerCommands := Seq(
Cmd("FROM", "dockerfile/java:latest"),
Cmd("FROM", "dockerfile/openjdk:latest"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, sorry. I saw that afterwards. We need to remove the dockerfile/. I will do so and apply it to master and 1.1.x

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I'm following, this is just a cherry-pick from master. There shouldn't be anything to apply on master, no?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess at the time of this commit dockerfile/openjdk was still valid. 🍒-picking was the write thing 😊

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the release

Cmd("MAINTAINER", maintainer.value),
ExecCmd("CMD", "echo", "Hello, World from Docker")
)
6 changes: 3 additions & 3 deletions src/sphinx/formats/docker.rst
View file
Open in desktop
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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here. We need to remove the dockerfile/


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 <y.n@yourcompany.com>), ...)
[info] List(Cmd(FROM,dockerfile/openjdk:latest), Cmd(MAINTAINER,Your Name <y.n@yourcompany.com>), ...)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here




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"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here

Cmd("MAINTAINER", maintainer.value),
ExecCmd("CMD", "echo", "Hello, World from Docker")
)
Expand Down