Mercurial > public > ssdt-docker

changeset 442:d79e3e7f9f07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
USASR-5154 export keys to new format
author belknapSSDT <zach.belknap@mcoecn.org>
date Wed, 27 Sep 2023 14:45:48 -0400
parents cb31de9db860
children 955953447f5c
files tomcat-17/Dockerfile
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tomcat-17/Dockerfile	Wed Sep 27 14:09:58 2023 -0400
+++ b/tomcat-17/Dockerfile	Wed Sep 27 14:45:48 2023 -0400
@@ -6,7 +6,11 @@
     && echo "deb http://archive.debian.org/debian-security/ jessie/updates main contrib" >> /etc/apt/sources.list \
     && echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections
 
-RUN apt-get update && apt-get install -y gnupg && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 9D6D8F6BC857C906 \
+RUN 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
+
+
+RUN && apt-get update && apt-get install -y gnupg && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 9D6D8F6BC857C906 \
     && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys AA8E81B4331F7F50