From 8805b90913494b3b586234d11da821c525de79d2 Mon Sep 17 00:00:00 2001
From: terje <terje.strand@expeto.io>
Date: Wed, 11 Nov 2020 20:34:57 -0800
Subject: [PATCH] Build and use Graphviz 2.44.1 straight from source

---
 Dockerfile.tomcat | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.tomcat b/Dockerfile.tomcat
index fbbb1f57..255c9d00 100644
--- a/Dockerfile.tomcat
+++ b/Dockerfile.tomcat
@@ -8,11 +8,26 @@ RUN mvn --batch-mode --define java.net.useSystemProxies=true package
 
 ########################################################################################
 
+FROM tomcat:9.0-jdk11-openjdk-slim as graphviz
+
+RUN apt-get update && \
+    apt-get install -y wget binutils gcc make ghostscript groff g++ fontconfig fontconfig-config fonts-dejavu-core fonts-noto-cjk file libexpat1-dev libcairo2-dev libpango1.0-dev
+
+RUN mkdir /root/build && \
+    cd /root/build && \
+    wget -O - https://www2.graphviz.org/Packages/stable/portable_source/graphviz-2.44.1.tar.gz | gzip -d | tar xvf - && \
+    cd graphviz-2.44.1 && \
+    ./configure --prefix /usr && \
+    make -j 4 && \
+    make DESTDIR=/root/install/ install-strip
+
+########################################################################################
+
 FROM tomcat:9.0-jdk11-openjdk-slim
 MAINTAINER D.Ducatel
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends graphviz fonts-noto-cjk && \
+    apt-get install -y --no-install-recommends fonts-noto-cjk libexpat1 libcairo2 libpango1.0 libpangoft2-1.0 libpangocairo-1.0 && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 ENV GRAPHVIZ_DOT=/usr/bin/dot
@@ -20,3 +35,9 @@ ENV GRAPHVIZ_DOT=/usr/bin/dot
 ARG BASE_URL=ROOT
 RUN rm -rf /usr/local/tomcat/webapps/$BASE_URL
 COPY --from=buildertomcat /app/target/plantuml.war /usr/local/tomcat/webapps/$BASE_URL.war
+
+COPY --from=graphviz /root/install/usr/bin/dot /usr/bin/
+COPY --from=graphviz /root/install/usr/lib/    /usr/lib/
+
+RUN dot -c
+