Updated GPG key dirs in templates missed in 23bcf12

thresheek · thresheek · commit 5bf2e65ab9ea · 2024-04-23T15:15:45.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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} \
