From e629519b361b3c2f58d2fd53022fd9fca375e32d Mon Sep 17 00:00:00 2001 From: dantb Date: Tue, 19 Sep 2023 14:25:41 +0200 Subject: [PATCH] Update ElasticSearch version to 8.10.1 --- .gitignore | 1 + .../testkit/elasticsearch/ElasticSearchContainer.scala | 2 +- .../main/paradox/docs/delta/api/assets/version.json | 2 +- .../running-nexus/docker/docker-compose.yaml | 2 +- tests/README.md | 10 +++++++++- tests/docker/docker-compose.yml | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7b96776db2..cc70a32e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ native target/ .bloop .metals +metals.sbt project/.bloop .bsp 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 2c2673edbb..a74759a68c 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 @@ -27,7 +27,7 @@ class ElasticSearchContainer(password: String) } object ElasticSearchContainer { - private val Version = "8.9.1" + private val Version = "8.10.1" val ElasticSearchUser = "elastic" val ElasticSearchPassword = "password" 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 5cdefb61d1..f026c80706 100644 --- a/docs/src/main/paradox/docs/delta/api/assets/version.json +++ b/docs/src/main/paradox/docs/delta/api/assets/version.json @@ -4,7 +4,7 @@ "dependencies": { "blazegraph": "2.1.6-RC", "postgresql": "15.4", - "elasticsearch": "8.9.1", + "elasticsearch": "8.10.1", "remoteStorage": "1.9.0" }, "plugins": { diff --git a/docs/src/main/paradox/docs/getting-started/running-nexus/docker/docker-compose.yaml b/docs/src/main/paradox/docs/getting-started/running-nexus/docker/docker-compose.yaml index f1ef094d64..8eb4289c58 100644 --- a/docs/src/main/paradox/docs/getting-started/running-nexus/docker/docker-compose.yaml +++ b/docs/src/main/paradox/docs/getting-started/running-nexus/docker/docker-compose.yaml @@ -23,7 +23,7 @@ services: memory: 1024M elasticsearch: - image: "docker.elastic.co/elasticsearch/elasticsearch:8.9.1" + image: "docker.elastic.co/elasticsearch/elasticsearch:8.10.1" environment: discovery.type: "single-node" bootstrap.memory_lock: "true" diff --git a/tests/README.md b/tests/README.md index f7bb897d9d..b77777b2c5 100644 --- a/tests/README.md +++ b/tests/README.md @@ -7,7 +7,15 @@ First, run: docker-compose -f docker/docker-compose.yml up -d ``` -To run the all the tests: +Add the following local domains to your `/etc/hosts` file for `S3StorageAccessSpec`: +``` +127.0.0.1 bucket.my-domain.com +127.0.0.1 other.my-domain.com +127.0.0.1 bucket2.my-domain.com +127.0.0.1 bucket3.my-domain.com +``` + +To run all the tests: ```sbtshell test ``` diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml index ee13aa1b8d..91e5828e8e 100644 --- a/tests/docker/docker-compose.yml +++ b/tests/docker/docker-compose.yml @@ -78,7 +78,7 @@ services: - 9090:8080 elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.9.1 + image: docker.elastic.co/elasticsearch/elasticsearch:8.10.1 environment: ES_JAVA_OPTS: "-Xmx2G" discovery.type: "single-node"