From 3058baf2d4fd725ece486a5b0b6d9968054d4241 Mon Sep 17 00:00:00 2001 From: Shlee Date: Fri, 21 Nov 2025 11:58:15 +1030 Subject: [PATCH 1/5] Update docker-compose.yml --- docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2746fd5fc91..7f18b52731a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,8 +27,9 @@ services: # es: # restart: always - # image: docker.elastic.co/elasticsearch/elasticsearch:7.17.4 + # image: docker.elastic.co/elasticsearch/elasticsearch:8.19.7 # environment: + # - "ELASTIC_PASSWORD=ChangeMeAndUpdateInEnvFile" # - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true" # - "xpack.license.self_generated.type=basic" # - "xpack.security.enabled=false" @@ -56,6 +57,7 @@ services: # ports: # - '127.0.0.1:9200:9200' + web: # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes # build: . From 15768e2839c77138e5492b5728663bab70034e2a Mon Sep 17 00:00:00 2001 From: Shlee Date: Fri, 21 Nov 2025 12:02:51 +1030 Subject: [PATCH 2/5] Update docker-compose.yml --- docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7f18b52731a..83bf93575f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: # restart: always # image: docker.elastic.co/elasticsearch/elasticsearch:8.19.7 # environment: - # - "ELASTIC_PASSWORD=ChangeMeAndUpdateInEnvFile" + # - "ELASTIC_PASSWORD=ChangeMeAndUpdateInEnvFile" // Username is elastic. Do not change the username. # - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true" # - "xpack.license.self_generated.type=basic" # - "xpack.security.enabled=false" @@ -57,7 +57,6 @@ services: # ports: # - '127.0.0.1:9200:9200' - web: # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes # build: . From 3806d039f36fe863f72fada3a89542e431a9f5e8 Mon Sep 17 00:00:00 2001 From: Shlee Date: Fri, 21 Nov 2025 12:03:40 +1030 Subject: [PATCH 3/5] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 83bf93575f5..0b4e4885e69 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: # restart: always # image: docker.elastic.co/elasticsearch/elasticsearch:8.19.7 # environment: - # - "ELASTIC_PASSWORD=ChangeMeAndUpdateInEnvFile" // Username is elastic. Do not change the username. + # - "ELASTIC_PASSWORD=password" // Username is elastic. Do not change the username. # - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true" # - "xpack.license.self_generated.type=basic" # - "xpack.security.enabled=false" From e1dae9c705f8d4487e5fd496dd8ae8c70c5a64ad Mon Sep 17 00:00:00 2001 From: Shlee Date: Fri, 21 Nov 2025 14:26:48 +1030 Subject: [PATCH 4/5] Update docker-compose.yml --- docker-compose.yml | 62 +++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0b4e4885e69..c2d5268ac87 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,37 +25,37 @@ services: volumes: - ./redis:/data - # es: - # restart: always - # image: docker.elastic.co/elasticsearch/elasticsearch:8.19.7 - # environment: - # - "ELASTIC_PASSWORD=password" // Username is elastic. Do not change the username. - # - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true" - # - "xpack.license.self_generated.type=basic" - # - "xpack.security.enabled=false" - # - "xpack.watcher.enabled=false" - # - "xpack.graph.enabled=false" - # - "xpack.ml.enabled=false" - # - "bootstrap.memory_lock=true" - # - "cluster.name=es-mastodon" - # - "discovery.type=single-node" - # - "thread_pool.write.queue_size=1000" - # networks: - # - external_network - # - internal_network - # healthcheck: - # test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"] - # volumes: - # - ./elasticsearch:/usr/share/elasticsearch/data - # ulimits: - # memlock: - # soft: -1 - # hard: -1 - # nofile: - # soft: 65536 - # hard: 65536 - # ports: - # - '127.0.0.1:9200:9200' + es: + restart: always + image: docker.elastic.co/elasticsearch/elasticsearch:8.19.7 + environment: + - "ELASTIC_PASSWORD=password" #Username is elastic. Do not change the username. + - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true" + - "xpack.license.self_generated.type=basic" + - "xpack.security.enabled=false" + - "xpack.watcher.enabled=false" + - "xpack.graph.enabled=false" + - "xpack.ml.enabled=false" + - "bootstrap.memory_lock=true" + - "cluster.name=es-mastodon" + - "discovery.type=single-node" + - "thread_pool.write.queue_size=1000" + networks: + - external_network + - internal_network + healthcheck: + test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"] + volumes: + - ./elasticsearch:/usr/share/elasticsearch/data + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 65536 + hard: 65536 + ports: + - '127.0.0.1:9200:9200' web: # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes From 64f10d170491f4d525b99759eeed6fcc8f56dd6c Mon Sep 17 00:00:00 2001 From: Shlee Date: Fri, 21 Nov 2025 14:27:21 +1030 Subject: [PATCH 5/5] Update docker-compose.yml --- docker-compose.yml | 62 +++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c2d5268ac87..fbe142681bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,37 +25,37 @@ services: volumes: - ./redis:/data - es: - restart: always - image: docker.elastic.co/elasticsearch/elasticsearch:8.19.7 - environment: - - "ELASTIC_PASSWORD=password" #Username is elastic. Do not change the username. - - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true" - - "xpack.license.self_generated.type=basic" - - "xpack.security.enabled=false" - - "xpack.watcher.enabled=false" - - "xpack.graph.enabled=false" - - "xpack.ml.enabled=false" - - "bootstrap.memory_lock=true" - - "cluster.name=es-mastodon" - - "discovery.type=single-node" - - "thread_pool.write.queue_size=1000" - networks: - - external_network - - internal_network - healthcheck: - test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"] - volumes: - - ./elasticsearch:/usr/share/elasticsearch/data - ulimits: - memlock: - soft: -1 - hard: -1 - nofile: - soft: 65536 - hard: 65536 - ports: - - '127.0.0.1:9200:9200' + # es: + # restart: always + # image: docker.elastic.co/elasticsearch/elasticsearch:8.19.7 + # environment: + # - "ELASTIC_PASSWORD=password" #Username is elastic. Do not change the username. + # - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true" + # - "xpack.license.self_generated.type=basic" + # - "xpack.security.enabled=false" + # - "xpack.watcher.enabled=false" + # - "xpack.graph.enabled=false" + # - "xpack.ml.enabled=false" + # - "bootstrap.memory_lock=true" + # - "cluster.name=es-mastodon" + # - "discovery.type=single-node" + # - "thread_pool.write.queue_size=1000" + # networks: + # - external_network + # - internal_network + # healthcheck: + # test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"] + # volumes: + # - ./elasticsearch:/usr/share/elasticsearch/data + # ulimits: + # memlock: + # soft: -1 + # hard: -1 + # nofile: + # soft: 65536 + # hard: 65536 + # ports: + # - '127.0.0.1:9200:9200' web: # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes