container
/
freshrss
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 36 Activity

remove setup cli script from entrypoint
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details

This commit is contained in:
Robert Kaussow 2019-10-03 18:13:05 +02:00
parent 319958cb59
commit a60da7a0c7
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
overlay/usr/local/bin/entrypoint.sh
View File

@ -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/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 /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 ln -s "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" /var/www/.postgresql/root.crt
fi 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) UCREATE=$(/usr/bin/php ./cli/create-user.php --user "$FRESHRSS_DEFAULT_USER" --password "$FRESHRSS_DEFAULT_PASSWORD" 2>&1)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
case "$UCREATE" in case "$UCREATE" in
*"username already taken"*) echo "Result: success" ;; *"username already taken"*) ;;
*) *)
echo $UCREATE echo $UCREATE
exit 1 exit 1
;; ;;
esac esac
fi fi
echo "Result: success"
printf "\nEnsure FreshRSS is installed...\n" # printf "\nEnsure FreshRSS is installed...\n"
INSTALL=$(/usr/bin/php ./cli/do-install.php --default_user "$FRESHRSS_DEFAULT_USER" 2>&1) # INSTALL=$(/usr/bin/php ./cli/do-install.php --default_user "$FRESHRSS_DEFAULT_USER" 2>&1)
if [ $? -ne 0 ]; then # if [ $? -ne 0 ]; then
case "$INSTALL" in # case "$INSTALL" in
*"already installed"*) # *"already installed"*)
/usr/bin/php ./cli/reconfigure.php --default_user "$FRESHRSS_DEFAULT_USER" # /usr/bin/php ./cli/reconfigure.php --default_user "$FRESHRSS_DEFAULT_USER"
;; # ;;
*) # *)
echo $INSTALL # echo $INSTALL
exit 1 # exit 1
;; # ;;
esac # esac
fi # fi
fi
if [ -f "/var/www/app/data/do-install.txt" ]; then
rm -rf /var/www/app/data/do-install.txt
fi fi
exec supercronic -split-logs /etc/crontabs/nginx 1> /dev/null & exec supercronic -split-logs /etc/crontabs/nginx 1> /dev/null &