parent
23d4483b67
commit
a0539e7b09
|
@ -69,7 +69,7 @@ job "diagrams" {
|
||||||
driver = "docker"
|
driver = "docker"
|
||||||
|
|
||||||
config {
|
config {
|
||||||
image = "danielberteaud/diagrams:24.2.0-1"
|
image = "danielberteaud/diagrams:24.2.2-1"
|
||||||
pids_limit = 200
|
pids_limit = 200
|
||||||
readonly_rootfs = true
|
readonly_rootfs = true
|
||||||
volumes = [
|
volumes = [
|
||||||
|
|
|
@ -1,19 +1,21 @@
|
||||||
FROM danielberteaud/java:17.24.3-5
|
FROM danielberteaud/java:17.24.4-1
|
||||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||||
|
|
||||||
ARG TOMCAT_VERSION=10.1.19 \
|
ARG TOMCAT_VERSION=10.1.20 \
|
||||||
DIAGRAMS_VERSION=24.2.0
|
DIAGRAMS_VERSION=24.2.2
|
||||||
|
|
||||||
ENV CATALINA_HOME=/opt/tomcat \
|
ENV CATALINA_HOME=/opt/tomcat \
|
||||||
TOMCAT_PORT=8282 \
|
TOMCAT_PORT=8282 \
|
||||||
TOMCAT_ADDRESS=0.0.0.0
|
TOMCAT_ADDRESS=0.0.0.0
|
||||||
|
|
||||||
|
ADD https://dlcdn.apache.org/tomcat/tomcat-10/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz /tmp
|
||||||
|
ADD https://dlcdn.apache.org/tomcat/tomcat-10/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 /tmp
|
||||||
|
ADD https://github.com/jgraph/drawio/releases/download/v${DIAGRAMS_VERSION}/draw.war /tmp
|
||||||
RUN set -euxo pipefail &&\
|
RUN set -euxo pipefail &&\
|
||||||
cd /tmp &&\
|
cd /tmp &&\
|
||||||
apk --no-cache update &&\
|
apk --no-cache add \
|
||||||
apk --no-cache add bash &&\
|
bash \
|
||||||
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 &&\
|
sha512sum -c < apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 &&\
|
||||||
mkdir -p /opt/tomcat &&\
|
mkdir -p /opt/tomcat &&\
|
||||||
tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz --strip-components 1 --directory ${CATALINA_HOME} &&\
|
tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz --strip-components 1 --directory ${CATALINA_HOME} &&\
|
||||||
|
@ -21,11 +23,16 @@ RUN set -euxo pipefail &&\
|
||||||
find /opt/tomcat -type f -exec chmod 644 "{}" \; &&\
|
find /opt/tomcat -type f -exec chmod 644 "{}" \; &&\
|
||||||
chmod +x /opt/tomcat/bin/* &&\
|
chmod +x /opt/tomcat/bin/* &&\
|
||||||
rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 apache-tomcat-${TOMCAT_VERSION}.tar.gz &&\
|
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 &&\
|
unzip draw.war -d ${CATALINA_HOME}/webapps/draw &&\
|
||||||
rm -f draw.war &&\
|
rm -f draw.war &&\
|
||||||
addgroup --gid 8282 diagrams &&\
|
addgroup --gid 8282 diagrams &&\
|
||||||
adduser --system --ingroup diagrams --disabled-password --uid 8282 --home ${CATALINA_HOME} --shell /sbin/nologin diagrams
|
adduser --system \
|
||||||
|
--ingroup diagrams \
|
||||||
|
--disabled-password \
|
||||||
|
--uid 8282 \
|
||||||
|
--home ${CATALINA_HOME} \
|
||||||
|
--shell /sbin/nologin \
|
||||||
|
diagrams
|
||||||
|
|
||||||
COPY root/ /
|
COPY root/ /
|
||||||
|
|
||||||
|
|
|
@ -1,19 +1,21 @@
|
||||||
FROM [[ .docker.repo ]][[ .docker.base_images.java17.image ]]
|
FROM [[ .docker.repo ]][[ .docker.base_images.java17.image ]]
|
||||||
MAINTAINER [[ .docker.maintainer ]]
|
MAINTAINER [[ .docker.maintainer ]]
|
||||||
|
|
||||||
ARG TOMCAT_VERSION=10.1.19 \
|
ARG TOMCAT_VERSION=10.1.20 \
|
||||||
DIAGRAMS_VERSION=[[ .diagrams.version ]]
|
DIAGRAMS_VERSION=[[ .diagrams.version ]]
|
||||||
|
|
||||||
ENV CATALINA_HOME=/opt/tomcat \
|
ENV CATALINA_HOME=/opt/tomcat \
|
||||||
TOMCAT_PORT=8282 \
|
TOMCAT_PORT=8282 \
|
||||||
TOMCAT_ADDRESS=0.0.0.0
|
TOMCAT_ADDRESS=0.0.0.0
|
||||||
|
|
||||||
|
ADD https://dlcdn.apache.org/tomcat/tomcat-10/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz /tmp
|
||||||
|
ADD https://dlcdn.apache.org/tomcat/tomcat-10/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 /tmp
|
||||||
|
ADD https://github.com/jgraph/drawio/releases/download/v${DIAGRAMS_VERSION}/draw.war /tmp
|
||||||
RUN set -euxo pipefail &&\
|
RUN set -euxo pipefail &&\
|
||||||
cd /tmp &&\
|
cd /tmp &&\
|
||||||
apk --no-cache update &&\
|
apk --no-cache add \
|
||||||
apk --no-cache add bash &&\
|
bash \
|
||||||
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 &&\
|
sha512sum -c < apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 &&\
|
||||||
mkdir -p /opt/tomcat &&\
|
mkdir -p /opt/tomcat &&\
|
||||||
tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz --strip-components 1 --directory ${CATALINA_HOME} &&\
|
tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz --strip-components 1 --directory ${CATALINA_HOME} &&\
|
||||||
|
@ -21,11 +23,16 @@ RUN set -euxo pipefail &&\
|
||||||
find /opt/tomcat -type f -exec chmod 644 "{}" \; &&\
|
find /opt/tomcat -type f -exec chmod 644 "{}" \; &&\
|
||||||
chmod +x /opt/tomcat/bin/* &&\
|
chmod +x /opt/tomcat/bin/* &&\
|
||||||
rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512 apache-tomcat-${TOMCAT_VERSION}.tar.gz &&\
|
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 &&\
|
unzip draw.war -d ${CATALINA_HOME}/webapps/draw &&\
|
||||||
rm -f draw.war &&\
|
rm -f draw.war &&\
|
||||||
addgroup --gid 8282 diagrams &&\
|
addgroup --gid 8282 diagrams &&\
|
||||||
adduser --system --ingroup diagrams --disabled-password --uid 8282 --home ${CATALINA_HOME} --shell /sbin/nologin diagrams
|
adduser --system \
|
||||||
|
--ingroup diagrams \
|
||||||
|
--disabled-password \
|
||||||
|
--uid 8282 \
|
||||||
|
--home ${CATALINA_HOME} \
|
||||||
|
--shell /sbin/nologin \
|
||||||
|
diagrams
|
||||||
|
|
||||||
COPY root/ /
|
COPY root/ /
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
instance: diagrams
|
instance: diagrams
|
||||||
diagrams:
|
diagrams:
|
||||||
version: 24.2.0
|
version: 24.2.2
|
||||||
image: '[[ .docker.repo ]]diagrams:[[ .diagrams.version ]]-1'
|
image: '[[ .docker.repo ]]diagrams:[[ .diagrams.version ]]-1'
|
||||||
env: {}
|
env: {}
|
||||||
public_url: https://draw.example.org
|
public_url: https://draw.example.org
|
||||||
|
|
Loading…
Reference in New Issue