Skip to content

Commit

Permalink
Merge pull request #490 from playframework/mergify/bp/3.0.x/pr-291
Browse files Browse the repository at this point in the history
[3.0.x] Use `eclipse-temurin:11-alpine` docker image (backport #291) by @mkurz
  • Loading branch information
mergify[bot] authored Dec 27, 2023
2 parents 51d3943 + 2870924 commit 300a4ff
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions play-java-grpc-example/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ lazy val `play-java-grpc-example` = (project in file("."))
)
.settings(
// workaround to https://github.com/akka/akka-grpc/pull/470#issuecomment-442133680
dockerBaseImage := "openjdk:8-alpine",
dockerBaseImage := "eclipse-temurin:11-alpine",
dockerCommands :=
Seq.empty[CmdLike] ++
Seq(
Cmd("FROM", "openjdk:8-alpine"),
Cmd("FROM", "eclipse-temurin:11-alpine"),
ExecCmd("RUN", "apk", "add", "--no-cache", "bash")
) ++
dockerCommands.value.tail ,
Expand Down
6 changes: 3 additions & 3 deletions play-scala-grpc-example/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ lazy val `play-scala-grpc-example` = (project in file("."))
)
.settings(
// workaround to https://github.com/akka/akka-grpc/pull/470#issuecomment-442133680
dockerBaseImage := "openjdk:8-alpine",
dockerCommands :=
dockerBaseImage := "eclipse-temurin:11-alpine",
dockerCommands :=
Seq.empty[CmdLike] ++
Seq(
Cmd("FROM", "openjdk:8-alpine"),
Cmd("FROM", "eclipse-temurin:11-alpine"),
ExecCmd("RUN", "apk", "add", "--no-cache", "bash")
) ++
dockerCommands.value.tail ,
Expand Down

0 comments on commit 300a4ff

Please sign in to comment.