unifi: update to 7.2.91

3 files changed, 51 insertions, 2 deletions

diff --git a/unifi/Makefile b/unifi/Makefile
index 67d3763..83e2fc9 100644
--- a/unifi/Makefile
+++ b/unifi/Makefile
@@ -1,9 +1,9 @@
-VERSION=5.14.23
+VERSION=7.2.91-85c367a4aa
 IMAGE=docker.crute.me/unifi:$(VERSION)
 LATEST=$(subst :$(VERSION),,$(IMAGE)):latest
 
 DEB_LOCATION="https://dl.ui.com/unifi/$(VERSION)/unifi_sysvinit_all.deb"
-CHECKSUM_LINE="fb12d448828656523978be9f594f2ce3fb35d524bc80d2c150e58f2a7d0159a9 *unifi_sysvinit_all.deb"
+CHECKSUM_LINE="d33e7b5a838a4c301ca545910e7119ba62bda80202259655191ced1e482cecde *unifi_sysvinit_all.deb"
 
 all:
         docker pull alpine:latest
@@ -30,5 +30,7 @@ run:
 
 publish:
         docker push $(IMAGE)
+
+publish-prod:
         docker tag $(IMAGE) $(LATEST)
         docker push $(LATEST)
diff --git a/unifi/Makefile5 b/unifi/Makefile5
new file mode 100644
index 0000000..7c2c212
--- /dev/null
+++ b/unifi/Makefile5
@@ -0,0 +1,36 @@
+VERSION=5.14.23
+IMAGE=docker.crute.me/unifi:$(VERSION)
+LATEST=$(subst :$(VERSION),,$(IMAGE)):latest
+
+DEB_LOCATION="https://dl.ui.com/unifi/$(VERSION)/unifi_sysvinit_all.deb"
+CHECKSUM_LINE="fb12d448828656523978be9f594f2ce3fb35d524bc80d2c150e58f2a7d0159a9 *unifi_sysvinit_all.deb"
+
+all:
+        docker pull alpine:latest
+        docker build \
+                --no-cache \
+                --build-arg=deb_location=$(DEB_LOCATION) \
+                --build-arg=checksum_line=$(CHECKSUM_LINE) \
+                -t $(IMAGE) .
+
+all-no-cache:
+        docker build \
+                --no-cache \
+                --build-arg=deb_location=$(DEB_LOCATION) \
+                --build-arg=checksum_line=$(CHECKSUM_LINE) \
+                -t $(IMAGE) .
+
+run:
+        docker run -d \
+                -e UNIFI_UID=1001 \
+                -e UNIFI_GID=1001 \
+                -p 8080:8080 \
+                -p 8443:8443 \
+                $(IMAGE)
+
+publish:
+        docker push $(IMAGE)
+
+publish-prod:
+        docker tag $(IMAGE) $(LATEST)
+        docker push $(LATEST)
diff --git a/unifi/entrypoint.sh b/unifi/entrypoint.sh
index f431c4f..506c20f 100755
--- a/unifi/entrypoint.sh
+++ b/unifi/entrypoint.sh
@@ -44,6 +44,16 @@ if [ -n "$MONGO_URL" ]; then
     echo "db.mongo.uri=${MONGO_URL}" >> /var/lib/unifi/system.properties
     echo "statdb.mongo.uri=${MONGO_STATS_URL}" >> /var/lib/unifi/system.properties
     echo "unifi.db.name=${MONGO_DB_NAME:-ace}" >> /var/lib/unifi/system.properties
+    echo "statdb.db.name=${MONGO_STATS_DB_NAME:-ace_stat}" >> /var/lib/unifi/system.properties
+fi
+
+# If this is set that the controller will start with no settings and will run
+# the setup.
+#
+# WARNING! If this is set on a live database then the controller will delete
+# all data and start fresh.
+if [ -z "$START_DEFAULT" ]; then
+        echo "is_default=false" >> /var/lib/unifi/system.properties
 fi
 
 # Allow running a shell in the container
@@ -60,6 +70,7 @@ else
     exec /usr/bin/dumb-init -c /sbin/su-exec ${USERNAME} /usr/lib/jvm/default-jvm/bin/java \
         -cp ${BASEDIR}/lib/ace.jar \
         -Dlog4j.configuration=file:${BASEDIR}/log4j.properties \
+        -Dlog4j2.formatMsgNoLookups=true \
         -Dunifi.datadir=${BASEDIR}/data \
         -Dunifi.logdir=${BASEDIR}/logs \
         -Dunifi.rundir=${BASEDIR}/run \