From 2dfab2941bf12fad53045c236bcbb6842c5d3948 Mon Sep 17 00:00:00 2001
From: Simon L <szaimen@e.mail.de>
Date: Tue, 27 Jun 2023 11:51:53 +0200
Subject: [PATCH] adjust a few things

Signed-off-by: Simon L <szaimen@e.mail.de>
---
 Containers/fulltextsearch/Dockerfile |  2 +-
 Containers/nextcloud/entrypoint.sh   |  2 +-
 php/containers.json                  | 21 ++++++++++++---------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Containers/fulltextsearch/Dockerfile b/Containers/fulltextsearch/Dockerfile
index 0130c3b4..b76277c2 100644
--- a/Containers/fulltextsearch/Dockerfile
+++ b/Containers/fulltextsearch/Dockerfile
@@ -1,5 +1,5 @@
 # Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
-FROM elasticsearch:8.7.1
+FROM elasticsearch:8.8.0
 
 USER root
 
diff --git a/Containers/nextcloud/entrypoint.sh b/Containers/nextcloud/entrypoint.sh
index cb6e3a9b..446dab30 100644
--- a/Containers/nextcloud/entrypoint.sh
+++ b/Containers/nextcloud/entrypoint.sh
@@ -677,7 +677,7 @@ if [ "$FULLTEXTSEARCH_ENABLED" = 'yes' ]; then
         php /var/www/html/occ app:update files_fulltextsearch
     fi
     php /var/www/html/occ fulltextsearch:configure '{"search_platform":"OCA\\FullTextSearch_Elasticsearch\\Platform\\ElasticSearchPlatform"}'
-    php /var/www/html/occ fulltextsearch_elasticsearch:configure "{\"elastic_host\":\"http://$FULLTEXTSEARCH_HOST:9200\",\"elastic_index\":\"nextcloud-aio\"}"
+    php /var/www/html/occ fulltextsearch_elasticsearch:configure "{\"elastic_host\":\"http://elastic:$ELASTIC_PASSWORD@$FULLTEXTSEARCH_HOST:9200\",\"elastic_index\":\"nextcloud-aio\"}"
     php /var/www/html/occ files_fulltextsearch:configure "{\"files_pdf\":\"1\",\"files_office\":\"1\"}"
 
     # Do the index
diff --git a/php/containers.json b/php/containers.json
index 40cb0eca..756b0809 100644
--- a/php/containers.json
+++ b/php/containers.json
@@ -113,7 +113,8 @@
         "REDIS_PASSWORD",
         "NEXTCLOUD_PASSWORD",
         "TURN_SECRET",
-        "SIGNALING_SECRET"
+        "SIGNALING_SECRET",
+        "ELASTIC_PASSWORD"
       ],
       "volumes": [
         {
@@ -180,7 +181,8 @@
         "INSTALL_LATEST_MAJOR=%INSTALL_LATEST_MAJOR%",
         "TALK_RECORDING_ENABLED=%TALK_RECORDING_ENABLED%",
         "RECORDING_SECRET=%RECORDING_SECRET%",
-        "TALK_RECORDING_HOST=nextcloud-aio-talk-recording"
+        "TALK_RECORDING_HOST=nextcloud-aio-talk-recording",
+        "ELASTIC_PASSWORD=%ELASTIC_PASSWORD%"
       ],
       "restart": "unless-stopped",
       "devices": [
@@ -501,16 +503,14 @@
       "environment": [
         "POSTGRES_HOST=nextcloud-aio-database",
         "TZ=%TIMEZONE%",
-        "ES_JAVA_OPTS=-Xms1024M -Xmx1024M -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",
+        "ELASTIC_PASSWORD=%ELASTIC_PASSWORD%",
+        "ES_JAVA_OPTS=-Xms512M -Xmx512M -Des.enforce.bootstrap.checks=true",
         "bootstrap.memory_lock=true",
         "cluster.name=nextcloud-aio",
         "discovery.type=single-node",
-        "thread_pool.write.queue_size=1000"
+        "http.port=9200",
+        "xpack.license.self_generated.type=basic",
+        "xpack.security.enabled=false"
       ],
       "volumes": [
         {
@@ -525,6 +525,9 @@
       ],
       "networks": [
         "nextcloud-aio"
+      ],
+      "secrets": [
+        "ELASTIC_PASSWORD"
       ]
     }
   ]