Skip to content

Commit 08a547a

Browse files
committed
Pin ubuntu docker images & bump to ubuntu:24.04
1 parent 0deaf3a commit 08a547a

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM debian:stable-slim AS build-env
22

3-
FROM gcr.io/distroless/base-debian10
3+
FROM gcr.io/distroless/base-debian12
44
ADD scala-cli /usr/local/bin/scala-cli
55
COPY --from=build-env /lib/x86_64-linux-gnu/libz.so.1 /lib/x86_64-linux-gnu/libz.so.1
66
ENTRYPOINT ["/usr/local/bin/scala-cli"]

project/deps.sc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,13 +286,14 @@ def buildCsM1Version = Deps.Versions.coursierM1Cli
286286
def libsodiumVersion = "1.0.18"
287287
// Using the libsodium static library from this Alpine version (in the static launcher)
288288
def alpineVersion = "3.15"
289+
def ubuntuVersion = "24.04"
289290

290291
object Docker {
291292
def customMuslBuilderImageName = "scala-cli-base-musl"
292293
def muslBuilder =
293294
s"$customMuslBuilderImageName:latest"
294295

295-
def testImage = "ubuntu:18.04"
296+
def testImage = s"ubuntu:$ubuntuVersion"
296297
def alpineTestImage =
297298
"alpine@sha256:4edbd2beb5f78b1014028f4fbb99f3237d9561100b6881aabbf5acce2c4f9454"
298299
def authProxyTestImage =

project/settings.sc

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
import $ivy.`com.goyeau::mill-scalafix::0.3.1`
22
import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.29`
33

4-
import $file.deps,
5-
deps.{Deps, Docker, alpineVersion, buildCsVersion, buildCsM1Version, libsodiumVersion}
4+
import $file.deps, deps.{
5+
Deps,
6+
Docker,
7+
alpineVersion,
8+
buildCsVersion,
9+
buildCsM1Version,
10+
libsodiumVersion,
11+
ubuntuVersion
12+
}
613
import $file.utils, utils.isArmArchitecture
714

815
import com.goyeau.mill.scalafix.ScalafixModule
@@ -305,7 +312,7 @@ trait CliLaunchers extends SbtModule { self =>
305312
def launcherKind = `base-image`.launcherKind
306313
def nativeImageDockerParams = Some(
307314
NativeImage.DockerParams(
308-
imageName = "ubuntu:18.04",
315+
imageName = s"ubuntu:$ubuntuVersion",
309316
prepareCommand =
310317
maybePassNativeImageJpmsOption +
311318
"""apt-get update -q -y &&\
@@ -366,7 +373,7 @@ trait CliLaunchers extends SbtModule { self =>
366373
def launcherKind = "mostly-static"
367374
def nativeImageDockerParams = T {
368375
val baseDockerParams = NativeImage.linuxMostlyStaticParams(
369-
"ubuntu:18.04", // TODO Pin that
376+
s"ubuntu:$ubuntuVersion",
370377
s"https://github.com/coursier/coursier/releases/download/v${deps.csDockerVersion}/cs-x86_64-pc-linux.gz"
371378
)
372379
val dockerParams = setupLocaleAndOptions(baseDockerParams)

0 commit comments

Comments
 (0)