From 976ee5b8b13323980250df4bb3478605ba8968ca Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Fri, 22 Mar 2024 14:39:27 +0100
Subject: [PATCH] Update to 8.1.113

---
 example/images/unifi/Dockerfile |  6 +++---
 example/prep.d/mv_conf.sh       | 19 -------------------
 example/unifi.nomad.hcl         |  4 +++-
 prep.d/mv_conf.sh               |  1 -
 variables.yml                   |  2 +-
 5 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100755 example/prep.d/mv_conf.sh
 delete mode 100755 prep.d/mv_conf.sh

diff --git a/example/images/unifi/Dockerfile b/example/images/unifi/Dockerfile
index b98fa51..88289c6 100644
--- a/example/images/unifi/Dockerfile
+++ b/example/images/unifi/Dockerfile
@@ -1,6 +1,6 @@
-FROM danielberteaud/java:17.24.3-1 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.3-1
+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" \
diff --git a/example/prep.d/mv_conf.sh b/example/prep.d/mv_conf.sh
deleted file mode 100755
index 8b40cc9..0000000
--- a/example/prep.d/mv_conf.sh
+++ /dev/null
@@ -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
-
-
-
diff --git a/example/unifi.nomad.hcl b/example/unifi.nomad.hcl
index 1d7dd01..a6c1047 100644
--- a/example/unifi.nomad.hcl
+++ b/example/unifi.nomad.hcl
@@ -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
diff --git a/prep.d/mv_conf.sh b/prep.d/mv_conf.sh
deleted file mode 100755
index 7ef4362..0000000
--- a/prep.d/mv_conf.sh
+++ /dev/null
@@ -1 +0,0 @@
-[[ template "common/mv_conf.sh.tpl" dict "ctx" . "services" (dict "unifi" .instance) ]]
diff --git a/variables.yml b/variables.yml
index 190eb16..a1b94ac 100644
--- a/variables.yml
+++ b/variables.yml
@@ -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'