# HG changeset patch # User belknapSSDT # Date 1716481099 14400 # Node ID 5b4f3de47f4e9b9d51a8a469c46a982f0d9bfdfc # Parent 425041c5f79eff8bddada3e2bfdc520d84dfc910 dearmor keys diff -r 425041c5f79e -r 5b4f3de47f4e tomcat-17/Dockerfile --- a/tomcat-17/Dockerfile Thu May 23 12:13:27 2024 -0400 +++ b/tomcat-17/Dockerfile Thu May 23 12:18:19 2024 -0400 @@ -4,10 +4,9 @@ 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 \ + && gpg --dearmor --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 --dearmor --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 \ - && gpg --dearmor /etc/apt/trusted.gpg.d/ubuntu-keyring.fixed.gpg RUN apt-get update && apt-get install -y x11-common