From 6b48bbe954a4574174c2ab41f2ee890df1154366 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Tue, 23 Apr 2024 14:44:57 -0700
Subject: [PATCH] Updated GPG key dirs in templates missed in 23bcf128302

---
 Dockerfile-debian-otel.template | 2 +-
 Dockerfile-debian-perl.template | 2 +-
 mainline/debian-otel/Dockerfile | 2 +-
 mainline/debian-perl/Dockerfile | 2 +-
 stable/debian-otel/Dockerfile   | 2 +-
 stable/debian-perl/Dockerfile   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile-debian-otel.template b/Dockerfile-debian-otel.template
index dff7acc0..b1a8a8e2 100644
--- a/Dockerfile-debian-otel.template
+++ b/Dockerfile-debian-otel.template
@@ -3,7 +3,7 @@ FROM nginx:%%NGINX_VERSION%%
 ENV OTEL_VERSION     %%OTEL_VERSION%%
 
 RUN set -x; \
-    NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
+    NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
     dpkgArch="$(dpkg --print-architecture)" \
     && nginxPackages="%%PACKAGES%%
     " \
diff --git a/Dockerfile-debian-perl.template b/Dockerfile-debian-perl.template
index 43099656..03e801f5 100644
--- a/Dockerfile-debian-perl.template
+++ b/Dockerfile-debian-perl.template
@@ -1,7 +1,7 @@
 FROM nginx:%%NGINX_VERSION%%
 
 RUN set -x; \
-    NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
+    NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
     dpkgArch="$(dpkg --print-architecture)" \
     && nginxPackages="%%PACKAGES%%
     " \
diff --git a/mainline/debian-otel/Dockerfile b/mainline/debian-otel/Dockerfile
index 96f3a702..51f8c54e 100644
--- a/mainline/debian-otel/Dockerfile
+++ b/mainline/debian-otel/Dockerfile
@@ -8,7 +8,7 @@ FROM nginx:1.25.5
 ENV OTEL_VERSION     0.1.0
 
 RUN set -x; \
-    NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
+    NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
     dpkgArch="$(dpkg --print-architecture)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-${PKG_RELEASE} \
diff --git a/mainline/debian-perl/Dockerfile b/mainline/debian-perl/Dockerfile
index cc01d476..4bdba1e6 100644
--- a/mainline/debian-perl/Dockerfile
+++ b/mainline/debian-perl/Dockerfile
@@ -6,7 +6,7 @@
 FROM nginx:1.25.5
 
 RUN set -x; \
-    NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
+    NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
     dpkgArch="$(dpkg --print-architecture)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-${PKG_RELEASE} \
diff --git a/stable/debian-otel/Dockerfile b/stable/debian-otel/Dockerfile
index dbe9f4bb..2a2ca729 100644
--- a/stable/debian-otel/Dockerfile
+++ b/stable/debian-otel/Dockerfile
@@ -8,7 +8,7 @@ FROM nginx:1.26.0
 ENV OTEL_VERSION     0.1.0
 
 RUN set -x; \
-    NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
+    NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
     dpkgArch="$(dpkg --print-architecture)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-${PKG_RELEASE} \
diff --git a/stable/debian-perl/Dockerfile b/stable/debian-perl/Dockerfile
index 0c8edc13..ee08af92 100644
--- a/stable/debian-perl/Dockerfile
+++ b/stable/debian-perl/Dockerfile
@@ -6,7 +6,7 @@
 FROM nginx:1.26.0
 
 RUN set -x; \
-    NGINX_GPGKEY_PATH=/usr/share/keyrings/nginx-archive-keyring.gpg; \
+    NGINX_GPGKEY_PATH=/etc/apt/keyrings/nginx-archive-keyring.gpg; \
     dpkgArch="$(dpkg --print-architecture)" \
     && nginxPackages=" \
         nginx=${NGINX_VERSION}-${PKG_RELEASE} \