From 1b5b7d76b224416eab6b93f23e07f544e5b694b9 Mon Sep 17 00:00:00 2001 From: Christian Heusel Date: Mon, 23 Dec 2024 21:40:04 +0100 Subject: [PATCH 1/4] remove the EOL MediaWiki 1.41 https://lists.wikimedia.org/hyperkitty/list/mediawiki-announce@lists.wikimedia.org/thread/5NYC4UZLY3MWQZ6DYJAUQRJG2ZHZFBJ6/ Signed-off-by: Christian Heusel --- 1.41/apache/Dockerfile | 120 ------------------------------------- 1.41/fpm-alpine/Dockerfile | 92 ---------------------------- 1.41/fpm/Dockerfile | 105 -------------------------------- 3 files changed, 317 deletions(-) delete mode 100644 1.41/apache/Dockerfile delete mode 100644 1.41/fpm-alpine/Dockerfile delete mode 100644 1.41/fpm/Dockerfile diff --git a/1.41/apache/Dockerfile b/1.41/apache/Dockerfile deleted file mode 100644 index 3a2e70f..0000000 --- a/1.41/apache/Dockerfile +++ /dev/null @@ -1,120 +0,0 @@ -FROM php:8.1-apache - -# System dependencies -RUN set -eux; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - git \ - librsvg2-bin \ - imagemagick \ - # Required for SyntaxHighlighting - python3 \ - ; \ - rm -rf /var/lib/apt/lists/* - -# Install the PHP extensions we need -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libicu-dev \ - libonig-dev \ - liblua5.1-0-dev \ - ; \ - \ - docker-php-ext-install -j "$(nproc)" \ - calendar \ - intl \ - mbstring \ - mysqli \ - opcache \ - ; \ - \ - pecl install APCu-5.1.24; \ - pecl install LuaSandbox-4.1.2; \ - docker-php-ext-enable \ - apcu \ - luasandbox \ - ; \ - rm -r /tmp/pear; \ - \ - # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark; \ - ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -rt apt-mark manual; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/* - -# Enable Short URLs -RUN set -eux; \ - a2enmod rewrite; \ - { \ - echo ""; \ - echo " RewriteEngine On"; \ - echo " RewriteCond %{REQUEST_FILENAME} !-f"; \ - echo " RewriteCond %{REQUEST_FILENAME} !-d"; \ - echo " RewriteRule ^ %{DOCUMENT_ROOT}/index.php [L]"; \ - echo ""; \ - } > "$APACHE_CONFDIR/conf-available/short-url.conf"; \ - a2enconf short-url - -# Enable AllowEncodedSlashes for VisualEditor -RUN sed -i "s/<\/VirtualHost>/\tAllowEncodedSlashes NoDecode\n<\/VirtualHost>/" "$APACHE_CONFDIR/sites-available/000-default.conf" - -# set recommended PHP.ini settings -# see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=60'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini - -# SQLite Directory Setup -RUN set -eux; \ - mkdir -p /var/www/data; \ - chown -R www-data:www-data /var/www/data - -# Version -ENV MEDIAWIKI_MAJOR_VERSION 1.41 -ENV MEDIAWIKI_VERSION 1.41.5 - -# MediaWiki setup -RUN set -eux; \ - fetchDeps=" \ - gnupg \ - dirmngr \ - "; \ - apt-get update; \ - apt-get install -y --no-install-recommends $fetchDeps; \ - \ - curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ - curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ - export GNUPGHOME="$(mktemp -d)"; \ -# gpg key from https://www.mediawiki.org/keys/keys.txt - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \ - D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \ - 441276E9CCD15F44F6D97D18C119E1A64D70938E \ - F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \ - 1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \ - ; \ - gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ - tar -x --strip-components=1 -f mediawiki.tar.gz; \ - gpgconf --kill all; \ - rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ - chown -R www-data:www-data extensions skins cache images; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* - -CMD ["apache2-foreground"] diff --git a/1.41/fpm-alpine/Dockerfile b/1.41/fpm-alpine/Dockerfile deleted file mode 100644 index 9e6aa7a..0000000 --- a/1.41/fpm-alpine/Dockerfile +++ /dev/null @@ -1,92 +0,0 @@ -FROM php:8.1-fpm-alpine - -# System dependencies -RUN set -eux; \ - \ - apk add --no-cache \ - git \ - imagemagick \ - # Required for SyntaxHighlighting - python3 \ - ; - -# Install the PHP extensions we need -RUN set -eux; \ - \ - apk add --no-cache --virtual .build-deps \ - $PHPIZE_DEPS \ - icu-dev \ - lua5.1-dev \ - oniguruma-dev \ - ; \ - \ - docker-php-ext-install -j "$(nproc)" \ - calendar \ - intl \ - mbstring \ - mysqli \ - opcache \ - ; \ - \ - pecl install APCu-5.1.24; \ - pecl install LuaSandbox-4.1.2; \ - docker-php-ext-enable \ - apcu \ - luasandbox \ - ; \ - rm -r /tmp/pear; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .mediawiki-phpext-rundeps $runDeps; \ - apk del --no-network .build-deps - -# set recommended PHP.ini settings -# see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=60'; \ - echo 'opcache.fast_shutdown=1'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini - -# SQLite Directory Setup -RUN set -eux; \ - mkdir -p /var/www/data; \ - chown -R www-data:www-data /var/www/data - -# Version -ENV MEDIAWIKI_MAJOR_VERSION 1.41 -ENV MEDIAWIKI_VERSION 1.41.5 - -# MediaWiki setup -RUN set -eux; \ - apk add --no-cache --virtual .fetch-deps \ - bzip2 \ - gnupg \ - ; \ - \ - curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ - curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ - export GNUPGHOME="$(mktemp -d)"; \ -# gpg key from https://www.mediawiki.org/keys/keys.txt - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \ - D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \ - 441276E9CCD15F44F6D97D18C119E1A64D70938E \ - F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \ - 1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \ - ; \ - gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ - tar -x --strip-components=1 -f mediawiki.tar.gz; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ - chown -R www-data:www-data extensions skins cache images; \ - \ - apk del --no-network .fetch-deps - -CMD ["php-fpm"] diff --git a/1.41/fpm/Dockerfile b/1.41/fpm/Dockerfile deleted file mode 100644 index 7571323..0000000 --- a/1.41/fpm/Dockerfile +++ /dev/null @@ -1,105 +0,0 @@ -FROM php:8.1-fpm - -# System dependencies -RUN set -eux; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - git \ - librsvg2-bin \ - imagemagick \ - # Required for SyntaxHighlighting - python3 \ - ; \ - rm -rf /var/lib/apt/lists/* - -# Install the PHP extensions we need -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libicu-dev \ - libonig-dev \ - liblua5.1-0-dev \ - ; \ - \ - docker-php-ext-install -j "$(nproc)" \ - calendar \ - intl \ - mbstring \ - mysqli \ - opcache \ - ; \ - \ - pecl install APCu-5.1.24; \ - pecl install LuaSandbox-4.1.2; \ - docker-php-ext-enable \ - apcu \ - luasandbox \ - ; \ - rm -r /tmp/pear; \ - \ - # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark; \ - ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -rt apt-mark manual; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/* - - -# set recommended PHP.ini settings -# see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=60'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini - -# SQLite Directory Setup -RUN set -eux; \ - mkdir -p /var/www/data; \ - chown -R www-data:www-data /var/www/data - -# Version -ENV MEDIAWIKI_MAJOR_VERSION 1.41 -ENV MEDIAWIKI_VERSION 1.41.5 - -# MediaWiki setup -RUN set -eux; \ - fetchDeps=" \ - gnupg \ - dirmngr \ - "; \ - apt-get update; \ - apt-get install -y --no-install-recommends $fetchDeps; \ - \ - curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ - curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ - export GNUPGHOME="$(mktemp -d)"; \ -# gpg key from https://www.mediawiki.org/keys/keys.txt - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \ - D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \ - 441276E9CCD15F44F6D97D18C119E1A64D70938E \ - F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \ - 1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \ - ; \ - gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ - tar -x --strip-components=1 -f mediawiki.tar.gz; \ - gpgconf --kill all; \ - rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ - chown -R www-data:www-data extensions skins cache images; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* - -CMD ["php-fpm"] From 89fa855e0f63f584ea1651f8e3ace28133df3e50 Mon Sep 17 00:00:00 2001 From: Christian Heusel Date: Mon, 23 Dec 2024 21:57:50 +0100 Subject: [PATCH 2/4] Add missing gpg identity to the templates We now fetch the keys from "https://www.mediawiki.org/keys/keys.txt". Signed-off-by: Christian Heusel --- 1.39/apache/Dockerfile | 8 +------- 1.39/fpm-alpine/Dockerfile | 8 +------- 1.39/fpm/Dockerfile | 8 +------- 1.42/apache/Dockerfile | 8 +------- 1.42/fpm-alpine/Dockerfile | 8 +------- 1.42/fpm/Dockerfile | 8 +------- Dockerfile-alpine.template | 8 +------- Dockerfile-debian.template | 8 +------- 8 files changed, 8 insertions(+), 56 deletions(-) diff --git a/1.39/apache/Dockerfile b/1.39/apache/Dockerfile index 6e87535..24e799f 100644 --- a/1.39/apache/Dockerfile +++ b/1.39/apache/Dockerfile @@ -101,13 +101,7 @@ RUN set -eux; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ export GNUPGHOME="$(mktemp -d)"; \ -# gpg key from https://www.mediawiki.org/keys/keys.txt - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \ - D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \ - 441276E9CCD15F44F6D97D18C119E1A64D70938E \ - F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \ - 1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \ - ; \ + gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ gpgconf --kill all; \ diff --git a/1.39/fpm-alpine/Dockerfile b/1.39/fpm-alpine/Dockerfile index d419fb2..117bbb0 100644 --- a/1.39/fpm-alpine/Dockerfile +++ b/1.39/fpm-alpine/Dockerfile @@ -74,13 +74,7 @@ RUN set -eux; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ export GNUPGHOME="$(mktemp -d)"; \ -# gpg key from https://www.mediawiki.org/keys/keys.txt - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \ - D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \ - 441276E9CCD15F44F6D97D18C119E1A64D70938E \ - F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \ - 1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \ - ; \ + gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ gpgconf --kill all; \ diff --git a/1.39/fpm/Dockerfile b/1.39/fpm/Dockerfile index ef75eb6..5dca631 100644 --- a/1.39/fpm/Dockerfile +++ b/1.39/fpm/Dockerfile @@ -86,13 +86,7 @@ RUN set -eux; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ export GNUPGHOME="$(mktemp -d)"; \ -# gpg key from https://www.mediawiki.org/keys/keys.txt - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \ - D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \ - 441276E9CCD15F44F6D97D18C119E1A64D70938E \ - F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \ - 1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \ - ; \ + gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ gpgconf --kill all; \ diff --git a/1.42/apache/Dockerfile b/1.42/apache/Dockerfile index d310834..90b8b64 100644 --- a/1.42/apache/Dockerfile +++ b/1.42/apache/Dockerfile @@ -101,13 +101,7 @@ RUN set -eux; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ export GNUPGHOME="$(mktemp -d)"; \ -# gpg key from https://www.mediawiki.org/keys/keys.txt - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \ - D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \ - 441276E9CCD15F44F6D97D18C119E1A64D70938E \ - F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \ - 1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \ - ; \ + gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ gpgconf --kill all; \ diff --git a/1.42/fpm-alpine/Dockerfile b/1.42/fpm-alpine/Dockerfile index ceddff5..c3f4bfd 100644 --- a/1.42/fpm-alpine/Dockerfile +++ b/1.42/fpm-alpine/Dockerfile @@ -74,13 +74,7 @@ RUN set -eux; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ export GNUPGHOME="$(mktemp -d)"; \ -# gpg key from https://www.mediawiki.org/keys/keys.txt - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \ - D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \ - 441276E9CCD15F44F6D97D18C119E1A64D70938E \ - F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \ - 1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \ - ; \ + gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ gpgconf --kill all; \ diff --git a/1.42/fpm/Dockerfile b/1.42/fpm/Dockerfile index 42d0101..7e64037 100644 --- a/1.42/fpm/Dockerfile +++ b/1.42/fpm/Dockerfile @@ -86,13 +86,7 @@ RUN set -eux; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ export GNUPGHOME="$(mktemp -d)"; \ -# gpg key from https://www.mediawiki.org/keys/keys.txt - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \ - D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \ - 441276E9CCD15F44F6D97D18C119E1A64D70938E \ - F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \ - 1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \ - ; \ + gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ gpgconf --kill all; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index a75dc91..8fd7695 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -74,13 +74,7 @@ RUN set -eux; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ export GNUPGHOME="$(mktemp -d)"; \ -# gpg key from https://www.mediawiki.org/keys/keys.txt - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \ - D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \ - 441276E9CCD15F44F6D97D18C119E1A64D70938E \ - F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \ - 1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \ - ; \ + gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ gpgconf --kill all; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 86cc900..47b31b6 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -86,13 +86,7 @@ RUN set -eux; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ export GNUPGHOME="$(mktemp -d)"; \ -# gpg key from https://www.mediawiki.org/keys/keys.txt - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \ - D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \ - 441276E9CCD15F44F6D97D18C119E1A64D70938E \ - F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \ - 1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \ - ; \ + gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ gpgconf --kill all; \ From e0dbb474e38a476c7492abdb34054267f7fc653e Mon Sep 17 00:00:00 2001 From: Christian Heusel Date: Mon, 23 Dec 2024 22:09:58 +0100 Subject: [PATCH 3/4] Add MediaWiki 1.43.0 Signed-off-by: Christian Heusel --- 1.43/apache/Dockerfile | 114 +++++++++++++++++++++++++++++++++++++ 1.43/fpm-alpine/Dockerfile | 86 ++++++++++++++++++++++++++++ 1.43/fpm/Dockerfile | 99 ++++++++++++++++++++++++++++++++ 3 files changed, 299 insertions(+) create mode 100644 1.43/apache/Dockerfile create mode 100644 1.43/fpm-alpine/Dockerfile create mode 100644 1.43/fpm/Dockerfile diff --git a/1.43/apache/Dockerfile b/1.43/apache/Dockerfile new file mode 100644 index 0000000..1b39f92 --- /dev/null +++ b/1.43/apache/Dockerfile @@ -0,0 +1,114 @@ +FROM php:8.1-apache + +# System dependencies +RUN set -eux; \ + \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + git \ + librsvg2-bin \ + imagemagick \ + # Required for SyntaxHighlighting + python3 \ + ; \ + rm -rf /var/lib/apt/lists/* + +# Install the PHP extensions we need +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libicu-dev \ + libonig-dev \ + liblua5.1-0-dev \ + ; \ + \ + docker-php-ext-install -j "$(nproc)" \ + calendar \ + intl \ + mbstring \ + mysqli \ + opcache \ + ; \ + \ + pecl install APCu-5.1.24; \ + pecl install LuaSandbox-4.1.2; \ + docker-php-ext-enable \ + apcu \ + luasandbox \ + ; \ + rm -r /tmp/pear; \ + \ + # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark; \ + ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -rt apt-mark manual; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/* + +# Enable Short URLs +RUN set -eux; \ + a2enmod rewrite; \ + { \ + echo ""; \ + echo " RewriteEngine On"; \ + echo " RewriteCond %{REQUEST_FILENAME} !-f"; \ + echo " RewriteCond %{REQUEST_FILENAME} !-d"; \ + echo " RewriteRule ^ %{DOCUMENT_ROOT}/index.php [L]"; \ + echo ""; \ + } > "$APACHE_CONFDIR/conf-available/short-url.conf"; \ + a2enconf short-url + +# Enable AllowEncodedSlashes for VisualEditor +RUN sed -i "s/<\/VirtualHost>/\tAllowEncodedSlashes NoDecode\n<\/VirtualHost>/" "$APACHE_CONFDIR/sites-available/000-default.conf" + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +# SQLite Directory Setup +RUN set -eux; \ + mkdir -p /var/www/data; \ + chown -R www-data:www-data /var/www/data + +# Version +ENV MEDIAWIKI_MAJOR_VERSION 1.43 +ENV MEDIAWIKI_VERSION 1.43.0 + +# MediaWiki setup +RUN set -eux; \ + fetchDeps=" \ + gnupg \ + dirmngr \ + "; \ + apt-get update; \ + apt-get install -y --no-install-recommends $fetchDeps; \ + \ + curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ + curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ + export GNUPGHOME="$(mktemp -d)"; \ + gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ + gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ + tar -x --strip-components=1 -f mediawiki.tar.gz; \ + gpgconf --kill all; \ + rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ + chown -R www-data:www-data extensions skins cache images; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ + rm -rf /var/lib/apt/lists/* + +CMD ["apache2-foreground"] diff --git a/1.43/fpm-alpine/Dockerfile b/1.43/fpm-alpine/Dockerfile new file mode 100644 index 0000000..574fd31 --- /dev/null +++ b/1.43/fpm-alpine/Dockerfile @@ -0,0 +1,86 @@ +FROM php:8.1-fpm-alpine + +# System dependencies +RUN set -eux; \ + \ + apk add --no-cache \ + git \ + imagemagick \ + # Required for SyntaxHighlighting + python3 \ + ; + +# Install the PHP extensions we need +RUN set -eux; \ + \ + apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ + icu-dev \ + lua5.1-dev \ + oniguruma-dev \ + ; \ + \ + docker-php-ext-install -j "$(nproc)" \ + calendar \ + intl \ + mbstring \ + mysqli \ + opcache \ + ; \ + \ + pecl install APCu-5.1.24; \ + pecl install LuaSandbox-4.1.2; \ + docker-php-ext-enable \ + apcu \ + luasandbox \ + ; \ + rm -r /tmp/pear; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .mediawiki-phpext-rundeps $runDeps; \ + apk del --no-network .build-deps + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +# SQLite Directory Setup +RUN set -eux; \ + mkdir -p /var/www/data; \ + chown -R www-data:www-data /var/www/data + +# Version +ENV MEDIAWIKI_MAJOR_VERSION 1.43 +ENV MEDIAWIKI_VERSION 1.43.0 + +# MediaWiki setup +RUN set -eux; \ + apk add --no-cache --virtual .fetch-deps \ + bzip2 \ + gnupg \ + ; \ + \ + curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ + curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ + export GNUPGHOME="$(mktemp -d)"; \ + gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ + gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ + tar -x --strip-components=1 -f mediawiki.tar.gz; \ + gpgconf --kill all; \ + rm -rf "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ + chown -R www-data:www-data extensions skins cache images; \ + \ + apk del --no-network .fetch-deps + +CMD ["php-fpm"] diff --git a/1.43/fpm/Dockerfile b/1.43/fpm/Dockerfile new file mode 100644 index 0000000..f4792df --- /dev/null +++ b/1.43/fpm/Dockerfile @@ -0,0 +1,99 @@ +FROM php:8.1-fpm + +# System dependencies +RUN set -eux; \ + \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + git \ + librsvg2-bin \ + imagemagick \ + # Required for SyntaxHighlighting + python3 \ + ; \ + rm -rf /var/lib/apt/lists/* + +# Install the PHP extensions we need +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libicu-dev \ + libonig-dev \ + liblua5.1-0-dev \ + ; \ + \ + docker-php-ext-install -j "$(nproc)" \ + calendar \ + intl \ + mbstring \ + mysqli \ + opcache \ + ; \ + \ + pecl install APCu-5.1.24; \ + pecl install LuaSandbox-4.1.2; \ + docker-php-ext-enable \ + apcu \ + luasandbox \ + ; \ + rm -r /tmp/pear; \ + \ + # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark; \ + ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -rt apt-mark manual; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/* + + +# set recommended PHP.ini settings +# see https://secure.php.net/manual/en/opcache.installation.php +RUN { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + } > /usr/local/etc/php/conf.d/opcache-recommended.ini + +# SQLite Directory Setup +RUN set -eux; \ + mkdir -p /var/www/data; \ + chown -R www-data:www-data /var/www/data + +# Version +ENV MEDIAWIKI_MAJOR_VERSION 1.43 +ENV MEDIAWIKI_VERSION 1.43.0 + +# MediaWiki setup +RUN set -eux; \ + fetchDeps=" \ + gnupg \ + dirmngr \ + "; \ + apt-get update; \ + apt-get install -y --no-install-recommends $fetchDeps; \ + \ + curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ + curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \ + export GNUPGHOME="$(mktemp -d)"; \ + gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ + gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ + tar -x --strip-components=1 -f mediawiki.tar.gz; \ + gpgconf --kill all; \ + rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ + chown -R www-data:www-data extensions skins cache images; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ + rm -rf /var/lib/apt/lists/* + +CMD ["php-fpm"] From 89be19a3d98e698af50b6f896468334bfef94c28 Mon Sep 17 00:00:00 2001 From: Christian Heusel Date: Tue, 24 Dec 2024 00:31:54 +0100 Subject: [PATCH 4/4] Fix compose.json for MediaWiki 1.42.4 Apparently the [a patch][1] missed the 1.42.4 which causes the update.php script to fail: $ docker compose exec -it mediawiki php /var/www/html/maintenance/run.php update --quick MediaWiki 1.42.4 Updater wikimedia/parsoid: 0.19.1 installed, 0.19.0 required. Error: your composer.lock file is not up to date. Run "composer update --no-dev" to install newer dependencies Fix this by manually adding the version from the patch as this is more easily reviewable as compared to applying some random patch. The code path is included in all docker recipies but only triggers for the 1.42.4 release and can be removed with the next version. [1]: https://gerrit.wikimedia.org/r/c/mediawiki/core/+/1082844 Signed-off-by: Christian Heusel --- 1.39/apache/Dockerfile | 3 +++ 1.39/fpm-alpine/Dockerfile | 3 +++ 1.39/fpm/Dockerfile | 3 +++ 1.42/apache/Dockerfile | 3 +++ 1.42/fpm-alpine/Dockerfile | 3 +++ 1.42/fpm/Dockerfile | 3 +++ 1.43/apache/Dockerfile | 3 +++ 1.43/fpm-alpine/Dockerfile | 3 +++ 1.43/fpm/Dockerfile | 3 +++ Dockerfile-alpine.template | 3 +++ Dockerfile-debian.template | 3 +++ 11 files changed, 33 insertions(+) diff --git a/1.39/apache/Dockerfile b/1.39/apache/Dockerfile index 24e799f..33f6fb6 100644 --- a/1.39/apache/Dockerfile +++ b/1.39/apache/Dockerfile @@ -104,6 +104,9 @@ RUN set -eux; \ gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ + [ 1.39.11 = "1.42.4" ] && \ + sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ + composer.json; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ chown -R www-data:www-data extensions skins cache images; \ diff --git a/1.39/fpm-alpine/Dockerfile b/1.39/fpm-alpine/Dockerfile index 117bbb0..0c9b461 100644 --- a/1.39/fpm-alpine/Dockerfile +++ b/1.39/fpm-alpine/Dockerfile @@ -77,6 +77,9 @@ RUN set -eux; \ gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ + [ 1.39.11 = "1.42.4" ] && \ + sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ + composer.json; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ chown -R www-data:www-data extensions skins cache images; \ diff --git a/1.39/fpm/Dockerfile b/1.39/fpm/Dockerfile index 5dca631..316a53f 100644 --- a/1.39/fpm/Dockerfile +++ b/1.39/fpm/Dockerfile @@ -89,6 +89,9 @@ RUN set -eux; \ gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ + [ 1.39.11 = "1.42.4" ] && \ + sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ + composer.json; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ chown -R www-data:www-data extensions skins cache images; \ diff --git a/1.42/apache/Dockerfile b/1.42/apache/Dockerfile index 90b8b64..54e98e0 100644 --- a/1.42/apache/Dockerfile +++ b/1.42/apache/Dockerfile @@ -104,6 +104,9 @@ RUN set -eux; \ gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ + [ 1.42.4 = "1.42.4" ] && \ + sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ + composer.json; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ chown -R www-data:www-data extensions skins cache images; \ diff --git a/1.42/fpm-alpine/Dockerfile b/1.42/fpm-alpine/Dockerfile index c3f4bfd..6f6a7b3 100644 --- a/1.42/fpm-alpine/Dockerfile +++ b/1.42/fpm-alpine/Dockerfile @@ -77,6 +77,9 @@ RUN set -eux; \ gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ + [ 1.42.4 = "1.42.4" ] && \ + sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ + composer.json; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ chown -R www-data:www-data extensions skins cache images; \ diff --git a/1.42/fpm/Dockerfile b/1.42/fpm/Dockerfile index 7e64037..4ca76e9 100644 --- a/1.42/fpm/Dockerfile +++ b/1.42/fpm/Dockerfile @@ -89,6 +89,9 @@ RUN set -eux; \ gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ + [ 1.42.4 = "1.42.4" ] && \ + sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ + composer.json; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ chown -R www-data:www-data extensions skins cache images; \ diff --git a/1.43/apache/Dockerfile b/1.43/apache/Dockerfile index 1b39f92..7690a44 100644 --- a/1.43/apache/Dockerfile +++ b/1.43/apache/Dockerfile @@ -104,6 +104,9 @@ RUN set -eux; \ gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ + [ 1.43.0 = "1.42.4" ] && \ + sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ + composer.json; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ chown -R www-data:www-data extensions skins cache images; \ diff --git a/1.43/fpm-alpine/Dockerfile b/1.43/fpm-alpine/Dockerfile index 574fd31..440efdb 100644 --- a/1.43/fpm-alpine/Dockerfile +++ b/1.43/fpm-alpine/Dockerfile @@ -77,6 +77,9 @@ RUN set -eux; \ gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ + [ 1.43.0 = "1.42.4" ] && \ + sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ + composer.json; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ chown -R www-data:www-data extensions skins cache images; \ diff --git a/1.43/fpm/Dockerfile b/1.43/fpm/Dockerfile index f4792df..a4a1dc7 100644 --- a/1.43/fpm/Dockerfile +++ b/1.43/fpm/Dockerfile @@ -89,6 +89,9 @@ RUN set -eux; \ gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ + [ 1.43.0 = "1.42.4" ] && \ + sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ + composer.json; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ chown -R www-data:www-data extensions skins cache images; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 8fd7695..4d6787a 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -77,6 +77,9 @@ RUN set -eux; \ gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ + [ %%MEDIAWIKI_VERSION%% = "1.42.4" ] && \ + sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ + composer.json; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ chown -R www-data:www-data extensions skins cache images; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 47b31b6..73fb77d 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -89,6 +89,9 @@ RUN set -eux; \ gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \ gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \ tar -x --strip-components=1 -f mediawiki.tar.gz; \ + [ %%MEDIAWIKI_VERSION%% = "1.42.4" ] && \ + sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ + composer.json; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \ chown -R www-data:www-data extensions skins cache images; \