remove setup cli script from entrypoint
This commit is contained in:
parent
319958cb59
commit
a60da7a0c7
@ -4,7 +4,7 @@
|
||||
/usr/local/bin/gomplate -V -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl
|
||||
/usr/local/bin/gomplate -V -o /var/www/app/constants.local.php -f /etc/templates/constants.local.php.tmpl
|
||||
|
||||
if [ "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" ]; then
|
||||
if [ "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" ] && [ ! -f "/var/www/.postgresql/root.crt" ]; then
|
||||
ln -s "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" /var/www/.postgresql/root.crt
|
||||
fi
|
||||
|
||||
@ -20,27 +20,32 @@ if [ "${FRESHRSS_DEFAULT_USER}" ]; then
|
||||
UCREATE=$(/usr/bin/php ./cli/create-user.php --user "$FRESHRSS_DEFAULT_USER" --password "$FRESHRSS_DEFAULT_PASSWORD" 2>&1)
|
||||
if [ $? -ne 0 ]; then
|
||||
case "$UCREATE" in
|
||||
*"username already taken"*) echo "Result: success" ;;
|
||||
*"username already taken"*) ;;
|
||||
*)
|
||||
echo $UCREATE
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
echo "Result: success"
|
||||
|
||||
printf "\nEnsure FreshRSS is installed...\n"
|
||||
INSTALL=$(/usr/bin/php ./cli/do-install.php --default_user "$FRESHRSS_DEFAULT_USER" 2>&1)
|
||||
if [ $? -ne 0 ]; then
|
||||
case "$INSTALL" in
|
||||
*"already installed"*)
|
||||
/usr/bin/php ./cli/reconfigure.php --default_user "$FRESHRSS_DEFAULT_USER"
|
||||
;;
|
||||
*)
|
||||
echo $INSTALL
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
# printf "\nEnsure FreshRSS is installed...\n"
|
||||
# INSTALL=$(/usr/bin/php ./cli/do-install.php --default_user "$FRESHRSS_DEFAULT_USER" 2>&1)
|
||||
# if [ $? -ne 0 ]; then
|
||||
# case "$INSTALL" in
|
||||
# *"already installed"*)
|
||||
# /usr/bin/php ./cli/reconfigure.php --default_user "$FRESHRSS_DEFAULT_USER"
|
||||
# ;;
|
||||
# *)
|
||||
# echo $INSTALL
|
||||
# exit 1
|
||||
# ;;
|
||||
# esac
|
||||
# fi
|
||||
fi
|
||||
|
||||
if [ -f "/var/www/app/data/do-install.txt" ]; then
|
||||
rm -rf /var/www/app/data/do-install.txt
|
||||
fi
|
||||
|
||||
exec supercronic -split-logs /etc/crontabs/nginx 1> /dev/null &
|
||||
|
Reference in New Issue
Block a user