Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Elasticsearch and Localstack versions for integration tests #5036

Merged
merged 2 commits into from
Jun 24, 2024
Merged

Update Elasticsearch and Localstack versions for integration tests #5036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
552dc3e
Update Elasticsearch and Localstack versions for integration tests
Jun 21, 2024
77ac266
Merge branch 'master' into update-elasticsearch-8-14-localstack-3-5
imsdu Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...src/main/scala/ch/epfl/bluebrain/nexus/testkit/elasticsearch/ElasticSearchContainer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ElasticSearchContainer(password: String)
}

object ElasticSearchContainer {
private val Version = "8.13.3"
private val Version = "8.14.1"

val ElasticSearchUser = "elastic"
val ElasticSearchPassword = "password"
Expand Down
2 changes: 1 addition & 1 deletion delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/localstack/LocalStackS3.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import software.amazon.awssdk.services.s3.S3AsyncClient

object LocalStackS3 {
val ServiceType = Service.S3
val Version = "3.4"
val Version = "3.5"

def localstackS3(): Resource[IO, LocalStackV2Container] = {

Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/paradox/docs/delta/api/assets/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"dependencies": {
"blazegraph": "2.1.6-RC",
"postgresql": "15.7",
"elasticsearch": "8.13.3",
"elasticsearch": "8.14.1",
"remoteStorage": "1.10.0"
},
"plugins": {
Expand Down
5 changes: 2 additions & 3 deletions docs/src/main/paradox/docs/getting-started/running-nexus/docker/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
version: "3.3"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

obsolete with the latest version of Docker

services:
delta:
depends_on:
- blazegraph
- elasticsearch
- postgres
image: bluebrain/nexus-delta:1.10.0-M5
image: bluebrain/nexus-delta:1.10.0-M13
environment:
DELTA_PLUGINS: "/opt/docker/plugins/"
DELTA_EXTERNAL_CONF: "/config/delta.conf"
Expand All @@ -23,7 +22,7 @@ services:
memory: 1024M

elasticsearch:
image: "docker.elastic.co/elasticsearch/elasticsearch:8.13.3"
image: "docker.elastic.co/elasticsearch/elasticsearch:8.14.1"
environment:
discovery.type: "single-node"
bootstrap.memory_lock: "true"
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/paradox/docs/getting-started/running-nexus/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ $ curl http://localhost/v1/version | jq
"delta": "1.10.0",
"dependencies": {
"blazegraph": "2.1.6-SNAPSHOT",
"elasticsearch": "8.13.3",
"elasticsearch": "8.14.1",
"postgres": "15.7"
},
"environment": "dev",
Expand Down
5 changes: 2 additions & 3 deletions tests/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.3"
networks:
default:
ipam:
Expand Down Expand Up @@ -108,7 +107,7 @@ services:
- 9090:8080

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.3
image: docker.elastic.co/elasticsearch/elasticsearch:8.14.1
environment:
ES_JAVA_OPTS: "-Xmx2G"
discovery.type: "single-node"
Expand Down Expand Up @@ -160,7 +159,7 @@ services:
- ./config:/config

localstack:
image: localstack/localstack:3.4
image: localstack/localstack:3.5
environment:
AWS_ACCESS_KEY_ID: "MY_ACCESS_KEY"
AWS_SECRET_ACCESS_KEY: "CHUTCHUT"
Expand Down