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

Remove dockerfile/ prefix from openjdk images #880

Merged
merged 1 commit into from
Sep 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/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 <gary@lyranthe.org>"

dockerCommands := Seq(
Cmd("FROM", "dockerfile/openjdk:latest"),
Cmd("FROM", "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 @@ -166,7 +166,7 @@ Docker Base Image

.. code-block:: scala

dockerBaseImage := "dockerfile/openjdk"
dockerBaseImage := "openjdk"

Docker Repository
~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -210,7 +210,7 @@ In your sbt console type
.. code-block:: bash

> show dockerCommands
[info] List(Cmd(FROM,dockerfile/openjdk:latest), Cmd(MAINTAINER,Your Name <y.n@yourcompany.com>), ...)
[info] List(Cmd(FROM,openjdk:latest), Cmd(MAINTAINER,Your Name <y.n@yourcompany.com>), ...)



Expand Down Expand Up @@ -278,7 +278,7 @@ Now let's start adding some Docker commands.
import com.typesafe.sbt.packager.docker._

dockerCommands := Seq(
Cmd("FROM", "dockerfile/openjdk:latest"),
Cmd("FROM", "openjdk:latest"),
Cmd("MAINTAINER", maintainer.value),
ExecCmd("CMD", "echo", "Hello, World from Docker")
)
Expand Down