MALIO-DEV/PlantUmlServer
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(deps): pin graphviz version in Dockerfiles (#394)

Browse Source
This commit is contained in:
Antoine Auger
2025-10-15 16:00:01 +02:00
committed by GitHub
parent 9f16a8f9a5
commit c028584eee
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.jetty
View File

@@ -26,8 +26,8 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
/generate-jetty-start.sh /generate-jetty-start.sh
ARG GRAPHVIZ_VERSION=14.0.1
# Build Graphviz from source because there are no binary distributions for recent versions # Build Graphviz from source because there are no binary distributions for recent versions
ARG GRAPHVIZ_VERSION
ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
@@ -39,7 +39,6 @@ RUN apt-get update && \
&& \ && \
mkdir -p $GRAPHVIZ_BUILD_DIR && \ mkdir -p $GRAPHVIZ_BUILD_DIR && \
cd $GRAPHVIZ_BUILD_DIR && \ cd $GRAPHVIZ_BUILD_DIR && \
GRAPHVIZ_VERSION=${GRAPHVIZ_VERSION:-$(curl -s https://gitlab.com/api/v4/projects/4207231/releases/ | jq -r '.[] | .name' | sort -V -r | head -1)} && \
curl -o graphviz.tar.gz https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${GRAPHVIZ_VERSION}/graphviz-${GRAPHVIZ_VERSION}.tar.gz && \ 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 && \ tar -xzf graphviz.tar.gz && \
cd graphviz-$GRAPHVIZ_VERSION && \ cd graphviz-$GRAPHVIZ_VERSION && \

5
Dockerfile.jetty-alpine
View File

@@ -24,8 +24,8 @@ RUN apk add --no-cache \
&& \ && \
/generate-jetty-start.sh /generate-jetty-start.sh
#RUN apk add --no-cache graphviz ARG GRAPHVIZ_VERSION=14.0.1
ARG GRAPHVIZ_VERSION # Build Graphviz from source because there are no binary distributions for recent versions
ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
RUN apk add --no-cache \ RUN apk add --no-cache \
g++ \ g++ \
@@ -37,7 +37,6 @@ RUN apk add --no-cache \
&& \ && \
mkdir -p $GRAPHVIZ_BUILD_DIR && \ mkdir -p $GRAPHVIZ_BUILD_DIR && \
cd $GRAPHVIZ_BUILD_DIR && \ cd $GRAPHVIZ_BUILD_DIR && \
GRAPHVIZ_VERSION=${GRAPHVIZ_VERSION:-$(curl -s https://gitlab.com/api/v4/projects/4207231/releases/ | jq -r '.[] | .name' | sort -V -r | head -1)} && \
curl -o graphviz.tar.gz https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${GRAPHVIZ_VERSION}/graphviz-${GRAPHVIZ_VERSION}.tar.gz && \ 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 && \ tar -xzf graphviz.tar.gz && \
cd graphviz-$GRAPHVIZ_VERSION && \ cd graphviz-$GRAPHVIZ_VERSION && \

3
Dockerfile.tomcat
View File

@@ -18,8 +18,8 @@ RUN apt-get update && \
&& \ && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG GRAPHVIZ_VERSION=14.0.1
# Build Graphviz from source because there are no binary distributions for recent versions # Build Graphviz from source because there are no binary distributions for recent versions
ARG GRAPHVIZ_VERSION
ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
@@ -31,7 +31,6 @@ RUN apt-get update && \
&& \ && \
mkdir -p $GRAPHVIZ_BUILD_DIR && \ mkdir -p $GRAPHVIZ_BUILD_DIR && \
cd $GRAPHVIZ_BUILD_DIR && \ cd $GRAPHVIZ_BUILD_DIR && \
GRAPHVIZ_VERSION=${GRAPHVIZ_VERSION:-$(curl -s https://gitlab.com/api/v4/projects/4207231/releases/ | jq -r '.[] | .name' | sort -V -r | head -1)} && \
curl -o graphviz.tar.gz https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${GRAPHVIZ_VERSION}/graphviz-${GRAPHVIZ_VERSION}.tar.gz && \ 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 && \ tar -xzf graphviz.tar.gz && \
cd graphviz-$GRAPHVIZ_VERSION && \ cd graphviz-$GRAPHVIZ_VERSION && \