Upgrade unifi-video to 3.10.5

3 files changed, 6 insertions, 6 deletions

diff --git a/unifi-video/Dockerfile b/unifi-video/Dockerfile
index a2481c0..ae584b0 100644
--- a/unifi-video/Dockerfile
+++ b/unifi-video/Dockerfile
@@ -1,4 +1,4 @@
-FROM frolvlad/alpine-oraclejdk8-temporary:slim
+FROM frolvlad/alpine-java:jre8-slim
 LABEL maintainer="Mike Crute <mike@crute.us>"
 
 ARG dl_url
diff --git a/unifi-video/Makefile b/unifi-video/Makefile
index d2b9fea..0772459 100644
--- a/unifi-video/Makefile
+++ b/unifi-video/Makefile
@@ -1,6 +1,6 @@
-VERSION=3.10.1
+VERSION=3.10.5
 IMAGE=docker.crute.me/unifi-video
-DL_URL="https://dl.ubnt.com/firmwares/unifi-video/v3.10.1/unifi-video.Ubuntu16.04_amd64.v3.10.1.deb"
+DL_URL="https://dl.ubnt.com/firmwares/ufv/v$(VERSION)/unifi-video.Ubuntu16.04_amd64.v$(VERSION).deb"
 
 all:
         docker build \
diff --git a/unifi-video/entrypoint.sh b/unifi-video/entrypoint.sh
index ceb4dba..3fceeb4 100755
--- a/unifi-video/entrypoint.sh
+++ b/unifi-video/entrypoint.sh
@@ -10,8 +10,8 @@ DATA_DIR="${BASEDIR}/data"
 UNIFI_UID=${UNIFI_UID:-$(stat -L -c "%u" $DATA_DIR)}
 UNIFI_GID=${UNIFI_GID:-$(stat -L -c "%u" $DATA_DIR)}
 
-if [ "$UNIFI_GID" = 0 -o "$UNIFI_GID" = 0 ]; then
-    echo "Set UNIFI_GID and UNIFI_GID in environment"
+if [ "$UNIFI_UID" = 0 -o "$UNIFI_GID" = 0 ]; then
+    echo "Set UNIFI_UID and UNIFI_GID in environment"
     exit 1
 else
     echo "Unifi UID/GID: $UNIFI_UID $UNIFI_GID"
@@ -83,7 +83,7 @@ else
     # Replace the current process with a scoped-down controller. The java app
     # is designed to do its own job control but it has to run with an init
     # system or it doesn't get the signals from docker.
-    exec /usr/bin/dumb-init -c /sbin/su-exec ${USERNAME} /usr/lib/jvm/default-jvm/bin/java \
+    exec /usr/bin/dumb-init -c /sbin/su-exec ${USERNAME} /usr/lib/jvm/default-jvm/jre/bin/java \
         -cp ${BASEDIR}/lib/airvision.jar \
         -Dlog4j.configurationFile=${BASEDIR}/log4j2.json \
         ${TMPFS_ARG} \