Merge pull request #1890 from nextcloud/enh/1875/fix-backup-failing

fix daily backup running into conflict with elasticsearch

Containers/fulltextsearch/Dockerfile

@@ -11,5 +11,10 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*
 
+COPY start.sh /
+
+RUN chmod +x /start.sh
+ENTRYPOINT ["/start.sh"]
+
 HEALTHCHECK CMD nc -z localhost 9200 || exit 1
 LABEL com.centurylinklabs.watchtower.monitor-only="true"

Containers/fulltextsearch/start.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Only start container if database is accessible (needed for backup to work correctly)
+while ! nc -z "$POSTGRES_HOST" 5432; do
+    echo "Waiting for database to start..."
+    sleep 5
+done
+
+# Show wiki if vm.max_map_count is too low
+if [ "$(sysctl -n vm.max_map_count)" -le 65530 ]; then
+    echo "max_map_count is too low and needs to be adjusted."
+    echo "See https://github.com/nextcloud/all-in-one/discussions/1775 how to change max_map_count"
+fi
+
+# Run initial entrypoint
+/bin/tini -- /usr/local/bin/docker-entrypoint.sh
+
+exec "$@"

php/containers.json

@@ -396,7 +396,8 @@
       "environment": [
         "TZ=%TIMEZONE%",
         "discovery.type=single-node",
-        "ES_JAVA_OPTS=-Xms1024M -Xmx1024M"
+        "ES_JAVA_OPTS=-Xms1024M -Xmx1024M",
+        "POSTGRES_HOST=nextcloud-aio-database"
       ],
       "volumes": [
         {