# HG changeset patch
# User belknapSSDT <zach.belknap@mcoecn.org>
# Date 1695840481 14400
# Node ID 955953447f5c1e8ded751241f7b1b607f83998ae
# Parent  d79e3e7f9f073c5bcbbe1d60d334a12e1e4c9fd6
USASR-5154 moved installs before echos

diff -r d79e3e7f9f07 -r 955953447f5c tomcat-17/Dockerfile
--- a/tomcat-17/Dockerfile	Wed Sep 27 14:45:48 2023 -0400
+++ b/tomcat-17/Dockerfile	Wed Sep 27 14:48:01 2023 -0400
@@ -2,6 +2,9 @@
 
 MAINTAINER Marc Davis <davis@ssdt-ohio.org>
 
+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 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
@@ -10,10 +13,6 @@
     && 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
-
-
 RUN apt-get update \
     && apt-get install -y ttf-mscorefonts-installer \
     && apt-get clean \