Skip to content

Commit f3f10fe

Browse files
denjidenji
committed
GPG fallback
1 parent 14fc2b5 commit f3f10fe

6 files changed

Lines changed: 36 additions & 12 deletions

File tree

‎mainline/Dockerfile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ RUN set -eux \
105105
&& curl -fsSL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl.asc" -o libressl-project.asc \
106106
\
107107
# -- GPG: fetch nginx signing keys (keyserver fallback chain) --------------
108-
&& GPG_KEYS="43387825DDB1BB97EC36BA5D007C8D7C15D87369 A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5" \
108+
&& GPG_KEYS="43387825DDB1BB97EC36BA5D007C8D7C15D87369 D6786CE303D9A9022998DC6CC8464D549AF75C0A A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5" \
109109
&& GNUPGHOME="$(mktemp -d)" \
110110
&& export GNUPGHOME \
111111
&& for server in \
@@ -121,8 +121,12 @@ RUN set -eux \
121121
&& break || true; \
122122
done \
123123
\
124-
# -- GPG: per-key fallback — always import NGINX key directly -------------
124+
# -- GPG: per-key fallback — import nginx bundle + Kandaurov key directly --
125125
&& curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --import \
126+
&& curl -fsSL https://nginx.org/keys/pluknet.key | gpg --import \
127+
\
128+
# -- GPG: per-key fallback — import libressl key directly --
129+
&& curl -fsSL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl.asc | gpg --import \
126130
\
127131
# -- GPG: verify every required key is present in the keyring -------------
128132
&& for key in ${GPG_KEYS}; do \

‎mainline/Dockerfile.loongarch64‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ RUN set -eux \
105105
&& curl -fsSL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl.asc" -o libressl-project.asc \
106106
\
107107
# -- GPG: fetch nginx signing keys (keyserver fallback chain) --------------
108-
&& GPG_KEYS="43387825DDB1BB97EC36BA5D007C8D7C15D87369 A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5" \
108+
&& GPG_KEYS="43387825DDB1BB97EC36BA5D007C8D7C15D87369 D6786CE303D9A9022998DC6CC8464D549AF75C0A A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5" \
109109
&& GNUPGHOME="$(mktemp -d)" \
110110
&& export GNUPGHOME \
111111
&& for server in \
@@ -121,8 +121,12 @@ RUN set -eux \
121121
&& break || true; \
122122
done \
123123
\
124-
# -- GPG: per-key fallback — always import NGINX key directly -------------
124+
# -- GPG: per-key fallback — import nginx bundle + Kandaurov key directly --
125125
&& curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --import \
126+
&& curl -fsSL https://nginx.org/keys/pluknet.key | gpg --import \
127+
\
128+
# -- GPG: per-key fallback — import libressl key directly --
129+
&& curl -fsSL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl.asc | gpg --import \
126130
\
127131
# -- GPG: verify every required key is present in the keyring -------------
128132
&& for key in ${GPG_KEYS}; do \

‎mainline/Dockerfile.mips64le‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ RUN set -eux \
105105
&& curl -fsSL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl.asc" -o libressl-project.asc \
106106
\
107107
# -- GPG: fetch nginx signing keys (keyserver fallback chain) --------------
108-
&& GPG_KEYS="43387825DDB1BB97EC36BA5D007C8D7C15D87369 A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5" \
108+
&& GPG_KEYS="43387825DDB1BB97EC36BA5D007C8D7C15D87369 D6786CE303D9A9022998DC6CC8464D549AF75C0A A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5" \
109109
&& GNUPGHOME="$(mktemp -d)" \
110110
&& export GNUPGHOME \
111111
&& for server in \
@@ -121,8 +121,12 @@ RUN set -eux \
121121
&& break || true; \
122122
done \
123123
\
124-
# -- GPG: per-key fallback — always import NGINX key directly -------------
124+
# -- GPG: per-key fallback — import nginx bundle + Kandaurov key directly --
125125
&& curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --import \
126+
&& curl -fsSL https://nginx.org/keys/pluknet.key | gpg --import \
127+
\
128+
# -- GPG: per-key fallback — import libressl key directly --
129+
&& curl -fsSL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl.asc | gpg --import \
126130
\
127131
# -- GPG: verify every required key is present in the keyring -------------
128132
&& for key in ${GPG_KEYS}; do \

