# HG changeset patch
# User belknapSSDT <zach.belknap@mcoecn.org>
# Date 1695840348 14400
# Node ID d79e3e7f9f073c5bcbbe1d60d334a12e1e4c9fd6
# Parent  cb31de9db8604a77e44575a951c61311ddd46c9a
USASR-5154 export keys to new format

diff -r cb31de9db860 -r d79e3e7f9f07 tomcat-17/Dockerfile
--- 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