Update to 8.0.24

This commit is contained in:
Daniel Berteaud 2023-12-15 15:26:58 +01:00
parent 8543e14136
commit 2d45b27069
3 changed files with 14 additions and 19 deletions

View File

@ -1,6 +1,6 @@
FROM [[ .docker.repo ]][[ .docker.base_images.java17.image ]] AS builder
ARG UNIFI_VERSION=8.0.7
ARG UNIFI_VERSION=8.0.24
RUN set -euxo pipefail &&\
apk --no-cache add curl ca-certificates unzip &&\

View File

@ -1,6 +1,6 @@
job [[ .unifi.instance | toJSON ]] {
[[- template "common/job_start.tpl" . ]]
[[- template "common/job_start" . ]]
group "unifi" {
@ -63,7 +63,7 @@ job [[ .unifi.instance | toJSON ]] {
check {
type = "script"
command = "sh"
args = ["-c", "mongo --eval 'db.runCommand(\"ping\").ok'"]
args = ["-c", "mongo --quiet --eval 'db.runCommand(\"ping\").ok'"]
interval = "30s"
timeout = "5s"
task = "mongo"
@ -75,12 +75,7 @@ job [[ .unifi.instance | toJSON ]] {
}
}
volume "mongo" {
type = [[ .unifi.volumes.mongo.type | toJSON ]]
source = [[ .unifi.volumes.mongo.source | toJSON ]]
access_mode = "single-node-writer"
attachment_mode = "file-system"
}
[[ template "common/volumes" .unifi.volumes ]]
[[- end ]]
@ -91,7 +86,7 @@ job [[ .unifi.instance | toJSON ]] {
attachment_mode = "file-system"
}
[[ template "common/task.wait_for.tpl" $c ]]
[[ template "common/task.wait_for" $c ]]
task "nginx" {
driver = [[ .nomad.driver | toJSON ]]
@ -114,7 +109,7 @@ _EOF
destination = "local/nginx.conf"
}
[[ template "common/resources.tpl" .unifi.nginx.resources ]]
[[ template "common/resources" .unifi.nginx.resources ]]
}
task "firmware-downloader" {
@ -131,8 +126,8 @@ _EOF
}
env {
[[ template "common/env.tpl" merge .unifi.fw_dl.env .env ]]
[[ template "common/proxy_env.tpl" . ]]
[[ template "common/env" merge .unifi.fw_dl.env .env ]]
[[ template "common/proxy_env" . ]]
}
volume_mount {
@ -140,7 +135,7 @@ _EOF
destination = "/data"
}
[[ template "common/resources.tpl" .unifi.fw_dl.resources ]]
[[ template "common/resources" .unifi.fw_dl.resources ]]
}
task "controller" {
@ -167,8 +162,8 @@ _EOF
}
env {
[[ template "common/proxy_env.tpl" . ]]
[[ template "common/env.tpl" $c.env ]]
[[ template "common/proxy_env" . ]]
[[ template "common/env" $c.env ]]
}
template {
@ -191,7 +186,7 @@ _EOF
destination = "/data"
}
[[ template "common/resources.tpl" .unifi.controller.resources ]]
[[ template "common/resources" .unifi.controller.resources ]]
}
@ -226,7 +221,7 @@ _EOF
destination = "/data/db"
}
[[ template "common/resources.tpl" .unifi.mongo.resources ]]
[[ template "common/resources" .unifi.mongo.resources ]]
}
}

View File

@ -17,7 +17,7 @@ unifi:
driver: docker
# The image for the controller
image: danielberteaud/unifi:8.0.7-1
image: danielberteaud/unifi:8.0.24-1
# Resource allocation for the controller
resources: