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

* force adding user/group even if GID/UID is duplicate 

* allow running FPM as root, if needed
This commit is contained in:
Andrew Dolgov 2022-02-17 17:30:54 +03:00
parent 851db2c575
commit c552bb48c9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/startup.sh
View File

@ -10,8 +10,14 @@ unset HTTP_PORT
unset HTTP_HOST
if ! id app >/dev/null 2>&1; then
addgroup -g $OWNER_GID app
adduser -D -h /var/www/html -G app -u $OWNER_UID app
# what if i actually need a duplicate GID/UID group?
addgroup -g $OWNER_GID app || echo app:x:$OWNER_GID:app | \
tee -a /etc/group
adduser -D -h /var/www/html -G app -u $OWNER_UID app || \
echo app:x:$OWNER_UID:$OWNER_GID:Linux User,,,:/var/www/html:/bin/ash | tee -a /etc/passwd
fi
update-ca-certificates || true
@ -21,7 +27,7 @@ SRC_REPO=https://git.tt-rss.org/fox/tt-rss.git
[ -e $DST_DIR ] && rm -f $DST_DIR/.app_is_ready
export PGPASSWORD=$TTRSS_DB_PASS
export PGPASSWORD=$TTRSS_DB_PASS
[ ! -e /var/www/html/index.php ] && cp ${SCRIPT_ROOT}/index.php /var/www/html
@ -115,4 +121,4 @@ rm -f /tmp/error.log && mkfifo /tmp/error.log && chown app:app /tmp/error.log
touch $DST_DIR/.app_is_ready
exec /usr/sbin/php-fpm8 --nodaemonize --force-stderr
exec /usr/sbin/php-fpm8 --nodaemonize --force-stderr -R