From 586dd9960483793caff0e65590d4a07aa6ac7c85 Mon Sep 17 00:00:00 2001 From: Jeroen Geusebroek Date: Wed, 4 Jan 2017 14:23:29 +0100 Subject: [PATCH] Always run database upgrade --- entrypoint.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 60d393d..80f7c3e 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -22,9 +22,6 @@ if [ -f /config/dbsettings.inc.php ]; then chown www-data:www-data /config/dbsettings.inc.php rm /var/www/spotweb/dbsettings.inc.php ln -s /config/dbsettings.inc.php /var/www/spotweb/dbsettings.inc.php - - # Run database update - /usr/bin/php /var/www/spotweb/bin/upgrade-db.php else echo -e "\nWARNING: You have no database configuration file, either create /config/dbsettings.inc.php or restart this container with the correct environment variables to auto generate the config.\n" fi @@ -33,7 +30,10 @@ TZ=${TZ:-"Europe/Amsterdam"} echo -e "Setting (PHP) time zone to ${TZ}\n" sed -i "s#^;date.timezone =.*#date.timezone = ${TZ}#g" /etc/php/7.*/*/php.ini +# Run database update +/usr/bin/php /var/www/spotweb/bin/upgrade-db.php >/dev/null 2>&1 + # Enabling PHP mod rewrite /usr/sbin/a2enmod rewrite && /etc/init.d/apache2 restart -tail -F /var/log/apache2/* \ No newline at end of file +tail -F /var/log/apache2/*