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

Updated Jetty and JRE in Docker, fixed Alpine build

Browse Source
This commit is contained in:
Michele Adduci 2023-11-20 06:11:53 +01:00 committed by PlantUML
parent 0514103cc1
commit 74eb159a36
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.jetty
View File

@ -1,4 +1,4 @@
FROM maven:3-eclipse-temurin-11 AS builder FROM maven:3-eclipse-temurin-17 AS builder
COPY pom.xml pom.parent.xml /app/ COPY pom.xml pom.parent.xml /app/
COPY src/main /app/src/main/ COPY src/main /app/src/main/
@ -8,7 +8,7 @@ RUN mvn --batch-mode --define java.net.useSystemProxies=true package
######################################################################################## ########################################################################################
FROM jetty:11.0.15-jre11 FROM jetty:11.0.18-jre17-eclipse-temurin
# Proxy and OldProxy need empty path segments support in URIs # Proxy and OldProxy need empty path segments support in URIs
# Hence: allow AMBIGUOUS_EMPTY_SEGMENT # Hence: allow AMBIGUOUS_EMPTY_SEGMENT

9
Dockerfile.jetty-alpine
View File

@ -1,4 +1,4 @@
FROM maven:3-eclipse-temurin-11-alpine AS builder FROM maven:3-eclipse-temurin-17-alpine AS builder
COPY pom.xml pom.parent.xml /app/ COPY pom.xml pom.parent.xml /app/
COPY src/main /app/src/main/ COPY src/main /app/src/main/
@ -8,7 +8,7 @@ RUN mvn --batch-mode --define java.net.useSystemProxies=true package
######################################################################################## ########################################################################################
FROM jetty:11.0.15-jre11-alpine-eclipse-temurin FROM jetty:11.0.18-jre17-alpine-eclipse-temurin
# Proxy and OldProxy need empty path segments support in URIs # Proxy and OldProxy need empty path segments support in URIs
# Hence: allow AMBIGUOUS_EMPTY_SEGMENT # Hence: allow AMBIGUOUS_EMPTY_SEGMENT
@ -30,9 +30,10 @@ ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
RUN apk add --no-cache \ RUN apk add --no-cache \
g++ \ g++ \
jq \ jq \
libexpat \ expat-dev \
make \ make \
zlib \ zlib \
pkgconf \
&& \ && \
mkdir -p $GRAPHVIZ_BUILD_DIR && \ mkdir -p $GRAPHVIZ_BUILD_DIR && \
cd $GRAPHVIZ_BUILD_DIR && \ cd $GRAPHVIZ_BUILD_DIR && \
@ -46,7 +47,7 @@ RUN apk add --no-cache \
apk del --no-cache \ apk del --no-cache \
g++ \ g++ \
jq \ jq \
libexpat \ expat-dev \
make \ make \
zlib \ zlib \
&& \ && \

2
pom.parent.xml
View File

@ -63,7 +63,7 @@
<!-- main versions --> <!-- main versions -->
<plantuml.version>1.2023.12</plantuml.version> <plantuml.version>1.2023.12</plantuml.version>
<!-- Please keep the jetty version identical with the docker image --> <!-- Please keep the jetty version identical with the docker image -->
<jetty.version>11.0.15</jetty.version> <jetty.version>11.0.18</jetty.version>
<!-- <!--
While changing the version, please update the versions in the following files as well: While changing the version, please update the versions in the following files as well:
- src/main/webapp/components/app-head.jsp (script import) - src/main/webapp/components/app-head.jsp (script import)