|
1 | 1 | import $ivy.`com.goyeau::mill-scalafix::0.3.1`
|
2 | 2 | import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.29`
|
3 | 3 |
|
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 | +} |
6 | 13 | import $file.utils, utils.isArmArchitecture
|
7 | 14 |
|
8 | 15 | import com.goyeau.mill.scalafix.ScalafixModule
|
@@ -305,7 +312,7 @@ trait CliLaunchers extends SbtModule { self =>
|
305 | 312 | def launcherKind = `base-image`.launcherKind
|
306 | 313 | def nativeImageDockerParams = Some(
|
307 | 314 | NativeImage.DockerParams(
|
308 |
| - imageName = "ubuntu:18.04", |
| 315 | + imageName = s"ubuntu:$ubuntuVersion", |
309 | 316 | prepareCommand =
|
310 | 317 | maybePassNativeImageJpmsOption +
|
311 | 318 | """apt-get update -q -y &&\
|
@@ -366,7 +373,7 @@ trait CliLaunchers extends SbtModule { self =>
|
366 | 373 | def launcherKind = "mostly-static"
|
367 | 374 | def nativeImageDockerParams = T {
|
368 | 375 | val baseDockerParams = NativeImage.linuxMostlyStaticParams(
|
369 |
| - "ubuntu:18.04", // TODO Pin that |
| 376 | + s"ubuntu:$ubuntuVersion", |
370 | 377 | s"https://github.com/coursier/coursier/releases/download/v${deps.csDockerVersion}/cs-x86_64-pc-linux.gz"
|
371 | 378 | )
|
372 | 379 | val dockerParams = setupLocaleAndOptions(baseDockerParams)
|
|
0 commit comments