Skip to content

Commit b2f15dc

Browse files
authored
Merge branch 'master' into update/scalafmt-core-3.10.2
2 parents 9b59b69 + 15813e9 commit b2f15dc

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ In case of problems with file mounting on Windows place the `application.ini` an
450450
Another option is to use custom `Dockerfile`:
451451

452452
```
453-
FROM openjdk:8-jre-alpine
453+
FROM eclipse-temurin:11-jdk-noble
454454
455455
ARG ELASTICMQ_VERSION
456456
ENV ELASTICMQ_VERSION ${ELASTICMQ_VERSION}
@@ -546,7 +546,7 @@ Publishing Docker image for two different platforms: `amd64` and `arm64` is poss
546546
Docker Buildx is included in Docker Desktop and Docker Linux packages when installed using the DEB or RPM packages. `build.sbt` has following setup:
547547

548548
* `dockerBuildxSettings` creates Docker Buildx instance
549-
* Docker base image is `openjdk:11-jdk-stretch` which supports multi-arch images
549+
* Docker base image is `eclipse-temurin:11-jdk-noble` which supports multi-arch images
550550
* `dockerBuildCommand` is extended with operator `buildx`
551551
* `dockerBuildOptions` has two additional parameters: `--platform=linux/arm64,linux/amd64` and `--push`
552552

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import scoverage.ScoverageKeys.*
99
import scala.sys.process.Process
1010

1111
val v2_12 = "2.12.20"
12-
val v2_13 = "2.13.16"
13-
val v3 = "3.3.6"
12+
val v2_13 = "2.13.18"
13+
val v3 = "3.3.7"
1414

1515
lazy val resolvedScalaVersion =
1616
sys.env.get("SCALA_MAJOR_VERSION") match {
@@ -254,7 +254,7 @@ lazy val server: Project = (project in file("server"))
254254
},
255255
// docker
256256
dockerExposedPorts := Seq(9324, 9325),
257-
dockerBaseImage := "openjdk:11-jdk-stretch",
257+
dockerBaseImage := "eclipse-temurin:11-jdk-noble",
258258
Docker / packageName := "elasticmq",
259259
dockerUsername := Some("softwaremill"),
260260
dockerUpdateLatest := {

0 commit comments

Comments
 (0)