Mercurial > public > ssdt-docker

diff tomcat-17/Dockerfile @ 445:15a263e509ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
USASR-5154 export keys before echo
author belknapSSDT <zach.belknap@mcoecn.org>
date Wed, 27 Sep 2023 14:58:05 -0400
parents 07ba7630da44
children 827ffef45d65
line wrap: on
line diff
--- a/tomcat-17/Dockerfile	Wed Sep 27 14:53:28 2023 -0400
+++ b/tomcat-17/Dockerfile	Wed Sep 27 14:58:05 2023 -0400
@@ -5,13 +5,13 @@
 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 9D6D8F6BC857C906 \
     && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys AA8E81B4331F7F50
 
+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 echo "deb http://archive.debian.org/debian/ jessie main contrib" > /etc/apt/sources.list \
     && echo "deb http://archive.debian.org/debian-security/ jessie/updates main contrib" >> /etc/apt/sources.list \
     && echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections
 
-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 update \
     && apt-get install -y ttf-mscorefonts-installer \