From 7b51474de819b38ddfeb69c4707a1390e1d5e5a1 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Mon, 14 Jul 2025 14:36:10 -0700 Subject: [PATCH 1/2] Pass GPG key ids as separate arguments when exporting. This makes sure all keys are exported to a keyring archive, as opposed to only the first key. --- Dockerfile-debian.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 9138f4c9..644e0de0 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -29,7 +29,7 @@ RUN set -x \ done; \ test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \ done; \ - gpg1 --export "$NGINX_GPGKEYS" > "$NGINX_GPGKEY_PATH" ; \ + gpg1 --export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \ rm -rf "$GNUPGHOME"; \ apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \ && dpkgArch="$(dpkg --print-architecture)" \ From 4109dc18f7c3f8f65dc1c5e9c279b47f4232ccdc Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Mon, 14 Jul 2025 14:42:25 -0700 Subject: [PATCH 2/2] Regenerated dockerfiles after the last commit. --- mainline/debian/Dockerfile | 2 +- stable/debian/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mainline/debian/Dockerfile b/mainline/debian/Dockerfile index 9e9f0ce4..84b47aef 100644 --- a/mainline/debian/Dockerfile +++ b/mainline/debian/Dockerfile @@ -34,7 +34,7 @@ RUN set -x \ done; \ test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \ done; \ - gpg1 --export "$NGINX_GPGKEYS" > "$NGINX_GPGKEY_PATH" ; \ + gpg1 --export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \ rm -rf "$GNUPGHOME"; \ apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \ && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/stable/debian/Dockerfile b/stable/debian/Dockerfile index d0b7cf62..447f10ec 100644 --- a/stable/debian/Dockerfile +++ b/stable/debian/Dockerfile @@ -34,7 +34,7 @@ RUN set -x \ done; \ test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \ done; \ - gpg1 --export "$NGINX_GPGKEYS" > "$NGINX_GPGKEY_PATH" ; \ + gpg1 --export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \ rm -rf "$GNUPGHOME"; \ apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \ && dpkgArch="$(dpkg --print-architecture)" \