# HG changeset patch
# User belknapSSDT <zach.belknap@mcoecn.org>
# Date 1716561431 14400
# Node ID 429ab7060bafd20bb5320715902a8d8bbd02244b
# Parent  5aed9f469cb6ec06d6888d6f219f45d9a1c09bde
use different version

diff -r 5aed9f469cb6 -r 429ab7060baf tomcat-17/Dockerfile
--- a/tomcat-17/Dockerfile	Fri May 24 10:28:21 2024 -0400
+++ b/tomcat-17/Dockerfile	Fri May 24 10:37:11 2024 -0400
@@ -1,11 +1,12 @@
-FROM tomcat:9.0.89-jdk17
+FROM tomcat:9.0.89-jdk17-temurin-jammy
 
 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 871920D1991BC93C 112695A0E562B32A AA8E81B4331F7F50 04EE7237B7D453EC 648ACFD622F3D138 0E98404D386FA1D9 EF0F382A1A7B6500 \
-    && gpg --export  871920D1991BC93C 112695A0E562B32A AA8E81B4331F7F50 04EE7237B7D453EC 648ACFD622F3D138 0E98404D386FA1D9 EF0F382A1A7B6500 | apt-key add  -
+    && 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 \
+    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 871920D1991BC93C 112695A0E562B32A AA8E81B4331F7F50 04EE7237B7D453EC 648ACFD622F3D138 0E98404D386FA1D9 EF0F382A1A7B6500
 
 RUN apt-get update && apt-get install -y x11-common