kienan
/
ttrss-container
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updater: wait until app container finishes initializing instead of checking for config.php

This commit is contained in:
Andrew Dolgov 2020-01-23 13:55:44 +03:00
parent fa73a498a3
commit 59eb978976
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/startup.sh
View File

@ -8,6 +8,8 @@ done
DST_DIR=/var/www/html/tt-rss DST_DIR=/var/www/html/tt-rss
SRC_REPO=https://git.tt-rss.org/fox/tt-rss.git SRC_REPO=https://git.tt-rss.org/fox/tt-rss.git
[ -e $DST_DIR ] && rm -f $DST_DIR/.app_is_ready
export PGPASSWORD=$DB_PASS export PGPASSWORD=$DB_PASS
[ ! -e /var/www/html/index.php ] && cp /index.php /var/www/html [ ! -e /var/www/html/index.php ] && cp /index.php /var/www/html
@ -68,5 +70,7 @@ else
-i.bak $DST_DIR/config.php -i.bak $DST_DIR/config.php
fi fi
touch $DST_DIR/.app_is_ready
exec /usr/sbin/php-fpm7 -F exec /usr/sbin/php-fpm7 -F

7
app/updater.sh
View File

@ -1,5 +1,8 @@
#!/bin/sh -ex #!/bin/sh -ex
# wait for the app container to delete .app_is_ready and perform rsync, etc.
sleep 30
while ! pg_isready -h $DB_HOST -U $DB_USER; do while ! pg_isready -h $DB_HOST -U $DB_USER; do
echo waiting until $DB_HOST is ready... echo waiting until $DB_HOST is ready...
sleep 3 sleep 3
@ -7,8 +10,8 @@ done
DST_DIR=/var/www/html/tt-rss DST_DIR=/var/www/html/tt-rss
while [ ! -s $DST_DIR/config.php ]; do while [ ! -s $DST_DIR/config.php -a -e $DST_DIR/.app_is_ready ]; do
echo waiting for $DST_DIR/config.php... echo waiting for app container...
sleep 3 sleep 3
done done