neingeist/ttrss-docker-compose
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/ttrss-docker-compose synced 2025-10-31 03:24:12 +01:00
Code Issues Releases Wiki Activity

* temporarily add more startup debugging

Browse source 
* perform all sync operations under 'app'
This commit is contained in:
Andrew Dolgov 2022-05-22 09:19:03 +03:00
parent 670cf8bb85
commit a9c27a9d02
1 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/app/startup.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh -e #!/bin/sh -ex
while ! pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER; do while ! pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER; do
echo waiting until $TTRSS_DB_HOST is ready... echo waiting until $TTRSS_DB_HOST is ready...
@ -26,10 +26,15 @@ export PGPASSWORD=$TTRSS_DB_PASS
[ ! -e /var/www/html/index.php ] && cp ${SCRIPT_ROOT}/index.php /var/www/html [ ! -e /var/www/html/index.php ] && cp ${SCRIPT_ROOT}/index.php /var/www/html
if [ ! -d $DST_DIR ]; then if [ ! -d $DST_DIR ]; then
rsync -a \ mkdir -p $DST_DIR
chown $OWNER_UID:$OWNER_GID $DST_DIR
sudo -u app rsync -a \
$SRC_DIR/ $DST_DIR/ $SRC_DIR/ $DST_DIR/
else else
rsync -a --delete \ chown -R $OWNER_UID:$OWNER_GID $DST_DIR
sudo -u app rsync -a --delete \
--exclude cache \ --exclude cache \
--exclude lock \ --exclude lock \
--exclude feed-icons \ --exclude feed-icons \
@ -39,19 +44,29 @@ else
--exclude themes.local \ --exclude themes.local \
$SRC_DIR/ $DST_DIR/ $SRC_DIR/ $DST_DIR/
rsync -a --delete \ sudo -u app rsync -a --delete \
$SRC_DIR/plugins.local/nginx_xaccel $DST_DIR/plugins.local/nginx_xaccel $SRC_DIR/plugins.local/nginx_xaccel \
$DST_DIR/plugins.local/nginx_xaccel
fi fi
for d in cache lock feed-icons plugins.local themes.local; do for d in cache lock feed-icons plugins.local themes.local; do
mkdir -p $DST_DIR/$d sudo -u app mkdir -p $DST_DIR/$d
done done
for d in cache lock feed-icons; do
chmod 777 $DST_DIR/$d
find $DST_DIR/$d -type f -exec chmod 666 {} \;
done
sudo -u app cp ${SCRIPT_ROOT}/config.docker.php $DST_DIR/config.php
chmod 644 $DST_DIR/config.php
chown -R $OWNER_UID:$OWNER_GID $DST_DIR \
/var/log/php8
if [ -z "$TTRSS_NO_STARTUP_PLUGIN_UPDATES" ]; then if [ -z "$TTRSS_NO_STARTUP_PLUGIN_UPDATES" ]; then
echo updating all local plugins... echo updating all local plugins...
chown -R $OWNER_UID:$OWNER_GID $DST_DIR/plugins.local
find $DST_DIR/plugins.local -mindepth 1 -maxdepth 1 -type d | while read PLUGIN; do find $DST_DIR/plugins.local -mindepth 1 -maxdepth 1 -type d | while read PLUGIN; do
if [ -d $PLUGIN/.git ]; then if [ -d $PLUGIN/.git ]; then
echo updating $PLUGIN... echo updating $PLUGIN...
@ -66,17 +81,6 @@ else
echo skipping local plugin updates, disabled. echo skipping local plugin updates, disabled.
fi fi
cp ${SCRIPT_ROOT}/config.docker.php $DST_DIR/config.php
chmod 644 $DST_DIR/config.php
chown -R $OWNER_UID:$OWNER_GID $DST_DIR \
/var/log/php8
for d in cache lock feed-icons; do
chmod 777 $DST_DIR/$d
find $DST_DIR/$d -type f -exec chmod 666 {} \;
done
PSQL="psql -q -h $TTRSS_DB_HOST -U $TTRSS_DB_USER $TTRSS_DB_NAME" PSQL="psql -q -h $TTRSS_DB_HOST -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"