nomad
/
diagrams
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 24.0.0 and tomcat to 10.1.19

This commit is contained in:
Daniel Berteaud 2024-03-01 10:31:18 +01:00
parent 9d14e1d501
commit 9fa144e1b1
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/diagrams.nomad.hcl
View File

@ -67,7 +67,7 @@ job "diagrams" {
driver = "docker"
config {
image = "danielberteaud/diagrams:23.1.6-2"
image = "danielberteaud/diagrams:24.0.0-1"
pids_limit = 200
readonly_rootfs = true
volumes = [

8
example/images/diagrams/Dockerfile
View File

@ -1,8 +1,8 @@
FROM danielberteaud/java:17.24.2-4
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG TOMCAT_VERSION=9.0.86 \
DIAGRAMS_VERSION=23.1.6
ARG TOMCAT_VERSION=10.1.19 \
DIAGRAMS_VERSION=24.0.0
ENV CATALINA_HOME=/opt/tomcat \
TOMCAT_PORT=8282 \
@ -12,8 +12,8 @@ RUN set -euxo pipefail &&\
cd /tmp &&\
apk --no-cache update &&\
apk --no-cache add bash &&\
curl -sSLO https://dlcdn.apache.org/tomcat/tomcat-9/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz &&\
curl -sSLO https://dlcdn.apache.org/tomcat/tomcat-9/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 &&\
curl -sSLO https://dlcdn.apache.org/tomcat/tomcat-10/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz &&\
curl -sSLO https://dlcdn.apache.org/tomcat/tomcat-10/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 &&\
sha512sum -c < apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 &&\
mkdir -p /opt/tomcat &&\
tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz --strip-components 1 --directory ${CATALINA_HOME} &&\

6
images/diagrams/Dockerfile
View File

@ -1,7 +1,7 @@
FROM [[ .docker.repo ]][[ .docker.base_images.java17.image ]]
MAINTAINER [[ .docker.maintainer ]]
ARG TOMCAT_VERSION=9.0.86 \
ARG TOMCAT_VERSION=10.1.19 \
DIAGRAMS_VERSION=[[ .diagrams.version ]]
ENV CATALINA_HOME=/opt/tomcat \
@ -12,8 +12,8 @@ RUN set -euxo pipefail &&\
cd /tmp &&\
apk --no-cache update &&\
apk --no-cache add bash &&\
curl -sSLO https://dlcdn.apache.org/tomcat/tomcat-9/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz &&\
curl -sSLO https://dlcdn.apache.org/tomcat/tomcat-9/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 &&\
curl -sSLO https://dlcdn.apache.org/tomcat/tomcat-10/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz &&\
curl -sSLO https://dlcdn.apache.org/tomcat/tomcat-10/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 &&\
sha512sum -c < apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 &&\
mkdir -p /opt/tomcat &&\
tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz --strip-components 1 --directory ${CATALINA_HOME} &&\

4
variables.yml
View File

@ -2,8 +2,8 @@
instance: diagrams
diagrams:
version: 23.1.6
image: '[[ .docker.repo ]]diagrams:[[ .diagrams.version ]]-2'
version: 24.0.0
image: '[[ .docker.repo ]]diagrams:[[ .diagrams.version ]]-1'
env: {}
public_url: https://draw.example.org
traefik: