Skip to content
Snippets Groups Projects
Commit 761fffeb authored by Konstantin Pavlov's avatar Konstantin Pavlov
Browse files

Regenerated after last commit.

parent 38e2690b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
mainline/debian-perl/Dockerfile
+ 7
− 3
View file @ 761fffeb
...@@ -10,15 +10,19 @@ RUN set -x \ ...@@ -10,15 +10,19 @@ RUN set -x \
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \ && apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \
&& \ && \
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \ NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
export GNUPGHOME="$(mktemp -d)"; \
found=''; \ found=''; \
for server in \ for server in \
hkp://keyserver.ubuntu.com:80 \ hkp://keyserver.ubuntu.com:80 \
pgp.mit.edu \ pgp.mit.edu \
; do \ ; do \
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \ echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \ gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
done; \ done; \
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \ test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" ; \
rm -rf "$GNUPGHOME"; \
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \ apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
&& dpkgArch="$(dpkg --print-architecture)" \ && dpkgArch="$(dpkg --print-architecture)" \
&& nginxPackages=" \ && nginxPackages=" \
...@@ -32,13 +36,13 @@ RUN set -x \ ...@@ -32,13 +36,13 @@ RUN set -x \
&& case "$dpkgArch" in \ && case "$dpkgArch" in \
amd64|arm64) \ amd64|arm64) \
# arches officialy built by upstream # arches officialy built by upstream
echo "deb https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \ echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
&& apt-get update \ && apt-get update \
;; \ ;; \
*) \ *) \
# we're on an architecture upstream doesn't officially build for # we're on an architecture upstream doesn't officially build for
# let's build binaries from the published source packages # let's build binaries from the published source packages
echo "deb-src https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \ echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
\ \
# new directory for storing sources and .deb files # new directory for storing sources and .deb files
&& tempDir="$(mktemp -d)" \ && tempDir="$(mktemp -d)" \
......
mainline/debian/Dockerfile
+ 7
− 3
View file @ 761fffeb
...@@ -19,15 +19,19 @@ RUN set -x \ ...@@ -19,15 +19,19 @@ RUN set -x \
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \ && apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \
&& \ && \
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \ NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
export GNUPGHOME="$(mktemp -d)"; \
found=''; \ found=''; \
for server in \ for server in \
hkp://keyserver.ubuntu.com:80 \ hkp://keyserver.ubuntu.com:80 \
pgp.mit.edu \ pgp.mit.edu \
; do \ ; do \
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \ echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \ gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
done; \ done; \
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \ test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" ; \
rm -rf "$GNUPGHOME"; \
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \ apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
&& dpkgArch="$(dpkg --print-architecture)" \ && dpkgArch="$(dpkg --print-architecture)" \
&& nginxPackages=" \ && nginxPackages=" \
...@@ -40,13 +44,13 @@ RUN set -x \ ...@@ -40,13 +44,13 @@ RUN set -x \
&& case "$dpkgArch" in \ && case "$dpkgArch" in \
amd64|arm64) \ amd64|arm64) \
# arches officialy built by upstream # arches officialy built by upstream
echo "deb https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \ echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
&& apt-get update \ && apt-get update \
;; \ ;; \
*) \ *) \
# we're on an architecture upstream doesn't officially build for # we're on an architecture upstream doesn't officially build for
# let's build binaries from the published source packages # let's build binaries from the published source packages
echo "deb-src https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \ echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
\ \
# new directory for storing sources and .deb files # new directory for storing sources and .deb files
&& tempDir="$(mktemp -d)" \ && tempDir="$(mktemp -d)" \
......
stable/debian-perl/Dockerfile
+ 7
− 3
View file @ 761fffeb
...@@ -10,15 +10,19 @@ RUN set -x \ ...@@ -10,15 +10,19 @@ RUN set -x \
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \ && apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \
&& \ && \
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \ NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
export GNUPGHOME="$(mktemp -d)"; \
found=''; \ found=''; \
for server in \ for server in \
hkp://keyserver.ubuntu.com:80 \ hkp://keyserver.ubuntu.com:80 \
pgp.mit.edu \ pgp.mit.edu \
; do \ ; do \
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \ echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \ gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
done; \ done; \
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \ test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" ; \
rm -rf "$GNUPGHOME"; \
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \ apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
&& dpkgArch="$(dpkg --print-architecture)" \ && dpkgArch="$(dpkg --print-architecture)" \
&& nginxPackages=" \ && nginxPackages=" \
...@@ -32,13 +36,13 @@ RUN set -x \ ...@@ -32,13 +36,13 @@ RUN set -x \
&& case "$dpkgArch" in \ && case "$dpkgArch" in \
amd64|arm64) \ amd64|arm64) \
# arches officialy built by upstream # arches officialy built by upstream
echo "deb https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \ echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
&& apt-get update \ && apt-get update \
;; \ ;; \
*) \ *) \
# we're on an architecture upstream doesn't officially build for # we're on an architecture upstream doesn't officially build for
# let's build binaries from the published source packages # let's build binaries from the published source packages
echo "deb-src https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \ echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
\ \
# new directory for storing sources and .deb files # new directory for storing sources and .deb files
&& tempDir="$(mktemp -d)" \ && tempDir="$(mktemp -d)" \
......
stable/debian/Dockerfile
+ 7
− 3
View file @ 761fffeb
...@@ -19,15 +19,19 @@ RUN set -x \ ...@@ -19,15 +19,19 @@ RUN set -x \
&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \ && apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \
&& \ && \
NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \ NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
export GNUPGHOME="$(mktemp -d)"; \
found=''; \ found=''; \
for server in \ for server in \
hkp://keyserver.ubuntu.com:80 \ hkp://keyserver.ubuntu.com:80 \
pgp.mit.edu \ pgp.mit.edu \
; do \ ; do \
echo "Fetching GPG key $NGINX_GPGKEY from $server"; \ echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \ gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
done; \ done; \
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \ test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" ; \
rm -rf "$GNUPGHOME"; \
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \ apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
&& dpkgArch="$(dpkg --print-architecture)" \ && dpkgArch="$(dpkg --print-architecture)" \
&& nginxPackages=" \ && nginxPackages=" \
...@@ -40,13 +44,13 @@ RUN set -x \ ...@@ -40,13 +44,13 @@ RUN set -x \
&& case "$dpkgArch" in \ && case "$dpkgArch" in \
amd64|arm64) \ amd64|arm64) \
# arches officialy built by upstream # arches officialy built by upstream
echo "deb https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \ echo "deb [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
&& apt-get update \ && apt-get update \
;; \ ;; \
*) \ *) \
# we're on an architecture upstream doesn't officially build for # we're on an architecture upstream doesn't officially build for
# let's build binaries from the published source packages # let's build binaries from the published source packages
echo "deb-src https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \ echo "deb-src [signed-by=$NGINX_GPGKEY_PATH] https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list \
\ \
# new directory for storing sources and .deb files # new directory for storing sources and .deb files
&& tempDir="$(mktemp -d)" \ && tempDir="$(mktemp -d)" \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment