Mercurial > public > ssdt-docker

changeset 547:f346f19e322a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add exports for xml printing
author belknapSSDT <zach.belknap@mcoecn.org>
date Thu, 23 May 2024 00:00:08 -0400
parents 2bf2426777c8
children a2f2776d4628
files tomcat-17/Dockerfile
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tomcat-17/Dockerfile	Wed May 22 23:54:36 2024 -0400
+++ b/tomcat-17/Dockerfile	Thu May 23 00:00:08 2024 -0400
@@ -2,13 +2,13 @@
 
 MAINTAINER Marc Davis <davis@ssdt-ohio.org>
 
-SHELL ["cmd", "--add-exports=java.xml/com.sun.org.apache.xml.internal.serialize=ALL-UNNAMED"]
+SHELL ["cmd", "/S", "/C"]
+RUN --add-exports=java.xml/com.sun.org.apache.xml.internal.serialize=ALL-UNNAMED
 
 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
 
@@ -29,8 +29,7 @@
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 
-
-RUN ["--add-exports=java.xml/com.sun.org.apache.xml.internal.serialize=ALL-UNNAMED"]
+SHELL ["cmd", "--add-exports=java.xml/com.sun.org.apache.xml.internal.serialize=ALL-UNNAMED"]
 
 WORKDIR /usr/local/tomcat