Skip to content
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ object DockerPlugin extends AutoPlugin {
// run validation, and warn the build users if the strategy is not compatible with `docker` that's in scope.
dockerPermissionStrategy := DockerPermissionStrategy.MultiStage,
dockerChmodType := DockerChmodType.UserGroupReadExecute,
dockerBaseImage := "openjdk:8",
dockerBaseImage := "openjdk:8u342",
dockerExposedPorts := Seq(),
dockerExposedUdpPorts := Seq(),
dockerExposedVolumes := Seq(),
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/docker/file-permission/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ lazy val root = (project in file("."))
val lines = dockerfile.linesIterator.toList
assertEquals(
lines,
"""FROM openjdk:8 AS mainstage
"""FROM openjdk:8u342 AS mainstage
|USER root
|RUN id -u demiourgos728 1>/dev/null 2>&1 || (( getent group 0 1>/dev/null 2>&1 || ( type groupadd 1>/dev/null 2>&1 && groupadd -g 0 root || addgroup -g 0 -S root )) && ( type useradd 1>/dev/null 2>&1 && useradd --system --create-home --uid 1001 --gid 0 demiourgos728 || adduser -S -u 1001 -G root demiourgos728 ))
|WORKDIR /opt/docker
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/docker/jdk-versions/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ lazy val `jdk8` = project
.enablePlugins(JavaAppPackaging)
.settings(
name := basename + "-8",
dockerBaseImage := "openjdk:8u162-jre",
dockerBaseImage := "openjdk:8u342-jre",
dockerBuildOptions := dockerBuildOptions.value ++ Seq("-t", "jdk-versions:8")
)

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 @@ maintainer := "Gary Coady <[email protected]>"

dockerUpdateLatest := true
dockerCommands := Seq(
Cmd("FROM", "openjdk:8"),
Cmd("FROM", "openjdk:8u342"),
Cmd("LABEL", s"""MAINTAINER="${maintainer.value}""""),
ExecCmd("CMD", "echo", "Hello, World from Docker")
)
4 changes: 2 additions & 2 deletions src/sphinx/formats/docker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ In your sbt console type
.. code-block:: bash

> show dockerCommands
[info] List(Cmd(FROM,openjdk:8), Cmd(LABEL,MAINTAINER=Your Name <[email protected]>), ...)
[info] List(Cmd(FROM,openjdk:8u342), Cmd(LABEL,MAINTAINER=Your Name <[email protected]>), ...)



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

dockerCommands := Seq(
Cmd("FROM", "openjdk:8"),
Cmd("FROM", "openjdk:8u342"),
Cmd("LABEL", s"""MAINTAINER="${maintainer.value}""""),
ExecCmd("CMD", "echo", "Hello, World from Docker")
)
Expand Down
2 changes: 1 addition & 1 deletion test-project-docker/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name := "docker-test"
version := "0.1.0"

maintainer := "Gary Coady <[email protected]>"
dockerBaseImage := "openjdk:8-jre-alpine"
dockerBaseImage := "openjdk:8u342-jre-alpine"
dockerUpdateLatest := true
dockerBuildxPlatforms := Seq("linux/arm64/v8", "linux/amd64")
dockerUsername := Some("dswiecki")
Loading