diff tomcat-17/Dockerfile @ 607:3ec3180d23a4

merge
author Justin Kleinknecht <justin.kleinknecht@mcoecn.org>
date Tue, 01 Jul 2025 20:51:22 +0100
parents 15609ee0fe4e
children
line wrap: on
line diff
--- a/tomcat-17/Dockerfile	Tue Jul 01 20:50:56 2025 +0100
+++ b/tomcat-17/Dockerfile	Tue Jul 01 20:51:22 2025 +0100
@@ -1,12 +1,11 @@
-FROM tomcat:8.5.93-jre17-temurin-jammy
+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 \
     && 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 && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 112695A0E562B32A  \
-    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys AA8E81B4331F7F50 && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 04EE7237B7D453EC 648ACFD622F3D138 0E98404D386FA1D9 EF0F382A1A7B6500
+    && 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
 
@@ -27,6 +26,7 @@
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 
+
 WORKDIR /usr/local/tomcat
 
 COPY setenv.sh bin/