Update to 22.1.18 and tomcat to 9.0.85

This commit is contained in:
Daniel Berteaud 2024-01-13 14:46:48 +01:00
parent 89655f19d1
commit f943ef6823
4 changed files with 8 additions and 8 deletions

View File

@ -56,7 +56,7 @@ job "diagrams" {
driver = "docker"
config {
image = "danielberteaud/diagrams:22.1.16-1"
image = "danielberteaud/diagrams:22.1.18-1"
pids_limit = 200
readonly_rootfs = true
volumes = [

View File

@ -1,8 +1,8 @@
FROM danielberteaud/java:17.24.1-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG TOMCAT_VERSION=9.0.84 \
DIAGRAMS_VERSION=22.1.16
ARG TOMCAT_VERSION=9.0.85 \
DIAGRAMS_VERSION=22.1.18
ENV CATALINA_HOME=/opt/tomcat \
TOMCAT_PORT=8282 \
@ -23,7 +23,7 @@ RUN set -euxo pipefail &&\
rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 apache-tomcat-${TOMCAT_VERSION}.tar.gz &&\
curl -sSLO https://github.com/jgraph/drawio/releases/download/v${DIAGRAMS_VERSION}/draw.war &&\
unzip draw.war -d ${CATALINA_HOME}/webapps/draw &&\
rm draw.war &&\
rm -f draw.war &&\
addgroup --gid 8282 diagrams &&\
adduser --system --ingroup diagrams --disabled-password --uid 8282 --home ${CATALINA_HOME} --shell /sbin/nologin diagrams

View File

@ -1,8 +1,8 @@
FROM [[ .docker.repo ]][[ .docker.base_images.java17.image ]]
MAINTAINER [[ .docker.maintainer ]]
ARG TOMCAT_VERSION=9.0.84 \
DIAGRAMS_VERSION=22.1.16
ARG TOMCAT_VERSION=9.0.85 \
DIAGRAMS_VERSION=22.1.18
ENV CATALINA_HOME=/opt/tomcat \
TOMCAT_PORT=8282 \
@ -23,7 +23,7 @@ RUN set -euxo pipefail &&\
rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 apache-tomcat-${TOMCAT_VERSION}.tar.gz &&\
curl -sSLO https://github.com/jgraph/drawio/releases/download/v${DIAGRAMS_VERSION}/draw.war &&\
unzip draw.war -d ${CATALINA_HOME}/webapps/draw &&\
rm draw.war &&\
rm -f draw.war &&\
addgroup --gid 8282 diagrams &&\
adduser --system --ingroup diagrams --disabled-password --uid 8282 --home ${CATALINA_HOME} --shell /sbin/nologin diagrams

View File

@ -2,7 +2,7 @@
instance: diagrams
diagrams:
image: '[[ .docker.repo ]]diagrams:22.1.16-1'
image: '[[ .docker.repo ]]diagrams:22.1.18-1'
env: {}
public_url: https://draw.example.org
traefik: