Mercurial > public > ssdt-docker

changeset 557:5b4f3de47f4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dearmor keys
author belknapSSDT <zach.belknap@mcoecn.org>
date Thu, 23 May 2024 12:18:19 -0400
parents 425041c5f79e
children cf823bddf7e3
files tomcat-17/Dockerfile
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tomcat-17/Dockerfile	Thu May 23 12:13:27 2024 -0400
+++ b/tomcat-17/Dockerfile	Thu May 23 12:18:19 2024 -0400
@@ -4,10 +4,9 @@
 
 
 RUN apt-get update && apt-get install -y gnupg && apt-get install -y apt-transport-https \
-    && gpg --no-default-keyring --keyring /etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg  --export > /etc/apt/trusted.gpg.d/ubuntu-keyring.fixed.gpg \
-    && gpg --no-default-keyring --keyring /etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg  --export > /etc/apt/trusted.gpg.d/ubuntu-keyring.fixed.gpg \
+    && gpg --dearmor --no-default-keyring --keyring /etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg  --export > /etc/apt/trusted.gpg.d/ubuntu-keyring.fixed.gpg \
+    && gpg --dearmor --no-default-keyring --keyring /etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg  --export > /etc/apt/trusted.gpg.d/ubuntu-keyring.fixed.gpg \
     && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 871920D1991BC93C 112695A0E562B32A AA8E81B4331F7F50 04EE7237B7D453EC 648ACFD622F3D138 0E98404D386FA1D9 EF0F382A1A7B6500 \
-    && gpg --dearmor /etc/apt/trusted.gpg.d/ubuntu-keyring.fixed.gpg
 
 RUN apt-get update && apt-get install -y x11-common