From 89fa855e0f63f584ea1651f8e3ace28133df3e50 Mon Sep 17 00:00:00 2001 From: Christian Heusel Date: Mon, 23 Dec 2024 21:57:50 +0100 Subject: [PATCH] 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; \