# HG changeset patch
# User belknapSSDT <zach.belknap@mcoecn.org>
# Date 1695850141 14400
# Node ID 120cd3f26f1460620f6062221951097ae0ad28ad
# Parent  af1111121acdec88826cf1c7c4625404eb8b9d83
USASR-5154 revert

diff -r af1111121acd -r 120cd3f26f14 tomcat-17/Dockerfile
--- a/tomcat-17/Dockerfile	Wed Sep 27 17:24:32 2023 -0400
+++ b/tomcat-17/Dockerfile	Wed Sep 27 17:29:01 2023 -0400
@@ -2,18 +2,17 @@
 
 MAINTAINER Marc Davis <davis@ssdt-ohio.org>
 
-RUN apt-get install -y gnupg && apt-get install -y apt-transport-https && apt-get install debian-archive-keyring && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 9D6D8F6BC857C906 \
+RUN apt-get update && apt-get install -y gnupg && apt-get install -y apt-transport-https && apt-get install debian-archive-keyring && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 9D6D8F6BC857C906 \
     && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys AA8E81B4331F7F50 && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 04EE7237B7D453EC \
     && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 648ACFD622F3D138 && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0E98404D386FA1D9 \
-    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EF0F382A1A7B6500 && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 871920D1991BC93C \
-    && apt-get update
+    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EF0F382A1A7B6500 && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 871920D1991BC93C
 
 RUN apt-key list
 
 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 install debian-archive-keyring && apt-get install x11-common && apt-key update
+RUN apt-get install debian-archive-keyring && apt-key update
 
 RUN echo "deb http://archive.debian.org/debian/ stretch main contrib" > /etc/apt/sources.list \
     && echo "deb http://archive.debian.org/debian-security/ stretch/updates main contrib" >> /etc/apt/sources.list \