Mercurial > public > ssdt-docker
diff tomcat-17/Dockerfile @ 494:d3c2c169e8eb
USASR-5154 try adding to sources.list
| author | belknapSSDT <zach.belknap@mcoecn.org> |
|---|---|
| date | Fri, 29 Sep 2023 10:32:52 -0400 |
| parents | e29026560b41 |
| children | ee980c0dc774 |
line wrap: on
line diff
--- a/tomcat-17/Dockerfile Fri Sep 29 10:14:40 2023 -0400 +++ b/tomcat-17/Dockerfile Fri Sep 29 10:32:52 2023 -0400 @@ -2,18 +2,17 @@ MAINTAINER Marc Davis <davis@ssdt-ohio.org> -RUN cat /etc/lsb-release && 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 \ - && 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 +RUN cat /etc/lsb-release && 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 RUN apt-get update && apt-get install -y x11-common -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/ stretch main contrib" > /etc/apt/sources.list \ && echo "deb http://archive.debian.org/debian-security/ stretch/updates main contrib" >> /etc/apt/sources.list \ + && echo "deb http://deb.debian.org/debian stretch-updates main contrib" >> /etc/apt/sources.list \ && echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections