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

Use new context support for common templates

This commit is contained in:
Daniel Berteaud 2024-01-17 16:14:15 +01:00
parent fa7d146566
commit b37be5bbe7
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/immich.nomad.hcl
View File

@ -136,7 +136,6 @@ job "immich" {
IMMICH_MEDIA_LOCATION = "/data"
}
# Use a template block instead of env {} so we can fetch values from vault
template {
data = <<_EOT
@ -202,7 +201,6 @@ _EOT
IMMICH_MEDIA_LOCATION = "/data"
}
# Use a template block instead of env {} so we can fetch values from vault
template {
data = <<_EOT

22
immich.nomad.hcl
View File

@ -12,7 +12,7 @@ job [[ .instance | toJSON ]] {
mode = "bridge"
}
[[ template "common/volumes" $c.volumes ]]
[[ template "common/volumes" $c ]]
service {
name = "[[ .instance ]][[ .consul.suffix ]]"
@ -49,9 +49,9 @@ job [[ .instance | toJSON ]] {
"[[ $s.traefik.instance ]].http.routers.[[ .instance ]]-share[[ .consul.suffix ]].rule=Host(`[[ (urlParse $c.public_url).Hostname ]]`) && PathPrefix(`[[ (urlParse $c.public_url).Path ]]/share/`)",
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]]-share[[ .consul.suffix ]].entrypoints=[[ join $c.traefik.entrypoints "," ]]",
[[- if not (regexp.Match "^/?$" (urlParse $c.public_url).Path) ]]
"[[ $s.traefik.instance ]].http.routers.[[ .instance ]]-share[[ .consul.suffix ]].middlewares=[[ .instance ]]-headers[[ .consul.suffix ]],[[ .instance ]]-prefix[[ $c.consul.suffix ]],[[ template "common/traefik_middlewares" $s.traefik ]]",
"[[ $s.traefik.instance ]].http.routers.[[ .instance ]]-share[[ .consul.suffix ]].middlewares=[[ .instance ]]-headers[[ .consul.suffix ]],[[ .instance ]]-prefix[[ $c.consul.suffix ]],[[ template "common/traefik_middlewares" $s ]]",
[[- else ]]
"[[ $s.traefik.instance ]].http.routers.[[ .instance ]]-share[[ .consul.suffix ]].middlewares=[[ .instance ]]-headers[[ .consul.suffix ]],[[ template "common/traefik_middlewares" $s.traefik ]]",
"[[ $s.traefik.instance ]].http.routers.[[ .instance ]]-share[[ .consul.suffix ]].middlewares=[[ .instance ]]-headers[[ .consul.suffix ]],[[ template "common/traefik_middlewares" $s ]]",
[[- end ]]
# Main app router
@ -59,9 +59,9 @@ 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 ]]-headers[[ .consul.suffix ]],[[ .instance ]]-prefix[[ $c.consul.suffix ]],[[ template "common/traefik_middlewares" $c.traefik ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].middlewares=[[ .instance ]]-headers[[ .consul.suffix ]],[[ .instance ]]-prefix[[ $c.consul.suffix ]],[[ template "common/traefik_middlewares" $c ]]",
[[- else ]]
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].middlewares=[[ .instance ]]-headers[[ .consul.suffix ]],[[ template "common/traefik_middlewares" $c.traefik ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].middlewares=[[ .instance ]]-headers[[ .consul.suffix ]],[[ template "common/traefik_middlewares" $c ]]",
[[- end ]]
]
}
@ -91,7 +91,7 @@ job [[ .instance | toJSON ]] {
IMMICH_MEDIA_LOCATION = "/data"
}
[[ template "common/file_env" $c.env ]]
[[ template "common/file_env" $c ]]
template {
data =<<_EOT
@ -112,7 +112,7 @@ _EOT
destination = "/data"
}
[[ template "common/resources" $c.resources ]]
[[ template "common/resources" $c ]]
}
@ -139,7 +139,7 @@ _EOT
IMMICH_MEDIA_LOCATION = "/data"
}
[[ template "common/file_env" $c.env ]]
[[ template "common/file_env" $c ]]
template {
data =<<_EOT
@ -160,7 +160,7 @@ _EOT
destination = "/data"
}
[[ template "common/resources" $c.resources ]]
[[ template "common/resources" $c ]]
}
[[ template "common/task.redis" dict "resources" .immich.redis.resources ]]
@ -176,7 +176,7 @@ _EOT
mode = "bridge"
}
[[ template "common/volumes" $c.volumes ]]
[[ template "common/volumes" $c ]]
service {
name = "[[ .instance ]]-ml[[ .consul.suffix ]]"
@ -207,7 +207,7 @@ _EOT
destination = "/cache"
}
[[ template "common/resources" $c.resources ]]
[[ template "common/resources" $c ]]
}
}
[[- end ]]