diff --git a/1.39/apache/Dockerfile b/1.39/apache/Dockerfile index 6e87535..33f6fb6 100644 --- a/1.39/apache/Dockerfile +++ b/1.39/apache/Dockerfile @@ -101,15 +101,12 @@ 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; \ + [ 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 d419fb2..0c9b461 100644 --- a/1.39/fpm-alpine/Dockerfile +++ b/1.39/fpm-alpine/Dockerfile @@ -74,15 +74,12 @@ 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; \ + [ 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 ef75eb6..316a53f 100644 --- a/1.39/fpm/Dockerfile +++ b/1.39/fpm/Dockerfile @@ -86,15 +86,12 @@ 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; \ + [ 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 d310834..54e98e0 100644 --- a/1.42/apache/Dockerfile +++ b/1.42/apache/Dockerfile @@ -101,15 +101,12 @@ 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; \ + [ 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 ceddff5..6f6a7b3 100644 --- a/1.42/fpm-alpine/Dockerfile +++ b/1.42/fpm-alpine/Dockerfile @@ -74,15 +74,12 @@ 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; \ + [ 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 42d0101..4ca76e9 100644 --- a/1.42/fpm/Dockerfile +++ b/1.42/fpm/Dockerfile @@ -86,15 +86,12 @@ 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; \ + [ 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.41/apache/Dockerfile b/1.43/apache/Dockerfile similarity index 89% rename from 1.41/apache/Dockerfile rename to 1.43/apache/Dockerfile index 3a2e70f..7690a44 100644 --- a/1.41/apache/Dockerfile +++ b/1.43/apache/Dockerfile @@ -86,8 +86,8 @@ RUN set -eux; \ chown -R www-data:www-data /var/www/data # Version -ENV MEDIAWIKI_MAJOR_VERSION 1.41 -ENV MEDIAWIKI_VERSION 1.41.5 +ENV MEDIAWIKI_MAJOR_VERSION 1.43 +ENV MEDIAWIKI_VERSION 1.43.0 # MediaWiki setup RUN set -eux; \ @@ -101,15 +101,12 @@ 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; \ + [ 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.41/fpm-alpine/Dockerfile b/1.43/fpm-alpine/Dockerfile similarity index 85% rename from 1.41/fpm-alpine/Dockerfile rename to 1.43/fpm-alpine/Dockerfile index 9e6aa7a..440efdb 100644 --- a/1.41/fpm-alpine/Dockerfile +++ b/1.43/fpm-alpine/Dockerfile @@ -61,8 +61,8 @@ RUN set -eux; \ chown -R www-data:www-data /var/www/data # Version -ENV MEDIAWIKI_MAJOR_VERSION 1.41 -ENV MEDIAWIKI_VERSION 1.41.5 +ENV MEDIAWIKI_MAJOR_VERSION 1.43 +ENV MEDIAWIKI_VERSION 1.43.0 # MediaWiki setup RUN set -eux; \ @@ -74,15 +74,12 @@ 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; \ + [ 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.41/fpm/Dockerfile b/1.43/fpm/Dockerfile similarity index 87% rename from 1.41/fpm/Dockerfile rename to 1.43/fpm/Dockerfile index 7571323..a4a1dc7 100644 --- a/1.41/fpm/Dockerfile +++ b/1.43/fpm/Dockerfile @@ -71,8 +71,8 @@ RUN set -eux; \ chown -R www-data:www-data /var/www/data # Version -ENV MEDIAWIKI_MAJOR_VERSION 1.41 -ENV MEDIAWIKI_VERSION 1.41.5 +ENV MEDIAWIKI_MAJOR_VERSION 1.43 +ENV MEDIAWIKI_VERSION 1.43.0 # MediaWiki setup RUN set -eux; \ @@ -86,15 +86,12 @@ 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; \ + [ 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 a75dc91..4d6787a 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -74,15 +74,12 @@ 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; \ + [ %%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 86cc900..73fb77d 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -86,15 +86,12 @@ 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; \ + [ %%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; \