# HG changeset patch
# User belknapSSDT <zach.belknap@mcoecn.org>
# Date 1695841085 14400
# Node ID 15a263e509ac0d765b70f228d3a13a50e2e6f8f6
# Parent  07ba7630da444b29b917b176e455eff76e9aa89b
USASR-5154 export keys before echo

diff -r 07ba7630da44 -r 15a263e509ac tomcat-17/Dockerfile
--- a/tomcat-17/Dockerfile	Wed Sep 27 14:53:28 2023 -0400
+++ b/tomcat-17/Dockerfile	Wed Sep 27 14:58:05 2023 -0400
@@ -5,13 +5,13 @@
 RUN apt-get update && apt-get install -y gnupg && apt-get install -y apt-transport-https && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 9D6D8F6BC857C906 \
     && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys AA8E81B4331F7F50
 
+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 echo "deb http://archive.debian.org/debian/ jessie main contrib" > /etc/apt/sources.list \
     && 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 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 ttf-mscorefonts-installer \