xle/tt-rss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support TTRSS_DB_PORT in container startup scripts

Browse Source
This commit is contained in:
Andrew Dolgov
2024-10-21 08:59:55 +03:00
parent 5ea96397c0
commit 9f0eb4d7fc
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.docker/app/backup.sh
View File

@@ -4,12 +4,12 @@ DST_DIR=/backups
KEEP_DAYS=28 KEEP_DAYS=28
APP_ROOT=/var/www/html/tt-rss 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 DST_FILE=ttrss-backup-$(date +%Y%m%d).sql.gz
echo backing up tt-rss database to $DST_DIR/$DST_FILE... 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 pg_dump --clean -h $TTRSS_DB_HOST -U $TTRSS_DB_USER $TTRSS_DB_NAME | gzip > $DST_DIR/$DST_FILE

4
.docker/app/startup.sh
View File

@@ -1,6 +1,6 @@
#!/bin/sh -e #!/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... echo waiting until $TTRSS_DB_HOST is ready...
sleep 3 sleep 3
done done
@@ -84,7 +84,7 @@ else
echo skipping local plugin updates, disabled. echo skipping local plugin updates, disabled.
fi 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" $PSQL -c "create extension if not exists pg_trgm"

2
.docker/app/updater.sh
View File

@@ -15,7 +15,7 @@ if ! id app; then
adduser -D -h /var/www/html -G app -u $OWNER_UID app adduser -D -h /var/www/html -G app -u $OWNER_UID app
fi 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... echo waiting until $TTRSS_DB_HOST is ready...
sleep 3 sleep 3
done done