diff --git a/app/Dockerfile b/app/Dockerfile index 7601036..625d4b7 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -33,14 +33,14 @@ ENV TTRSS_XDEBUG_PORT="9000" ENV TTRSS_DB_TYPE="pgsql" ENV TTRSS_DB_HOST="db" -ENV TTRSS_DB_USER="%DB_USER" -ENV TTRSS_DB_NAME="%DB_NAME" -ENV TTRSS_DB_PASS="%DB_PASS" +ENV TTRSS_DB_USER="" +ENV TTRSS_DB_NAME="" +ENV TTRSS_DB_PASS="" ENV TTRSS_DB_PORT="5432" # config.php defaults ENV TTRSS_MYSQL_CHARSET="UTF8" -ENV TTRSS_SELF_URL_PATH="%SELF_URL_PATH" +ENV TTRSS_SELF_URL_PATH="" ENV TTRSS_SINGLE_USER_MODE="" ENV TTRSS_SIMPLE_UPDATE_MODE="" ENV TTRSS_PHP_EXECUTABLE="/usr/bin/php8" @@ -51,9 +51,6 @@ ENV TTRSS_ICONS_URL="feed-icons" ENV TTRSS_AUTH_AUTO_CREATE="true" ENV TTRSS_AUTH_AUTO_LOGIN="true" ENV TTRSS_FORCE_ARTICLE_PURGE="0" -ENV TTRSS_ENABLE_REGISTRATION="" -ENV TTRSS_REG_NOTIFY_ADDRESS="user@your.domain.dom" -ENV TTRSS_REG_MAX_USERS="10" ENV TTRSS_SESSION_COOKIE_LIFETIME="86400" ENV TTRSS_SMTP_FROM_NAME="Tiny Tiny RSS" ENV TTRSS_SMTP_FROM_ADDRESS="noreply@your.domain.dom" diff --git a/app/updater.sh b/app/updater.sh index 60627e7..e3a5bb5 100755 --- a/app/updater.sh +++ b/app/updater.sh @@ -7,7 +7,7 @@ unset HTTP_HOST # wait for the app container to delete .app_is_ready and perform rsync, etc. sleep 30 -if ! id app; then +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 fi