Skip to content

Commit 939d087

Browse files
authored
Use adoptopenjdk replacement temurin base image (#2974)
1 parent 1be5fad commit 939d087

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

build.sbt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ lazy val metadataSettings = Def.settings(
332332

333333
lazy val dockerSettings = Def.settings(
334334
dockerBaseImage := Option(System.getenv("DOCKER_BASE_IMAGE"))
335-
.getOrElse("adoptopenjdk/openjdk11:alpine"),
335+
.getOrElse("eclipse-temurin:11-alpine"),
336336
dockerCommands ++= {
337337
val binDir = "/usr/local/bin"
338338
val sbtVer = sbtVersion.value
@@ -343,12 +343,18 @@ lazy val dockerSettings = Def.settings(
343343
val millUrl =
344344
s"https://github.com/lihaoyi/mill/releases/download/${millVer.split("-").head}/$millVer"
345345
val coursierBin = s"$binDir/coursier"
346+
val installScalaCliStep = Seq(
347+
"wget -q -O scala-cli.gz https://github.com/Virtuslab/scala-cli/releases/latest/download/scala-cli-x86_64-pc-linux-static.gz",
348+
"gunzip scala-cli.gz",
349+
"chmod +x scala-cli",
350+
"mv scala-cli /usr/bin/"
351+
).mkString(" && ")
346352
Seq(
347353
Cmd("USER", "root"),
348354
Cmd("RUN", "apk --no-cache add bash git ca-certificates curl maven openssh nodejs npm"),
349355
Cmd("RUN", s"wget $sbtUrl && tar -xf $sbtTgz && rm -f $sbtTgz"),
350356
Cmd("RUN", s"curl -L $millUrl > $millBin && chmod +x $millBin"),
351-
Cmd("RUN", "curl -sSLf https://virtuslab.github.io/scala-cli-packages/scala-setup.sh | sh"),
357+
Cmd("RUN", installScalaCliStep),
352358
Cmd("RUN", s"curl -L https://git.io/coursier-cli > $coursierBin && chmod +x $coursierBin"),
353359
Cmd("RUN", s"$coursierBin install --install-dir $binDir scalafix scalafmt"),
354360
Cmd("RUN", "npm install --global yarn")

0 commit comments

Comments
 (0)