diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2024-10-21 08:59:55 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2024-10-21 08:59:55 +0300 |
| commit | 9f0eb4d7fca748bae3e3fc6f9714ca83d169cc64 (patch) | |
| tree | ffe7e7e34391367a11e5baa486d5c64c7ef2c57a /.docker | |
| parent | 5ea96397c08bb7e960a0eb2c2687073dc92c0ad3 (diff) | |
support TTRSS_DB_PORT in container startup scripts
Diffstat (limited to '.docker')
| -rw-r--r-- | .docker/app/backup.sh | 4 | ||||
| -rw-r--r-- | .docker/app/startup.sh | 4 | ||||
| -rw-r--r-- | .docker/app/updater.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.docker/app/backup.sh b/.docker/app/backup.sh index a28c39544..784982c70 100644 --- a/.docker/app/backup.sh +++ b/.docker/app/backup.sh @@ -4,12 +4,12 @@ DST_DIR=/backups KEEP_DAYS=28 APP_ROOT=/var/www/html/tt-rss -if pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER; then +if pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER -p $TTRSS_DB_PORT; then DST_FILE=ttrss-backup-$(date +%Y%m%d).sql.gz echo backing up tt-rss database to $DST_DIR/$DST_FILE... - export PGPASSWORD=$TTRSS_DB_PASS + export PGPASSWORD=$TTRSS_DB_PASS pg_dump --clean -h $TTRSS_DB_HOST -U $TTRSS_DB_USER $TTRSS_DB_NAME | gzip > $DST_DIR/$DST_FILE diff --git a/.docker/app/startup.sh b/.docker/app/startup.sh index b035371fe..dd21d4ef1 100644 --- a/.docker/app/startup.sh +++ b/.docker/app/startup.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -while ! pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER; do +while ! pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER -p $TTRSS_DB_PORT; do echo waiting until $TTRSS_DB_HOST is ready... sleep 3 done @@ -84,7 +84,7 @@ else echo skipping local plugin updates, disabled. fi -PSQL="psql -q -h $TTRSS_DB_HOST -U $TTRSS_DB_USER $TTRSS_DB_NAME" +PSQL="psql -q -h $TTRSS_DB_HOST -p $TTRSS_DB_PORT -U $TTRSS_DB_USER $TTRSS_DB_NAME" $PSQL -c "create extension if not exists pg_trgm" diff --git a/.docker/app/updater.sh b/.docker/app/updater.sh index 5fdddd1d1..66e0b7e5c 100644 --- a/.docker/app/updater.sh +++ b/.docker/app/updater.sh @@ -15,7 +15,7 @@ if ! id app; then adduser -D -h /var/www/html -G app -u $OWNER_UID app fi -while ! pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER; do +while ! pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER -p $TTRSS_DB_PORT; do echo waiting until $TTRSS_DB_HOST is ready... sleep 3 done |