eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-19 22:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Revert changes to database container

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L. 2024-05-17 14:03:59 +02:00
parent 047c3555ba
commit b1ad854de6
3 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Containers/postgresql/healthcheck.sh
View file

@ -2,9 +2,4 @@
test -f "/mnt/data/backup-is-running" && exit 0 test -f "/mnt/data/backup-is-running" && exit 0
# Set a default value for POSTGRES_PORT psql -d "postgresql://oc_$POSTGRES_USER:$POSTGRES_PASSWORD@localhost:5432/$POSTGRES_DB" -c "select now()" || exit 1
if [ -z "$POSTGRES_PORT" ]; then
POSTGRES_PORT=5432
fi
psql -d "postgresql://oc_$POSTGRES_USER:$POSTGRES_PASSWORD@localhost:$POSTGRES_PORT/$POSTGRES_DB" -c "select now()" || exit 1

10
Containers/postgresql/start.sh
View file

@ -6,14 +6,6 @@ export DUMP_DIR="/mnt/data"
DUMP_FILE="$DUMP_DIR/database-dump.sql" DUMP_FILE="$DUMP_DIR/database-dump.sql"
export PGPASSWORD="$POSTGRES_PASSWORD" export PGPASSWORD="$POSTGRES_PASSWORD"
# Set a default value for POSTGRES_PORT
if [ -z "$POSTGRES_PORT" ]; then
POSTGRES_PORT=5432
fi
# Set PGPORT (the variable used by the postgres entrypoint) to the configured value
export PGPORT=$POSTGRES_PORT
# Don't start database as long as backup is running # Don't start database as long as backup is running
while [ -f "$DUMP_DIR/backup-is-running" ]; do while [ -f "$DUMP_DIR/backup-is-running" ]; do
echo "Waiting for backup container to finish..." echo "Waiting for backup container to finish..."
@ -139,7 +131,7 @@ EOSQL
pg_ctl stop -m fast pg_ctl stop -m fast
# Change database port back to default # Change database port back to default
export PGPORT=$POSTGRES_PORT export PGPORT=5432
# Don't exit if command fails anymore # Don't exit if command fails anymore
set +ex set +ex

1
php/containers.json
View file

@ -99,7 +99,6 @@
"POSTGRES_PASSWORD=%DATABASE_PASSWORD%", "POSTGRES_PASSWORD=%DATABASE_PASSWORD%",
"POSTGRES_DB=nextcloud_database", "POSTGRES_DB=nextcloud_database",
"POSTGRES_USER=nextcloud", "POSTGRES_USER=nextcloud",
"POSTGRES_PORT=5432",
"TZ=%TIMEZONE%", "TZ=%TIMEZONE%",
"PGTZ=%TIMEZONE%" "PGTZ=%TIMEZONE%"
], ],