From 6ddfe17855c9e0b834480fc8333020fcee017bd2 Mon Sep 17 00:00:00 2001
From: redbeardymcgee <redbeardymcgee@gmail.com>
Date: Wed, 27 Nov 2024 22:22:29 -0600
Subject: [PATCH] update to named volumes with all containers

---
 quadlets/actual/actual.container   | 4 +---
 quadlets/actual/data.volume        | 2 ++
 quadlets/caddy/caddy.container     | 4 ++--
 quadlets/caddy/config.volume       | 2 ++
 quadlets/caddy/data.volume         | 2 ++
 quadlets/glances/glances.container | 3 +++
 quadlets/gluetun/gluetun.container | 4 +---
 quadlets/homarr/configs.volume     | 3 +++
 quadlets/homarr/data.volume        | 3 +++
 quadlets/homarr/homarr.container   | 7 ++-----
 quadlets/kibitzr/kibitzr.container | 2 +-
 quadlets/kibitzr/root.volume       | 3 +++
 quadlets/template.volume           | 3 +++
 13 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 quadlets/actual/data.volume
 create mode 100644 quadlets/caddy/config.volume
 create mode 100644 quadlets/caddy/data.volume
 create mode 100644 quadlets/homarr/configs.volume
 create mode 100644 quadlets/homarr/data.volume
 create mode 100644 quadlets/kibitzr/root.volume
 create mode 100644 quadlets/template.volume

diff --git a/quadlets/actual/actual.container b/quadlets/actual/actual.container
index 2cf943a..863f45b 100644
--- a/quadlets/actual/actual.container
+++ b/quadlets/actual/actual.container
@@ -14,9 +14,7 @@ Image=docker.io/actualbudget/actual-server:latest
 ContainerName=actual
 HostName=actual
 
-Network=
-
-Volume=/volumes/actual/data:/data
+Volume=actual-data:/data
 
 #Environment=ACTUAL_HTTPS_KEY=
 #Environment=ACTUAL_HTTPS_CERT=
diff --git a/quadlets/actual/data.volume b/quadlets/actual/data.volume
new file mode 100644
index 0000000..d0cfce8
--- /dev/null
+++ b/quadlets/actual/data.volume
@@ -0,0 +1,2 @@
+[Volume]
+VolumeName=actual-data
diff --git a/quadlets/caddy/caddy.container b/quadlets/caddy/caddy.container
index 669d170..b46d3e5 100644
--- a/quadlets/caddy/caddy.container
+++ b/quadlets/caddy/caddy.container
@@ -17,8 +17,8 @@ PublishPort=80:80
 PublishPort=443:443
 PublishPort=443:443/udp
 
-Volume=/volumes/caddy/config:/config
-Volume=/volumes/caddy/data:/data
+Volume=caddy-config:/config
+Volume=caddy-data:/data
 
 Volume=./Caddyfile:/etc/caddy/Caddyfile
 
diff --git a/quadlets/caddy/config.volume b/quadlets/caddy/config.volume
new file mode 100644
index 0000000..f395d99
--- /dev/null
+++ b/quadlets/caddy/config.volume
@@ -0,0 +1,2 @@
+[Volume]
+VolumeName=caddy-config
diff --git a/quadlets/caddy/data.volume b/quadlets/caddy/data.volume
new file mode 100644
index 0000000..2535edc
--- /dev/null
+++ b/quadlets/caddy/data.volume
@@ -0,0 +1,2 @@
+[Volume]
+VolumeName=caddy-data
diff --git a/quadlets/glances/glances.container b/quadlets/glances/glances.container
index c6cc143..058cf91 100644
--- a/quadlets/glances/glances.container
+++ b/quadlets/glances/glances.container
@@ -17,3 +17,6 @@ AutoUpdate=registry
 Volume=%t/podman/podman.sock:/run/user/1000/podman/podman.sock:ro
 Volume=/etc/os-release:/etc/os-release:ro
 Volume=./glances.conf:/glances/conf/glances.conf
+
+Environment=GLANCES_OPT="-C /glances/conf/glances.conf -w"
+
diff --git a/quadlets/gluetun/gluetun.container b/quadlets/gluetun/gluetun.container
index d894958..e6ef28b 100644
--- a/quadlets/gluetun/gluetun.container
+++ b/quadlets/gluetun/gluetun.container
@@ -18,9 +18,7 @@ AutoUpdate=registry
 AddCapability=NET_ADMIN
 AddDevice=/dev/net/tun:/dev/net/tun
 
-Network=
-
-Volume=/volumes/books/gluetun/auth/config.toml:/gluetun/auth/config.toml
+Volume=./config.toml:/gluetun/auth/config.toml
 
 Environment=TZ=$timezone
 Environment=UPDATER_PERIOD=24h
diff --git a/quadlets/homarr/configs.volume b/quadlets/homarr/configs.volume
new file mode 100644
index 0000000..75eb2e1
--- /dev/null
+++ b/quadlets/homarr/configs.volume
@@ -0,0 +1,3 @@
+[Volume]
+VolumeName=homarr-configs
+
diff --git a/quadlets/homarr/data.volume b/quadlets/homarr/data.volume
new file mode 100644
index 0000000..43cafa2
--- /dev/null
+++ b/quadlets/homarr/data.volume
@@ -0,0 +1,3 @@
+[Volume]
+VolumeName=homarr-data
+
diff --git a/quadlets/homarr/homarr.container b/quadlets/homarr/homarr.container
index 4e68a5f..3aa66f7 100644
--- a/quadlets/homarr/homarr.container
+++ b/quadlets/homarr/homarr.container
@@ -14,8 +14,5 @@ Image=ghcr.io/ajnart/homarr:latest
 ContainerName=homarr
 HostName=homarr
 
-Network=
-#PublishPort=7575:7575
-
-Volume=/volumes/homarr/app/data/configs:/app/data/configs
-Volume=/volumes/homarr/app/public/icons:/app/public/icons
+Volume=homarr-configs:/app/data/configs
+Volume=homarr-icons:/app/public/icons
diff --git a/quadlets/kibitzr/kibitzr.container b/quadlets/kibitzr/kibitzr.container
index a8c4180..d1211c0 100644
--- a/quadlets/kibitzr/kibitzr.container
+++ b/quadlets/kibitzr/kibitzr.container
@@ -16,7 +16,7 @@ HostName=kibitzr
 
 Network=
 
-Volume=/volumes/kibitzr/root:/root
+Volume=kibitzr-root:/root
 
 # NOTE: Initialize a default kibitzr.yml and kibitzr-creds.yml
 #Exec=init
diff --git a/quadlets/kibitzr/root.volume b/quadlets/kibitzr/root.volume
new file mode 100644
index 0000000..dba13fd
--- /dev/null
+++ b/quadlets/kibitzr/root.volume
@@ -0,0 +1,3 @@
+[Volume]
+VolumeName=kibitzr-root
+
diff --git a/quadlets/template.volume b/quadlets/template.volume
new file mode 100644
index 0000000..322de2d
--- /dev/null
+++ b/quadlets/template.volume
@@ -0,0 +1,3 @@
+[Volume]
+VolumeName=
+