1
0
Fork 0
mirror of https://git.tt-rss.org/fox/ttrss-docker-compose synced 2025-06-09 18:39:52 +02:00

pull all set environment variables into app/etc

This commit is contained in:
Andrew Dolgov 2021-01-31 15:26:19 +03:00
parent 5f6651e6f0
commit 828c4180cd
4 changed files with 19 additions and 6 deletions

View file

@ -5,6 +5,12 @@ while ! pg_isready -h $DB_HOST -U $DB_USER; do
sleep 3
done
# We don't need those here (HTTP_HOST would cause false SELF_URL_PATH check failures)
unset HTTP_PORT
unset HTTP_HOST
env
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
@ -66,10 +72,6 @@ elif ! $PSQL -c 'select * from ttrss_version'; then
$PSQL < /var/www/html/tt-rss/schema/ttrss_schema_pgsql.sql
fi
export SELF_URL_PATH=$(echo $SELF_URL_PATH | sed -e 's/[\/&]/\\&/g')
env
if [ ! -s $DST_DIR/config.php ]; then
cp /config.docker.php $DST_DIR/config.php

View file

@ -1,5 +1,9 @@
#!/bin/sh -e
# We don't need those here (HTTP_HOST would cause false SELF_URL_PATH check failures)
unset HTTP_PORT
unset HTTP_HOST
# wait for the app container to delete .app_is_ready and perform rsync, etc.
sleep 30