‎stable/Dockerfile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ RUN set -eux \
105105
&& curl -fsSL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl.asc" -o libressl-project.asc \
106106
\
107107
# -- GPG: fetch nginx signing keys (keyserver fallback chain) --------------
108-
&& GPG_KEYS="43387825DDB1BB97EC36BA5D007C8D7C15D87369 A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5" \
108+
&& GPG_KEYS="43387825DDB1BB97EC36BA5D007C8D7C15D87369 D6786CE303D9A9022998DC6CC8464D549AF75C0A A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5" \
109109
&& GNUPGHOME="$(mktemp -d)" \
110110
&& export GNUPGHOME \
111111
&& for server in \
@@ -121,8 +121,12 @@ RUN set -eux \
121121
&& break || true; \
122122
done \
123123
\
124-
# -- GPG: per-key fallback — always import NGINX key directly -------------
124+
# -- GPG: per-key fallback — import nginx bundle + Kandaurov key directly --
125125
&& curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --import \
126+
&& curl -fsSL https://nginx.org/keys/pluknet.key | gpg --import \
127+
\
128+
# -- GPG: per-key fallback — import libressl key directly --
129+
&& curl -fsSL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl.asc | gpg --import \
126130
\
127131
# -- GPG: verify every required key is present in the keyring -------------
128132
&& for key in ${GPG_KEYS}; do \

‎stable/Dockerfile.loongarch64‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ RUN set -eux \
105105
&& curl -fsSL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl.asc" -o libressl-project.asc \
106106
\
107107
# -- GPG: fetch nginx signing keys (keyserver fallback chain) --------------
108-
&& GPG_KEYS="43387825DDB1BB97EC36BA5D007C8D7C15D87369 A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5" \
108+
&& GPG_KEYS="43387825DDB1BB97EC36BA5D007C8D7C15D87369 D6786CE303D9A9022998DC6CC8464D549AF75C0A A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5" \
109109
&& GNUPGHOME="$(mktemp -d)" \
110110
&& export GNUPGHOME \
111111
&& for server in \
@@ -121,8 +121,12 @@ RUN set -eux \
121121
&& break || true; \
122122
done \
123123
\
124-
# -- GPG: per-key fallback — always import NGINX key directly -------------
124+
# -- GPG: per-key fallback — import nginx bundle + Kandaurov key directly --
125125
&& curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --import \
126+
&& curl -fsSL https://nginx.org/keys/pluknet.key | gpg --import \
127+
\
128+
# -- GPG: per-key fallback — import libressl key directly --
129+
&& curl -fsSL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl.asc | gpg --import \
126130
\
127131
# -- GPG: verify every required key is present in the keyring -------------
128132
&& for key in ${GPG_KEYS}; do \

‎stable/Dockerfile.mips64le‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ RUN set -eux \
105105
&& curl -fsSL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl.asc" -o libressl-project.asc \
106106
\
107107
# -- GPG: fetch nginx signing keys (keyserver fallback chain) --------------
108-
&& GPG_KEYS="43387825DDB1BB97EC36BA5D007C8D7C15D87369 A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5" \
108+
&& GPG_KEYS="43387825DDB1BB97EC36BA5D007C8D7C15D87369 D6786CE303D9A9022998DC6CC8464D549AF75C0A A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5" \
109109
&& GNUPGHOME="$(mktemp -d)" \
110110
&& export GNUPGHOME \
111111
&& for server in \
@@ -121,8 +121,12 @@ RUN set -eux \
121121
&& break || true; \
122122
done \
123123
\
124-
# -- GPG: per-key fallback — always import NGINX key directly -------------
124+
# -- GPG: per-key fallback — import nginx bundle + Kandaurov key directly --
125125
&& curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --import \
126+
&& curl -fsSL https://nginx.org/keys/pluknet.key | gpg --import \
127+
\
128+
# -- GPG: per-key fallback — import libressl key directly --
129+
&& curl -fsSL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl.asc | gpg --import \
126130
\
127131
# -- GPG: verify every required key is present in the keyring -------------
128132
&& for key in ${GPG_KEYS}; do \

0 commit comments

Comments
 (0)