octoleo/plantuml-server
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml-server.git synced 2024-12-22 16:58:54 +00:00
Code Issues Releases Wiki Activity

fix: use up-to-date graphviz version in tomcat image

Browse Source
This commit is contained in:
Florian Greinacher 2023-03-29 16:02:48 +02:00 committed by PlantUML
parent df081c20a4
commit 8a9825395a
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.jetty
View File

@ -24,6 +24,7 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
/generate-jetty-start.sh /generate-jetty-start.sh
# Build Graphviz from source because there are no binary distributions for recent versions
ARG GRAPHVIZ_VERSION=7.1.0 ARG GRAPHVIZ_VERSION=7.1.0
ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
RUN apt-get update && \ RUN apt-get update && \
@ -43,8 +44,6 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
rm -rf $GRAPHVIZ_BUILD_DIR rm -rf $GRAPHVIZ_BUILD_DIR
RUN dot -V
COPY docker-entrypoint.jetty.sh /entrypoint.sh COPY docker-entrypoint.jetty.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh

22
Dockerfile.tomcat
View File

@ -13,10 +13,30 @@ FROM tomcat:10-jdk11-openjdk-slim
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
fonts-noto-cjk \ fonts-noto-cjk \
graphviz \ libgd3 \
&& \ && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Build Graphviz from source because there are no binary distributions for recent versions
ARG GRAPHVIZ_VERSION=7.1.0
ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
RUN apt-get update && \
apt-get install -y --no-install-recommends \
curl \
build-essential \
&& \
mkdir -p $GRAPHVIZ_BUILD_DIR && \
cd $GRAPHVIZ_BUILD_DIR && \
curl -o graphviz.tar.gz https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${GRAPHVIZ_VERSION}/graphviz-${GRAPHVIZ_VERSION}.tar.gz && \
tar -xzf graphviz.tar.gz && \
cd graphviz-$GRAPHVIZ_VERSION && \
./configure && \
make && \
make install && \
apt-get remove -y curl build-essential && \
rm -rf /var/lib/apt/lists/* && \
rm -rf $GRAPHVIZ_BUILD_DIR
COPY docker-entrypoint.tomcat.sh /entrypoint.sh COPY docker-entrypoint.tomcat.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh