Update to 7.5.174 + mongo 5

deps/common

@@ -1 +1 @@
-Subproject commit 026777bd644b84396138f1c3e940c93d1f78b563
+Subproject commit 715fa7c8f3cbd25ec45fa4c38cb4d6d58228007b

images/mongo/Dockerfile

@@ -1,7 +1,7 @@
 FROM danielberteaud/alma:8
 MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
 
-ARG MONGO_MAJOR=4.0
+ARG MONGO_MAJOR=5.0
 
 COPY root/ /
 RUN set -eux &&\

images/unifi/Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:latest AS builder
 
-ARG UNIFI_VERSION=7.4.162
+ARG UNIFI_VERSION=7.5.174
 
 RUN set -eu &&\
     apk --no-cache add curl ca-certificates unzip &&\
@@ -9,14 +9,15 @@ RUN set -eu &&\
     unzip UniFi.unix.zip &&\
     rm -f UniFi/bin/mongod
 
-FROM [[ .docker.repo ]][[ .docker.base_images.java11.image ]]
+FROM [[ .docker.repo ]][[ .docker.base_images.java17.image ]]
 MAINTAINER [[ .docker.maintainer ]]
 
-ENV JAVA_OPTS="-Djava.awt.headless=true" \
+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" \
     TZ=[[ .locale.tz ]] \
     LANG=[[ .locale.lang ]]
 
 COPY --from=builder /tmp/UniFi /opt/unifi
+COPY root/ /
 RUN set -eu &&\
     apk --no-cache upgrade &&\
     addgroup -g 8443 unifi &&\
@@ -32,6 +33,7 @@ RUN set -eu &&\
 EXPOSE 8443 8080 8843 3778
 USER unifi
 VOLUME /data
+WORKDIR /opt/unifi
 
 CMD ["sh", "-c", "java ${JAVA_OPTS} -jar /opt/unifi/lib/ace.jar start"]
 

unifi.nomad.hcl

@@ -170,7 +170,6 @@ _EOF
       }
 
       env {
-        JAVA_OPTS = "-Dlogback.configurationFile=/local/logback.xml"
         [[ template "common/proxy_env.tpl" . ]]
         [[ template "common/env.tpl" .unifi.controller.env ]]
       }
@@ -182,13 +181,6 @@ _EOF
         destination = "secrets/system.properties"
       }
 
-      template {
-        data =<<_EOF
-[[ template "unifi/controller/logback.xml.tpl" ]]
-_EOF
-        destination = "local/logback.xml"
-      }
-
       template {
         data =<<_EOF
 [[ template "unifi/controller/init-system.properties.sh.tpl" . ]]

variables.yml

@@ -17,7 +17,7 @@ unifi:
     driver: docker
 
     # The image for the controller
-    image: danielberteaud/unifi:7.4.162-3
+    image: danielberteaud/unifi:7.5.174-6
 
     # Resource allocation for the controller
     resources:
@@ -144,7 +144,7 @@ unifi:
   mongo:
 
     # The image to use
-    image: danielberteaud/mongo:4.0-1
+    image: danielberteaud/mongo:5.0-1
 
     # The driver to use (docker or podman)
     driver: docker