diff --git a/abra.sh b/abra.sh index 52c49d9..a6e9ddf 100644 --- a/abra.sh +++ b/abra.sh @@ -1,6 +1,6 @@ export LOCAL_SETTINGS_CONF_VERSION=v20 export HTACCESS_CONF_VERSION=v1 -export ENTRYPOINT_CONF_VERSION=v19 +export ENTRYPOINT_CONF_VERSION=v20 export COMPOSER_LOCAL_CONF_VERSION=v5 export PHP_INI_VERSION=v4 diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index 72ff37c..ed4b1d1 100755 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -17,9 +17,6 @@ composer_install() { set -eu cd /var/www/html/ && composer update && composer install - - # SMW needs this; some other extensions brought in by composer might as well. - php /var/www/html/maintenance/update.php --quick } init_db() { @@ -43,13 +40,9 @@ init_db() { php /var/www/html/maintenance/sql.php /var/www/html/maintenance/tables.sql php /var/www/html/maintenance/sql.php /var/www/html/maintenance/interwiki.sql # FIXME run createAndPromote.php with $ADMIN_USERNAME - else - php /var/www/html/maintenance/update.php --quick fi - if [ -n "${OPENID_ENABLED-}" ]; then - php /var/www/html/maintenance/update.php --quick - fi + php /var/www/html/maintenance/update.php --quick } init_extensions() {