Compare commits

...

2 Commits

Author SHA1 Message Date
Daniel Berteaud 976ee5b8b1 Update to 8.1.113 2024-03-22 14:39:27 +01:00
Daniel Berteaud 52d2618c3e Update rendered example 2024-03-05 14:43:30 +01:00
7 changed files with 13 additions and 31 deletions

View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.2-1
FROM danielberteaud/alpine:24.3-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ENV UBNT_UPDATE_API="https://fw-update.ubnt.com/api/firmware-latest?filter=eq~~product~~unifi-firmware&filter=eq~~channel~~release" \

View File

@ -1,6 +1,6 @@
FROM danielberteaud/java:17.24.2-4 AS builder
FROM danielberteaud/java:17.24.3-4 AS builder
ARG UNIFI_VERSION=8.0.28
ARG UNIFI_VERSION=8.1.113
RUN set -euxo pipefail &&\
apk --no-cache add curl ca-certificates unzip &&\
@ -12,7 +12,7 @@ RUN set -euxo pipefail &&\
rm -f UniFi/bin/mongod &&\
chown -R root:root UniFi
FROM danielberteaud/java:17.24.2-4
FROM danielberteaud/java:17.24.3-4
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ENV JAVA_OPTS="-Djava.awt.headless=true -Dlogback.configurationFile=/opt/unifi/logback.xml --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED" \

View File

@ -1,19 +0,0 @@
#!/bin/sh
set -eu
if [ "unifi" != "unifi" ]; then
for DIR in vault consul nomad; do
if [ -d output/${DIR} ]; then
for FILE in $(find output/${DIR} -name "*unifi*.hcl" -type f); do
NEW_FILE=$(echo "${FILE}" | sed -E "s/unifi/unifi/g")
mv "${FILE}" "${NEW_FILE}"
done
fi
done
fi

View File

@ -135,7 +135,7 @@ job "unifi" {
user = 1053
config {
image = "danielberteaud/wait-for:24.2-1"
image = "danielberteaud/wait-for:24.3-1"
readonly_rootfs = true
pids_limit = 20
}
@ -254,7 +254,7 @@ _EOF
driver = "docker"
config {
image = "danielberteaud/unifi:8.0.28-1"
image = "danielberteaud/unifi:8.1.113-1"
volumes = [
"local/init-system.properties.sh:/entrypoint.d/10-init-system.properties.sh"
]
@ -293,6 +293,8 @@ _EOF
TMPDIR = "/local/tmp"
}
# Use a template block instead of env {} so we can fetch values from vault
template {
data = <<_EOT
@ -386,7 +388,7 @@ _EOF
}
config {
image = "danielberteaud/mongo:5.0.24.2-2"
image = "danielberteaud/mongo:5.0.24.3-1"
command = "mongod"
readonly_rootfs = true
pids_limit = 200

View File

@ -1,11 +1,11 @@
# Access the vault KV (v2) store
path "/kv/data/service/unifi" {
path "kv/data/service/unifi" {
capabilities = ["read"]
}
path "/kv/metadata/service/unifi/*" {
path "kv/metadata/service/unifi/*" {
capabilities = ["read", "list"]
}
path "/kv/data/service/unifi/*" {
path "kv/data/service/unifi/*" {
capabilities = ["read"]
}

View File

@ -1 +0,0 @@
[[ template "common/mv_conf.sh.tpl" dict "ctx" . "services" (dict "unifi" .instance) ]]

View File

@ -18,7 +18,7 @@ unifi:
driver: docker
# Version of the controller to deploy
version: 8.0.28
version: 8.1.113
# The image for the controller
image: '[[ .docker.repo ]]unifi:[[ .unifi.controller.version ]]-1'