From 0ad2e91ad2bb71db6a41a26e1209dbb7ff568f97 Mon Sep 17 00:00:00 2001 From: llupa Date: Mon, 15 Dec 2025 15:10:00 +0100 Subject: [PATCH 1/5] [Examples] Fix cluster name conflict between Elasticsearch and OpenSearch --- examples/compose.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/compose.yaml b/examples/compose.yaml index 1423519d0..ef5992d65 100644 --- a/examples/compose.yaml +++ b/examples/compose.yaml @@ -127,6 +127,7 @@ services: elasticsearch: image: docker.elastic.co/elasticsearch/elasticsearch:9.2.2 environment: + cluster.name: 'elasticsearch-cluster' discovery.type: 'single-node' xpack.security.enabled: false ES_JAVA_OPTS: '-Xms512m -Xmx512m' @@ -138,17 +139,18 @@ services: soft: 65536 hard: 65536 healthcheck: - test: [ 'CMD', 'curl', '-f', 'http://127.0.0.1:9200/_cluster/health' ] - interval: 30s + test: [ 'CMD', 'curl', '-f', 'http://127.0.0.1:9200/_cluster/health?wait_for_status=yellow&timeout=1s' ] + interval: 10s start_period: 120s - timeout: 20s - retries: 3 + timeout: 5s + retries: 5 ports: - '9201:9200' opensearch: image: opensearchproject/opensearch environment: + cluster.name: 'opensearch-cluster' discovery.type: 'single-node' bootstrap.memory_lock: true indices.requests.cache.maximum_cacheable_size: 256 From 88f403883008c1e63032c7c9e2e0e734381cebd1 Mon Sep 17 00:00:00 2001 From: llupa Date: Tue, 16 Dec 2025 09:07:23 +0100 Subject: [PATCH 2/5] Trigger CI From 0e9dd8282c55f7e84abfcd33f70f5ff1798ed42b Mon Sep 17 00:00:00 2001 From: llupa Date: Tue, 16 Dec 2025 09:15:22 +0100 Subject: [PATCH 3/5] Trigger CI again From 23ae4a8f8290290c9258e50b3b0c439eb54f4681 Mon Sep 17 00:00:00 2001 From: llupa Date: Tue, 16 Dec 2025 09:23:18 +0100 Subject: [PATCH 4/5] [Examples] Fix cluster name conflict between Elasticsearch and OpenSearch --- examples/compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/compose.yaml b/examples/compose.yaml index ef5992d65..789922512 100644 --- a/examples/compose.yaml +++ b/examples/compose.yaml @@ -139,10 +139,10 @@ services: soft: 65536 hard: 65536 healthcheck: - test: [ 'CMD', 'curl', '-f', 'http://127.0.0.1:9200/_cluster/health?wait_for_status=yellow&timeout=1s' ] + test: [ 'CMD', 'curl', '-f', 'http://127.0.0.1:9200/_cluster/health?wait_for_status=yellow&timeout=50s' ] interval: 10s start_period: 120s - timeout: 5s + timeout: 60s retries: 5 ports: - '9201:9200' From 071a98483096fe72fad24a72a1dd952b89507ef7 Mon Sep 17 00:00:00 2001 From: llupa Date: Tue, 16 Dec 2025 10:59:03 +0100 Subject: [PATCH 5/5] Trigger CI