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.

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

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

Merged
merged 1 commit into from
Apr 30, 2017

Conversation

edouardKaiser
Copy link

Backport for 1.1.6

Copy link
Contributor

@muuki88 muuki88 left a comment

Choose a reason for hiding this comment

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

Thanks. Will release ASAP.

@muuki88 muuki88 merged commit 3f18953 into sbt:1.1.x Apr 30, 2017
@@ -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

@@ -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/

@@ -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

@@ -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

@muuki88
Copy link
Contributor

muuki88 commented Apr 30, 2017

Released as 1.1.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants