Mercurial > public > ssdt-docker

changeset 564:429ab7060baf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use different version
author belknapSSDT <zach.belknap@mcoecn.org>
date Fri, 24 May 2024 10:37:11 -0400
parents 5aed9f469cb6
children b9c98eb22273
files tomcat-17/Dockerfile
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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