From bde470d4f9011367eb0a61f1a431282967d5b196 Mon Sep 17 00:00:00 2001 From: Cassowary Rusnov Date: Tue, 17 Jan 2023 19:26:05 -0800 Subject: [PATCH] Fix composer and extension versions --- abra.sh | 2 +- entrypoint.sh.tmpl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/abra.sh b/abra.sh index 792be85..869033a 100644 --- a/abra.sh +++ b/abra.sh @@ -1,6 +1,6 @@ export LOCAL_SETTINGS_CONF_VERSION=v2 export HTACCESS_CONF_VERSION=v1 -export ENTRYPOINT_CONF_VERSION=v2 +export ENTRYPOINT_CONF_VERSION=v3 export COMPOSER_LOCAL_CONF_VERSION=v1 export PHP_INI_VERSION=v1 diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index a8fa6ad..8eadfbc 100755 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -8,7 +8,7 @@ init_composer() { if ! type composer > /dev/null 2>&1; then apt update -yqq && apt install -yqq curl git unzip zip curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php - php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.15 + php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.5.1 composer -V fi } @@ -51,14 +51,14 @@ init_db() { init_extensions() { if [ ! -d /var/www/html/extensions/PluggableAuth ]; then - git clone --depth 1 -b REL1_32 \ + git clone --depth 1 -b REL1_39 \ https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PluggableAuth \ /var/www/html/extensions/PluggableAuth fi if [ -n "${SAML_ENABLED-}" ]; then if [ ! -d /var/www/html/extensions/SimpleSAMLphp ]; then - git clone --depth 1 -b REL1_32 \ + git clone --depth 1 -b REL1_39 \ https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SimpleSAMLphp \ /var/www/html/extensions/SimpleSAMLphp fi @@ -66,7 +66,7 @@ init_extensions() { if [ -n "${OPENID_ENABLED-}" ]; then if [ ! -d /var/www/html/extensions/OpenIDConnect ]; then - git clone --depth 1 -b REL1_35 \ + git clone --depth 1 -b REL1_39 \ https://gerrit.wikimedia.org/r/mediawiki/extensions/OpenIDConnect \ /var/www/html/extensions/OpenIDConnect fi