diff --git a/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala index 421666a83..7016389ba 100644 --- a/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala +++ b/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala @@ -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(), diff --git a/src/sbt-test/docker/file-permission/build.sbt b/src/sbt-test/docker/file-permission/build.sbt index b54a88155..f5f98accd 100644 --- a/src/sbt-test/docker/file-permission/build.sbt +++ b/src/sbt-test/docker/file-permission/build.sbt @@ -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 diff --git a/src/sbt-test/docker/jdk-versions/build.sbt b/src/sbt-test/docker/jdk-versions/build.sbt index 5b02efec7..11d035374 100644 --- a/src/sbt-test/docker/jdk-versions/build.sbt +++ b/src/sbt-test/docker/jdk-versions/build.sbt @@ -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") ) diff --git a/src/sbt-test/docker/override-commands/build.sbt b/src/sbt-test/docker/override-commands/build.sbt index 07ac65650..d645fdda2 100644 --- a/src/sbt-test/docker/override-commands/build.sbt +++ b/src/sbt-test/docker/override-commands/build.sbt @@ -9,7 +9,7 @@ maintainer := "Gary Coady " 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") ) diff --git a/src/sphinx/formats/docker.rst b/src/sphinx/formats/docker.rst index f507d4047..4c715e6e0 100644 --- a/src/sphinx/formats/docker.rst +++ b/src/sphinx/formats/docker.rst @@ -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 ), ...) + [info] List(Cmd(FROM,openjdk:8u342), Cmd(LABEL,MAINTAINER=Your Name ), ...) @@ -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") ) diff --git a/test-project-docker/build.sbt b/test-project-docker/build.sbt index fa298560a..a7f78a3b1 100644 --- a/test-project-docker/build.sbt +++ b/test-project-docker/build.sbt @@ -4,7 +4,7 @@ name := "docker-test" version := "0.1.0" maintainer := "Gary Coady " -dockerBaseImage := "openjdk:8-jre-alpine" +dockerBaseImage := "openjdk:8u342-jre-alpine" dockerUpdateLatest := true dockerBuildxPlatforms := Seq("linux/arm64/v8", "linux/amd64") dockerUsername := Some("dswiecki")