From fa90b04da798cf55f760f3015ae058a59c36803c Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Fri, 5 Jan 2024 15:07:43 +0100
Subject: [PATCH] Update to 8.0.26 and cleanup volumes

---
 images/unifi/Dockerfile |  2 +-
 unifi.nomad.hcl         |  9 ++-------
 variables.yml           | 21 ++++++++++++---------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/images/unifi/Dockerfile b/images/unifi/Dockerfile
index 327c290..cacefc3 100644
--- a/images/unifi/Dockerfile
+++ b/images/unifi/Dockerfile
@@ -1,6 +1,6 @@
 FROM [[ .docker.repo ]][[ .docker.base_images.java17.image ]] AS builder
 
-ARG UNIFI_VERSION=8.0.24
+ARG UNIFI_VERSION=8.0.26
 
 RUN set -euxo pipefail &&\
     apk --no-cache add curl ca-certificates unzip &&\
diff --git a/unifi.nomad.hcl b/unifi.nomad.hcl
index 3e372e3..037bab0 100644
--- a/unifi.nomad.hcl
+++ b/unifi.nomad.hcl
@@ -75,16 +75,11 @@ job [[ .unifi.instance | toJSON ]] {
       }
     }
 
-[[ template "common/volumes" .unifi.volumes ]]
+[[ template "common/volumes" .unifi.mongo.volumes ]]
 
 [[- end ]]
 
-    volume "data" {
-      type            = [[ .unifi.volumes.data.type | toJSON ]]
-      source          = [[ .unifi.volumes.data.source | toJSON ]]
-      access_mode     = "multi-node-multi-writer"
-      attachment_mode = "file-system"
-    }
+[[ template "common/volumes" .unifi.controller.volumes ]]
 
 [[ template "common/task.wait_for" $c ]]
 
diff --git a/variables.yml b/variables.yml
index 6561e3f..da2a72a 100644
--- a/variables.yml
+++ b/variables.yml
@@ -17,7 +17,7 @@ unifi:
     driver: docker
 
     # The image for the controller
-    image: danielberteaud/unifi:8.0.24-1
+    image: '[[ .docker.repo ]]unifi:8.0.26-1'
 
     # Resource allocation for the controller
     resources:
@@ -69,6 +69,12 @@ unifi:
       #middlewares:
       #  - ip-trusted@file
 
+    # Volumes
+    volumes:
+      data:
+        type: csi
+        source: unifi-data
+
   # The inform endpoint is used by the devices to contact the controller
   inform:
     # Public URL of the inform endpoint
@@ -142,11 +148,8 @@ unifi:
       cpu: 100
       memory: 256
 
-  # Volumes
-  volumes:
-    data:
-      type: csi
-      source: unifi-data
-    mongo:
-      type: csi
-      source: unifi-mongo
+    # Volumes
+    volumes:
+      mongo:
+        type: csi
+        source: unifi-mongo