From b602a5c53f72b5c105e457da9aa3bebc00a1a486 Mon Sep 17 00:00:00 2001
From: Gilles Mouchet <gilles.mouchet@ville-ge.ch>
Date: Thu, 19 Jun 2025 17:57:07 +0200
Subject: [PATCH] add es 8.18.2 for dev

---
 docker-compose.yml | 100 ++++++++++++++++++++++++++++++---------------
 1 file changed, 68 insertions(+), 32 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4b2c779..3820b36 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,43 +56,79 @@ services:
 #      - ${PMA_PORT_WEB}:80
 #
 ## EK
-  wwwgmo-elasticsearch:
-    container_name: wwwgmo-elasticsearch
-    hostname: wwwgmo-elasticsearch
-    image: 'docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}'
-    #image: 'docker.elastic.co/elasticsearch/elasticsearch:8.8.1'
-    volumes:
-      - 'wwwgmo-elasticsearch:/usr/share/elasticsearch/data'
-    restart: unless-stopped
-    env_file:
-      - ./docker/elasticsearch/.env
+
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.18.2
+    container_name: elasticsearch
+    environment:
+      - node.name=es01
+      - cluster.name=es-docker-cluster
+      - discovery.type=single-node
+      - bootstrap.memory_lock=true
+      - xpack.security.enabled=true
+      - ELASTIC_PASSWORD=changeme
+      - xpack.security.http.ssl.enabled=false
+      - ES_JAVA_OPTS=-Xms1g -Xmx1g
     ulimits:
       memlock:
         soft: -1
         hard: -1
-      nofile:
-        soft: 65536
-        hard: 65536
-    cap_add:
-      - IPC_LOCK
     ports:
-      - '9200:9200'
-      - '9300:9300'
-
-# kibana
-  wwwgmo_kibana:
-    container_name: wwwgmo-kibana
-    hostname: wwwgmo-kibana
-    image: docker.elastic.co/kibana/kibana:${ELASTIC_VERSION}
-    #image: docker.elastic.co/kibana/kibana:8.8.1
-    restart: unless-stopped
-    env_file:
-      - ./docker/kibana/.env
+      - "9200:9200"
+      - "9300:9300"
+    volumes:
+      - esdata:/usr/share/elasticsearch/data
+    #  - 'wwwgmo-elasticsearch:/usr/share/elasticsearch/data'
+  kibana:
+    image: docker.elastic.co/kibana/kibana:8.18.2
+    container_name: kibana
+    depends_on:
+      - elasticsearch
+    environment:
+      - ELASTICSEARCH_HOSTS=http://elasticsearch:9200
+      - xpack.security.enabled=false
     ports:
-      - 5601:5601
-    #depends_on:
-    #  - wwwgmo-elasticsearch
+      - "5601:5601"
 
+
+#  wwwgmo-elasticsearch:
+#    container_name: wwwgmo-elasticsearch
+#    hostname: wwwgmo-elasticsearch
+#    image: 'docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}'
+#    #image: 'docker.elastic.co/elasticsearch/elasticsearch:8.8.1'
+#    volumes:
+#      - 'wwwgmo-elasticsearch:/usr/share/elasticsearch/data'
+#    restart: unless-stopped
+#    env_file:
+#      - ./docker/elasticsearch/.env
+#    ulimits:
+#      memlock:
+#        soft: -1
+#        hard: -1
+#      nofile:
+#        soft: 65536
+#        hard: 65536
+#    cap_add:
+#      - IPC_LOCK
+#    ports:
+#      - '9200:9200'
+#      - '9300:9300'
+#
+## kibana
+#  wwwgmo_kibana:
+#    container_name: wwwgmo-kibana
+#    hostname: wwwgmo-kibana
+#    image: docker.elastic.co/kibana/kibana:${ELASTIC_VERSION}
+#    #image: docker.elastic.co/kibana/kibana:8.8.1
+#    restart: unless-stopped
+#    env_file:
+#      - ./docker/kibana/.env
+#    ports:
+#      - 5601:5601
+#    #depends_on:
+#    #  - wwwgmo-elasticsearch
+#
 volumes:
-  wwwgmo-mariadb:
-  wwwgmo-elasticsearch:
+#  wwwgmo-mariadb:
+#  wwwgmo-elasticsearch:
+  esdata: