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

Update to 22.1.21 and cleanup

This commit is contained in:
Daniel Berteaud 2024-01-18 11:34:01 +01:00
parent f943ef6823
commit b30d8d6282
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
diagrams.nomad.hcl
View File

@ -1,5 +1,5 @@
[[ $c := merge .diagrams . -]]
job [[ .instance | toJSON ]] {
job "[[ .instance ]]" {
[[ template "common/job_start.tpl" $c ]]
@ -43,18 +43,18 @@ job [[ .instance | toJSON ]] {
[[- if not (regexp.Match "^/?$" (urlParse $c.public_url).Path) ]] && PathPrefix(`[[ (urlParse $c.public_url).Path ]]`)[[ end ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].entrypoints=[[ join $c.traefik.entrypoints "," ]]",
[[- if not (regexp.Match "^/?$" (urlParse $c.public_url).Path) ]]
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].middlewares=[[ .instance ]]-prefix[[ $c.consul.suffix ]],[[ .instance ]]-headers[[ .consul.suffix ]],[[ template "common/traefik_middlewares.tpl" $c.traefik ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].middlewares=[[ .instance ]]-prefix[[ $c.consul.suffix ]],[[ .instance ]]-headers[[ .consul.suffix ]],[[ template "common/traefik_middlewares.tpl" $c ]]",
[[- else ]]
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].middlewares=[[ .instance ]]-headers[[ .consul.suffix ]],[[ template "common/traefik_middlewares.tpl" $c.traefik ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].middlewares=[[ .instance ]]-headers[[ .consul.suffix ]],[[ template "common/traefik_middlewares.tpl" $c ]]",
[[- end ]]
]
}
task "diagrams" {
driver = [[ $c.nomad.driver | toJSON ]]
driver = "[[ $c.nomad.driver ]]"
config {
image = [[ $c.image | toJSON ]]
image = "[[ $c.image ]]"
pids_limit = 200
readonly_rootfs = true
volumes = [
@ -82,8 +82,8 @@ _EOT
destination = "local/PostConfig.js"
}
[[ template "common/file_env.tpl" $c.env ]]
[[ template "common/resources.tpl" $c.resources ]]
[[ template "common/file_env.tpl" $c ]]
[[ template "common/resources.tpl" $c ]]
}
}
}

3
example/diagrams.nomad.hcl
View File

@ -56,7 +56,7 @@ job "diagrams" {
driver = "docker"
config {
image = "danielberteaud/diagrams:22.1.18-1"
image = "danielberteaud/diagrams:22.1.21-1"
pids_limit = 200
readonly_rootfs = true
volumes = [
@ -102,7 +102,6 @@ _EOT
destination = "local/PostConfig.js"
}
# Use a template block instead of env {} so we can fetch values from vault
template {
data = <<_EOT

4
example/images/diagrams/Dockerfile
View File

@ -1,8 +1,8 @@
FROM danielberteaud/java:17.24.1-1
FROM danielberteaud/java:17.24.1-2
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG TOMCAT_VERSION=9.0.85 \
DIAGRAMS_VERSION=22.1.18
DIAGRAMS_VERSION=22.1.21
ENV CATALINA_HOME=/opt/tomcat \
TOMCAT_PORT=8282 \

2
images/diagrams/Dockerfile
View File

@ -2,7 +2,7 @@ FROM [[ .docker.repo ]][[ .docker.base_images.java17.image ]]
MAINTAINER [[ .docker.maintainer ]]
ARG TOMCAT_VERSION=9.0.85 \
DIAGRAMS_VERSION=22.1.18
DIAGRAMS_VERSION=22.1.21
ENV CATALINA_HOME=/opt/tomcat \
TOMCAT_PORT=8282 \

2
variables.yml
View File

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