mirror of
https://github.com/nextcloud/all-in-one.git
synced 2025-11-09 13:42:55 +08:00
fix daily backup running into conflict with elasticsearch
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
parent
c4107d1098
commit
df91f5d483
3 changed files with 25 additions and 1 deletions
|
|
@ -11,5 +11,10 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
rm -rf /var/lib/apt/lists/*
|
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
|
HEALTHCHECK CMD nc -z localhost 9200 || exit 1
|
||||||
LABEL com.centurylinklabs.watchtower.monitor-only="true"
|
LABEL com.centurylinklabs.watchtower.monitor-only="true"
|
||||||
|
|
|
||||||
18
Containers/fulltextsearch/start.sh
Normal file
18
Containers/fulltextsearch/start.sh
Normal file
|
|
@ -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 "$@"
|
||||||
|
|
@ -396,7 +396,8 @@
|
||||||
"environment": [
|
"environment": [
|
||||||
"TZ=%TIMEZONE%",
|
"TZ=%TIMEZONE%",
|
||||||
"discovery.type=single-node",
|
"discovery.type=single-node",
|
||||||
"ES_JAVA_OPTS=-Xms1024M -Xmx1024M"
|
"ES_JAVA_OPTS=-Xms1024M -Xmx1024M",
|
||||||
|
"POSTGRES_HOST=nextcloud-aio-database"
|
||||||
],
|
],
|
||||||
"volumes": [
|
"volumes": [
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue