Skip to content

Commit 761fffe

Browse files
thresheekthresheek
committed
Regenerated after last commit.
1 parent 38e2690 commit 761fffe

File tree

4 files changed

+28
-12
lines changed

4 files changed

+28
-12
lines changed

‎mainline/debian-perl/Dockerfile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,19 @@ RUN set -x \
1010
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \
1111
&& \
1212
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
13+
NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
14+
export GNUPGHOME="$(mktemp -d)"; \
1315
found=''; \
1416
for server in \
1517
hkp://keyserver.ubuntu.com:80 \
1618
pgp.mit.edu \
1719
; do \
1820
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
19-
apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
21+
gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
2022
done; \
2123
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
24+
gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" ; \
25+
rm -rf "$GNUPGHOME"; \
2226
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
2327
&& dpkgArch="$(dpkg --print-architecture)" \
2428
&& nginxPackages=" \
@@ -32,13 +36,13 @@ RUN set -x \
3236
&& case "$dpkgArch" in \
3337
amd64|arm64) \
3438
# arches officialy built by upstream
35-
echo "deb https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
39+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
3640
&& apt-get update \
3741
;; \
3842
*) \
3943
# we're on an architecture upstream doesn't officially build for
4044
# let's build binaries from the published source packages
41-
echo "deb-src https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
45+
echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
4246
\
4347
# new directory for storing sources and .deb files
4448
&& tempDir="$(mktemp -d)" \

‎mainline/debian/Dockerfile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,19 @@ RUN set -x \
1919
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \
2020
&& \
2121
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
22+
NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
23+
export GNUPGHOME="$(mktemp -d)"; \
2224
found=''; \
2325
for server in \
2426
hkp://keyserver.ubuntu.com:80 \
2527
pgp.mit.edu \
2628
; do \
2729
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
28-
apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
30+
gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
2931
done; \
3032
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
33+
gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" ; \
34+
rm -rf "$GNUPGHOME"; \
3135
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
3236
&& dpkgArch="$(dpkg --print-architecture)" \
3337
&& nginxPackages=" \
@@ -40,13 +44,13 @@ RUN set -x \
4044
&& case "$dpkgArch" in \
4145
amd64|arm64) \
4246
# arches officialy built by upstream
43-
echo "deb https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
47+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
4448
&& apt-get update \
4549
;; \
4650
*) \
4751
# we're on an architecture upstream doesn't officially build for
4852
# let's build binaries from the published source packages
49-
echo "deb-src https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
53+
echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
5054
\
5155
# new directory for storing sources and .deb files
5256
&& tempDir="$(mktemp -d)" \

‎stable/debian-perl/Dockerfile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,19 @@ RUN set -x \
1010
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \
1111
&& \
1212
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
13+
NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
14+
export GNUPGHOME="$(mktemp -d)"; \
1315
found=''; \
1416
for server in \
1517
hkp://keyserver.ubuntu.com:80 \
1618
pgp.mit.edu \
1719
; do \
1820
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
19-
apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
21+
gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
2022
done; \
2123
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
24+
gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" ; \
25+
rm -rf "$GNUPGHOME"; \
2226
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
2327
&& dpkgArch="$(dpkg --print-architecture)" \
2428
&& nginxPackages=" \
@@ -32,13 +36,13 @@ RUN set -x \
3236
&& case "$dpkgArch" in \
3337
amd64|arm64) \
3438
# arches officialy built by upstream
35-
echo "deb https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
39+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
3640
&& apt-get update \
3741
;; \
3842
*) \
3943
# we're on an architecture upstream doesn't officially build for
4044
# let's build binaries from the published source packages
41-
echo "deb-src https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
45+
echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
4246
\
4347
# new directory for storing sources and .deb files
4448
&& tempDir="$(mktemp -d)" \

‎stable/debian/Dockerfile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,19 @@ RUN set -x \
1919
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \
2020
&& \
2121
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
22+
NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
23+
export GNUPGHOME="$(mktemp -d)"; \
2224
found=''; \
2325
for server in \
2426
hkp://keyserver.ubuntu.com:80 \
2527
pgp.mit.edu \
2628
; do \
2729
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
28-
apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
30+
gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
2931
done; \
3032
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
33+
gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" ; \
34+
rm -rf "$GNUPGHOME"; \
3135
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
3236
&& dpkgArch="$(dpkg --print-architecture)" \
3337
&& nginxPackages=" \
@@ -40,13 +44,13 @@ RUN set -x \
4044
&& case "$dpkgArch" in \
4145
amd64|arm64) \
4246
# arches officialy built by upstream
43-
echo "deb https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
47+
echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
4448
&& apt-get update \
4549
;; \
4650
*) \
4751
# we're on an architecture upstream doesn't officially build for
4852
# let's build binaries from the published source packages
49-
echo "deb-src https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
53+
echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
5054
\
5155
# new directory for storing sources and .deb files
5256
&& tempDir="$(mktemp -d)" \

0 commit comments

Comments
 (0)