From dc2fd04e12039a95003793b58cf6a494daf851e2 Mon Sep 17 00:00:00 2001 From: Simon Dumas Date: Mon, 12 May 2025 16:11:09 +0200 Subject: [PATCH] Update Elasticsearch, Localstack and PostgreSQL images --- .../dependency/PostgresServiceDependencySpec.scala | 2 +- .../elasticsearch/ElasticSearchContainer.scala | 2 +- .../nexus/testkit/localstack/LocalStackS3.scala | 2 +- .../nexus/testkit/postgres/PostgresContainer.scala | 2 +- .../paradox/docs/delta/api/assets/version.json | 4 ++-- .../docs/running-nexus/docker/docker-compose.yaml | 4 ++-- docs/src/main/paradox/docs/running-nexus/index.md | 14 +++++++------- tests/docker/elasticsearch.yml | 2 +- tests/docker/localstack.yml | 2 +- tests/docker/postgres.yml | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/dependency/PostgresServiceDependencySpec.scala b/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/dependency/PostgresServiceDependencySpec.scala index 4962f4f187..7478865854 100644 --- a/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/dependency/PostgresServiceDependencySpec.scala +++ b/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/dependency/PostgresServiceDependencySpec.scala @@ -9,7 +9,7 @@ class PostgresServiceDependencySpec extends CatsEffectSpec with DoobieScalaTestF "PostgresServiceDependency" should { "fetch its service name and version" in { - new PostgresServiceDependency(xas).serviceDescription.accepted shouldEqual ServiceDescription("postgres", "17.4") + new PostgresServiceDependency(xas).serviceDescription.accepted shouldEqual ServiceDescription("postgres", "17.5") } } diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/elasticsearch/ElasticSearchContainer.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/elasticsearch/ElasticSearchContainer.scala index 1ea125da04..fcdcca9477 100644 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/elasticsearch/ElasticSearchContainer.scala +++ b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/elasticsearch/ElasticSearchContainer.scala @@ -24,7 +24,7 @@ class ElasticSearchContainer(password: String) } object ElasticSearchContainer { - val Version = "9.0.0" + val Version = "9.0.1" private val ElasticSearchUser = "elastic" private val ElasticSearchPassword = "password" diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/localstack/LocalStackS3.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/localstack/LocalStackS3.scala index e0be9aa6d3..d21c8124b2 100644 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/localstack/LocalStackS3.scala +++ b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/localstack/LocalStackS3.scala @@ -10,7 +10,7 @@ import software.amazon.awssdk.services.s3.S3AsyncClient object LocalStackS3 { val ServiceType = Service.S3 - val Version = "4.3" + val Version = "4.4" def localstackS3(): Resource[IO, LocalStackV2Container] = { diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/postgres/PostgresContainer.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/postgres/PostgresContainer.scala index ce1f9efa27..408ccb6965 100644 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/postgres/PostgresContainer.scala +++ b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/postgres/PostgresContainer.scala @@ -9,7 +9,7 @@ import scala.concurrent.duration.DurationInt import scala.jdk.DurationConverters.ScalaDurationOps class PostgresContainer(user: String, password: String, database: String) - extends GenericContainer[PostgresContainer](DockerImageName.parse("library/postgres:17.4")) { + extends GenericContainer[PostgresContainer](DockerImageName.parse("library/postgres:17.5")) { addEnv("POSTGRES_USER", user) addEnv("POSTGRES_PASSWORD", password) addEnv("POSTGRES_DB", database) diff --git a/docs/src/main/paradox/docs/delta/api/assets/version.json b/docs/src/main/paradox/docs/delta/api/assets/version.json index e7b2d41533..c617a30d4f 100644 --- a/docs/src/main/paradox/docs/delta/api/assets/version.json +++ b/docs/src/main/paradox/docs/delta/api/assets/version.json @@ -3,8 +3,8 @@ "delta": "1.11.0", "dependencies": { "blazegraph": "2.1.6-RC-21-jre", - "postgresql": "17.4", - "elasticsearch": "9.0.0" + "postgresql": "17.5", + "elasticsearch": "9.0.1" }, "plugins": { "archive": "1.10.0", diff --git a/docs/src/main/paradox/docs/running-nexus/docker/docker-compose.yaml b/docs/src/main/paradox/docs/running-nexus/docker/docker-compose.yaml index 1bf93c47f0..e517c5ef84 100644 --- a/docs/src/main/paradox/docs/running-nexus/docker/docker-compose.yaml +++ b/docs/src/main/paradox/docs/running-nexus/docker/docker-compose.yaml @@ -24,7 +24,7 @@ services: memory: 1024M elasticsearch: - image: "docker.elastic.co/elasticsearch/elasticsearch:9.0.0" + image: "docker.elastic.co/elasticsearch/elasticsearch:9.0.1" environment: discovery.type: "single-node" bootstrap.memory_lock: "true" @@ -44,7 +44,7 @@ services: memory: 512M postgres: - image: library/postgres:17.4 + image: library/postgres:17.5 environment: POSTGRES_USER: "postgres" POSTGRES_PASSWORD: "postgres" diff --git a/docs/src/main/paradox/docs/running-nexus/index.md b/docs/src/main/paradox/docs/running-nexus/index.md index 460ca315b9..5b52218322 100644 --- a/docs/src/main/paradox/docs/running-nexus/index.md +++ b/docs/src/main/paradox/docs/running-nexus/index.md @@ -102,18 +102,18 @@ Example $ curl http://localhost/v1/version | jq { "@context": "https://bluebrain.github.io/nexus/contexts/version.json", - "delta": "1.10.0", + "delta": "1.11.0", "dependencies": { "blazegraph": "2.1.6-SNAPSHOT", - "elasticsearch": "9.0.0", - "postgres": "17.4" + "elasticsearch": "9.0.1", + "postgres": "17.5" }, "environment": "dev", "plugins": { - "archive": "1.10.0", - "blazegraph": "1.10.0", - "composite-views": "1.10.0", - "elasticsearch": "1.10.0", + "archive": "1.11.0", + "blazegraph": "1.11.0", + "composite-views": "1.11.0", + "elasticsearch": "1.11.0", "storage": "1.10.0" } } diff --git a/tests/docker/elasticsearch.yml b/tests/docker/elasticsearch.yml index 21fed9bb51..b8565ad072 100644 --- a/tests/docker/elasticsearch.yml +++ b/tests/docker/elasticsearch.yml @@ -1,6 +1,6 @@ services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0 + image: docker.elastic.co/elasticsearch/elasticsearch:9.0.1 environment: ES_JAVA_OPTS: "-Xmx4G" discovery.type: "single-node" diff --git a/tests/docker/localstack.yml b/tests/docker/localstack.yml index ae2fe98e9e..8c96aeb570 100644 --- a/tests/docker/localstack.yml +++ b/tests/docker/localstack.yml @@ -1,6 +1,6 @@ services: localstack: - image: localstack/localstack:4.3 + image: localstack/localstack:4.4 environment: AWS_ACCESS_KEY_ID: "MY_ACCESS_KEY" AWS_SECRET_ACCESS_KEY: "CHUTCHUT" diff --git a/tests/docker/postgres.yml b/tests/docker/postgres.yml index 02f8e62457..405a803e00 100644 --- a/tests/docker/postgres.yml +++ b/tests/docker/postgres.yml @@ -1,6 +1,6 @@ services: postgres: - image: library/postgres:17.4 + image: library/postgres:17.5 ports: - 5432:5432 environment: