From 27c6f49c515b2a520c33ba0d2f6b577f522fbb37 Mon Sep 17 00:00:00 2001
From: "LORENZO\\pacio" <paciotti@poloinformatico.it>
Date: Thu, 11 Dec 2025 16:08:19 +0100
Subject: [PATCH] ms fonts

---
 tomcat/Dockerfile | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/tomcat/Dockerfile b/tomcat/Dockerfile
index 99dc2bc..a09cf35 100644
--- a/tomcat/Dockerfile
+++ b/tomcat/Dockerfile
@@ -13,21 +13,19 @@ RUN groupadd -g ${GROUP_ID} ${GROUPNAME} && useradd --no-log-init -u ${USER_ID}
 # Check if java.security exists at the correct path and remove any disabled algorithms
 # RUN if [ -f /opt/java/openjdk/conf/security/java.security ]; then sed -i '/jdk.tls.disabledAlgorithms/d' /opt/java/openjdk/conf/security/java.security; else echo "java.security file not found"; fi
 
-# Installa tool di rete e diagnostica
-RUN apt-get update && apt-get install -y \
-    iputils-ping \
-    inetutils-telnet \
-    dnsutils \
-    net-tools \
-    curl \
-    wget \
-    traceroute \
-    tcpdump \
-    nmap \
-    iproute2 \
-    openssl \
-    ca-certificates \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
+# Networking tools + MS core fonts (Times New Roman) in one layer
+RUN set -eux; \
+    # Enable contrib/non-free (needed for ttf-mscorefonts-installer on Debian)
+    sed -ri 's/^deb (.*) main$/deb \1 main contrib non-free non-free-firmware/' /etc/apt/sources.list || true; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        iputils-ping inetutils-telnet dnsutils net-tools curl wget traceroute tcpdump nmap iproute2 \
+        openssl ca-certificates gnupg \
+        fontconfig cabextract xfonts-utils debconf; \
+    echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections; \
+    apt-get install -y --no-install-recommends ttf-mscorefonts-installer; \
+    fc-cache -fv; \
+    rm -rf /var/lib/apt/lists/*
 
 # SOLO SE RICHIESTO PER infinity dms converter
 #RUN apt-get install libreoffice