From 500ffb5f8c3aac9ca1bc498434817a432e2ec9df Mon Sep 17 00:00:00 2001 From: redbeardymcgee Date: Mon, 21 Apr 2025 08:34:11 -0500 Subject: [PATCH] fix(quadlets): normalize networks, volumes, update --- quadlets/README.md | 2 +- quadlets/actual/actual.container | 4 ++- quadlets/actual/actual.network | 1 + .../actual/{data.volume => actual.volume} | 0 quadlets/adguard/adguard.container | 9 +++--- quadlets/adguard/adguard.network | 1 + .../audiobookshelf/audiobookshelf.container | 12 ++++---- .../audiobookshelf/audiobookshelf.network | 1 + quadlets/blinko/blinko-db.container | 1 + quadlets/blinko/blinko.container | 1 + quadlets/blinko/blinko.network | 1 + quadlets/blinko/data.volume | 1 + quadlets/blinko/db.volume | 3 -- .../caddy/{config.volume => caddy.volume} | 1 + quadlets/caddy/data.volume | 2 -- quadlets/calibre/calibre.container | 3 +- quadlets/calibre/calibre.network | 1 + quadlets/chartdb/chartdb.container | 1 + quadlets/chartdb/chartdb.network | 1 + quadlets/dashdot/dashdot-nvidia.container | 2 +- quadlets/dashdot/dashdot.container | 2 +- quadlets/dashdot/dashdot.network | 1 + quadlets/dashy/dashy.container | 4 +-- quadlets/dashy/dashy.network | 1 + quadlets/filebrowser/filebrowser.container | 5 +++- quadlets/filebrowser/filebrowser.network | 1 + quadlets/filestash/filestash-wopi.container | 1 + quadlets/filestash/filestash.container | 6 ++-- quadlets/filestash/filestash.network | 1 + quadlets/forgejo/forgejo.container | 2 +- quadlets/forgejo/forgejo.network | 1 + quadlets/foundryvtt/foundryvtt.container | 18 ++++++------ quadlets/foundryvtt/foundryvtt.network | 1 + quadlets/freshrss/fivefilters.container | 4 +-- quadlets/freshrss/freshrss.container | 9 +++--- quadlets/freshrss/freshrss.network | 8 ----- quadlets/glance/glance.container | 5 ++-- quadlets/glance/glance.volume | 2 ++ quadlets/glances/glances.container | 4 ++- quadlets/glances/glances.network | 1 + quadlets/gluetun/gluetun.container | 4 +-- quadlets/hoarder/hoarder-chrome.container | 3 ++ .../hoarder/hoarder-meilisearch.container | 6 ++-- quadlets/hoarder/hoarder.container | 6 ++-- .../hoarder/{data.volume => hoarder.volume} | 1 + quadlets/hoarder/meilisearch.volume | 2 -- quadlets/homarr/data.volume | 3 -- quadlets/homarr/homarr.container | 3 +- quadlets/homarr/homarr.network | 1 + .../homarr/{configs.volume => homarr.volume} | 1 + quadlets/homer/homer.container | 4 ++- quadlets/homer/homer.network | 1 + .../homer/{assets.volume => homer.volume} | 0 quadlets/it-tools/it-tools.container | 5 ++-- quadlets/it-tools/it-tools.network | 1 + quadlets/joplin/joplin.container | 6 ++-- quadlets/joplin/joplin.network | 1 + .../{joplindb-data.volume => joplin.volume} | 0 quadlets/kavita/kavita.container | 5 ++-- quadlets/kavita/kavita.network | 1 + .../{kavita-config.volume => kavita.volume} | 0 quadlets/kibitzr/kibitzr.container | 6 ++-- quadlets/kibitzr/kibitzr.network | 1 + .../kibitzr/{root.volume => kibitzr.volume} | 0 .../lazylibrarian/lazylibrarian.container | 4 ++- quadlets/lazylibrarian/lazylibrarian.network | 1 + .../{config.volume => lazylibrarian.volume} | 0 .../librenms/{data.volume => librenms.volume} | 0 quadlets/librespeed/librespeed.container | 6 ++-- quadlets/librespeed/librespeed.network | 1 + quadlets/linkwarden/data.volume | 2 -- .../linkwarden/linkwarden-database.container | 3 ++ quadlets/linkwarden/linkwarden.container | 2 ++ .../{database.volume => linkwarden.volume} | 2 +- quadlets/matrix/matrix-db.container | 27 ++++++++++------- quadlets/matrix/matrix-db.volume | 2 -- quadlets/matrix/matrix.container | 29 ++++++++++--------- quadlets/matrix/matrix.network | 1 + quadlets/matrix/matrix.volume | 2 +- quadlets/mealie/mealie.container | 2 ++ quadlets/mealie/mealie.network | 1 + .../mealie/{data.volume => mealie.volume} | 0 quadlets/memos/memos.container | 1 + quadlets/memos/memos.network | 1 + quadlets/memos/{data.volume => memos.volume} | 0 quadlets/minio/minio.container | 2 ++ quadlets/minio/minio.network | 1 + quadlets/minio/{data.volume => minio.volume} | 0 quadlets/mirotalk/mirotalk.container | 4 ++- quadlets/mirotalk/mirotalk.network | 1 + quadlets/netboot-xyz/netboot-xyz.container | 14 ++++----- quadlets/netboot-xyz/netboot-xyz.network | 1 + quadlets/netdata/cache.volume | 3 -- quadlets/netdata/config.volume | 3 -- quadlets/netdata/lib.volume | 3 -- quadlets/netdata/netdata.container | 9 +++--- quadlets/netdata/netdata.volume | 5 ++++ quadlets/nginx/nginx.container | 6 ++-- quadlets/nginx/nginx.network | 1 + quadlets/nginx/{html.volume => nginx.volume} | 0 .../openspeedtest/openspeedtest.container | 1 + quadlets/pi-hole/pihole.container | 2 +- quadlets/pocket-id/pocket-id.container | 1 + quadlets/pocket-id/pocket-id.network | 1 + quadlets/pointspend/pointspend.container | 5 ++-- quadlets/postiz/postiz-postgres.container | 2 +- quadlets/postiz/postiz-redis.container | 2 +- quadlets/postiz/postiz.container | 2 +- quadlets/postiz/postiz.network | 1 + quadlets/prometheus/prometheus.container | 2 ++ .../{data.volume => prometheus.volume} | 0 .../protonmail-bridge.container | 2 ++ .../protonmail-bridge.network | 1 + .../{data.volume => protonmail-bridge.volume} | 0 quadlets/prowlarr/prowlarr.container | 11 +++---- quadlets/prowlarr/prowlarr.network | 1 + .../{config.volume => prowlarr.volume} | 0 ...rent-port-forward-gluetun-server.container | 6 ++-- quadlets/qbittorrent/config.volume | 3 -- quadlets/qbittorrent/qbittorrent.container | 8 +++-- .../{downloads.volume => qbittorrent.volume} | 2 ++ quadlets/radarr/radarr.container | 10 +++---- quadlets/radarr/radarr.network | 1 + .../radarr/{config.volume => radarr.volume} | 0 quadlets/seedboxapi/seedboxapi.container | 5 ++-- quadlets/snowflake/snowflake.container | 3 ++ quadlets/snowflake/snowflake.network | 1 + quadlets/sonarr/sonarr.container | 7 ++--- quadlets/sonarr/sonarr.network | 1 + .../sonarr/{config.volume => sonarr.volume} | 0 ...ingPDF.container => stirlingpdf.container} | 6 ++-- quadlets/stirlingPDF/stirlingpdf.network | 1 + quadlets/syslog-ng/syslog-ng.container | 2 +- quadlets/syslog-ng/syslog-ng.network | 1 + quadlets/tandoor/tandoor-db.container | 3 ++ quadlets/tandoor/tandoor-db.volume | 3 -- quadlets/tandoor/tandoor-media.volume | 3 -- quadlets/tandoor/tandoor-nginx-config.volume | 3 -- quadlets/tandoor/tandoor-nginx.container | 5 ++-- quadlets/tandoor/tandoor-static.volume | 3 -- quadlets/tandoor/tandoor.container | 7 +++-- quadlets/tandoor/tandoor.network | 1 + quadlets/tandoor/tandoor.volume | 6 ++++ quadlets/termix/termix.container | 3 +- quadlets/termix/termix.network | 1 + .../{termix-db.volume => termix.volume} | 0 quadlets/thelounge/thelounge.container | 3 +- quadlets/thelounge/thelounge.network | 1 + .../{data.volume => thelounge.volume} | 0 quadlets/traggo/traggo.container | 6 ++-- quadlets/traggo/traggo.network | 1 + quadlets/vaultwarden/vaultwarden.container | 1 + quadlets/vaultwarden/vaultwarden.network | 1 + quadlets/weechat/weechat.container | 9 ++++-- quadlets/weechat/weechat.network | 1 + 155 files changed, 281 insertions(+), 197 deletions(-) create mode 100644 quadlets/actual/actual.network rename quadlets/actual/{data.volume => actual.volume} (100%) create mode 100644 quadlets/adguard/adguard.network create mode 100644 quadlets/audiobookshelf/audiobookshelf.network create mode 100644 quadlets/blinko/blinko.network delete mode 100644 quadlets/blinko/db.volume rename quadlets/caddy/{config.volume => caddy.volume} (60%) delete mode 100644 quadlets/caddy/data.volume create mode 100644 quadlets/calibre/calibre.network create mode 100644 quadlets/chartdb/chartdb.network create mode 100644 quadlets/dashdot/dashdot.network create mode 100644 quadlets/dashy/dashy.network create mode 100644 quadlets/filebrowser/filebrowser.network create mode 100644 quadlets/filestash/filestash.network create mode 100644 quadlets/forgejo/forgejo.network create mode 100644 quadlets/foundryvtt/foundryvtt.network create mode 100644 quadlets/glance/glance.volume create mode 100644 quadlets/glances/glances.network rename quadlets/hoarder/{data.volume => hoarder.volume} (51%) delete mode 100644 quadlets/hoarder/meilisearch.volume delete mode 100644 quadlets/homarr/data.volume create mode 100644 quadlets/homarr/homarr.network rename quadlets/homarr/{configs.volume => homarr.volume} (61%) create mode 100644 quadlets/homer/homer.network rename quadlets/homer/{assets.volume => homer.volume} (100%) create mode 100644 quadlets/it-tools/it-tools.network create mode 100644 quadlets/joplin/joplin.network rename quadlets/joplin/{joplindb-data.volume => joplin.volume} (100%) create mode 100644 quadlets/kavita/kavita.network rename quadlets/kavita/{kavita-config.volume => kavita.volume} (100%) create mode 100644 quadlets/kibitzr/kibitzr.network rename quadlets/kibitzr/{root.volume => kibitzr.volume} (100%) create mode 100644 quadlets/lazylibrarian/lazylibrarian.network rename quadlets/lazylibrarian/{config.volume => lazylibrarian.volume} (100%) rename quadlets/librenms/{data.volume => librenms.volume} (100%) create mode 100644 quadlets/librespeed/librespeed.network delete mode 100644 quadlets/linkwarden/data.volume rename quadlets/linkwarden/{database.volume => linkwarden.volume} (59%) delete mode 100644 quadlets/matrix/matrix-db.volume create mode 100644 quadlets/matrix/matrix.network create mode 100644 quadlets/mealie/mealie.network rename quadlets/mealie/{data.volume => mealie.volume} (100%) create mode 100644 quadlets/memos/memos.network rename quadlets/memos/{data.volume => memos.volume} (100%) create mode 100644 quadlets/minio/minio.network rename quadlets/minio/{data.volume => minio.volume} (100%) create mode 100644 quadlets/mirotalk/mirotalk.network create mode 100644 quadlets/netboot-xyz/netboot-xyz.network delete mode 100644 quadlets/netdata/cache.volume delete mode 100644 quadlets/netdata/config.volume delete mode 100644 quadlets/netdata/lib.volume create mode 100644 quadlets/netdata/netdata.volume create mode 100644 quadlets/nginx/nginx.network rename quadlets/nginx/{html.volume => nginx.volume} (100%) create mode 100644 quadlets/pocket-id/pocket-id.network create mode 100644 quadlets/postiz/postiz.network rename quadlets/prometheus/{data.volume => prometheus.volume} (100%) create mode 100644 quadlets/protonmail-bridge/protonmail-bridge.network rename quadlets/protonmail-bridge/{data.volume => protonmail-bridge.volume} (100%) create mode 100644 quadlets/prowlarr/prowlarr.network rename quadlets/prowlarr/{config.volume => prowlarr.volume} (100%) delete mode 100644 quadlets/qbittorrent/config.volume rename quadlets/qbittorrent/{downloads.volume => qbittorrent.volume} (57%) create mode 100644 quadlets/radarr/radarr.network rename quadlets/radarr/{config.volume => radarr.volume} (100%) create mode 100644 quadlets/snowflake/snowflake.network create mode 100644 quadlets/sonarr/sonarr.network rename quadlets/sonarr/{config.volume => sonarr.volume} (100%) rename quadlets/stirlingPDF/{stirlingPDF.container => stirlingpdf.container} (91%) create mode 100644 quadlets/stirlingPDF/stirlingpdf.network create mode 100644 quadlets/syslog-ng/syslog-ng.network delete mode 100644 quadlets/tandoor/tandoor-db.volume delete mode 100644 quadlets/tandoor/tandoor-media.volume delete mode 100644 quadlets/tandoor/tandoor-nginx-config.volume delete mode 100644 quadlets/tandoor/tandoor-static.volume create mode 100644 quadlets/tandoor/tandoor.network create mode 100644 quadlets/tandoor/tandoor.volume create mode 100644 quadlets/termix/termix.network rename quadlets/termix/{termix-db.volume => termix.volume} (100%) create mode 100644 quadlets/thelounge/thelounge.network rename quadlets/thelounge/{data.volume => thelounge.volume} (100%) create mode 100644 quadlets/traggo/traggo.network create mode 100644 quadlets/vaultwarden/vaultwarden.network create mode 100644 quadlets/weechat/weechat.network diff --git a/quadlets/README.md b/quadlets/README.md index 58c68ba..3dc25da 100644 --- a/quadlets/README.md +++ b/quadlets/README.md @@ -1,3 +1,3 @@ -# Quadlets +## Quadlets Quadlets go in `~/.config/containers/systemd`. diff --git a/quadlets/actual/actual.container b/quadlets/actual/actual.container index 6267005..0942b99 100644 --- a/quadlets/actual/actual.container +++ b/quadlets/actual/actual.container @@ -1,5 +1,5 @@ [Unit] -Description=Budget management +Description=Actual budget management [Service] @@ -12,6 +12,8 @@ WantedBy=default.target [Container] Image=docker.io/actualbudget/actual-server:latest ContainerName=actual + +Network=actual.network HostName=actual Volume=actual-data:/data diff --git a/quadlets/actual/actual.network b/quadlets/actual/actual.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/actual/actual.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/actual/data.volume b/quadlets/actual/actual.volume similarity index 100% rename from quadlets/actual/data.volume rename to quadlets/actual/actual.volume diff --git a/quadlets/adguard/adguard.container b/quadlets/adguard/adguard.container index ea94f59..2f54cd0 100644 --- a/quadlets/adguard/adguard.container +++ b/quadlets/adguard/adguard.container @@ -11,8 +11,9 @@ WantedBy=default.target [Container] Image=docker.io/adguard/adguardhome:latest ContainerName=adguard -HostName=adguard +Network=adguard.network +HostName=adguard PublishPort=53:53/tcp PublishPort=53:53/udp PublishPort=784:784/udp @@ -21,6 +22,6 @@ PublishPort=3000:3000/tcp PublishPort=8844:80/tcp PublishPort=8443:443/tcp -Volume=adguard-config:/opt/adguardhome/work:z -Volume=adguard-work:/opt/adguardhome/conf:z -Volume=/var/log/AdGuardHome.log:/var/log/AdGuardHome.log:z +Volume=adguard-config:/opt/adguardhome/work +Volume=adguard-work:/opt/adguardhome/conf +Volume=/var/log/AdGuardHome.log:/var/log/AdGuardHome.log diff --git a/quadlets/adguard/adguard.network b/quadlets/adguard/adguard.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/adguard/adguard.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/audiobookshelf/audiobookshelf.container b/quadlets/audiobookshelf/audiobookshelf.container index 32d1ddf..5e81871 100644 --- a/quadlets/audiobookshelf/audiobookshelf.container +++ b/quadlets/audiobookshelf/audiobookshelf.container @@ -11,13 +11,11 @@ WantedBy=default.target [Container] Image=docker.io/advplyr/audiobookshelf:latest ContainerName=audiobookshelf -HostName=audiobookshelf +Network=audiobookshelf.network +HostName=audiobookshelf PublishPort=13378:80 -Volume=audiobookshelf-config:/metadata:z -Volume=audiobookshelf-metadata:/config:z -Volume=audiobookshelf-audiobooks:/audiobooks:z - -Environment=AUDIOBOOKSHELF_UID=USER_UID_HERE -Environment=AUDIOBOOKSHELF_GID=USER_GID_HERE \ No newline at end of file +Volume=audiobookshelf-config:/metadata +Volume=audiobookshelf-metadata:/config +Volume=audiobookshelf-audiobooks:/audiobooks diff --git a/quadlets/audiobookshelf/audiobookshelf.network b/quadlets/audiobookshelf/audiobookshelf.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/audiobookshelf/audiobookshelf.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/blinko/blinko-db.container b/quadlets/blinko/blinko-db.container index ec723d1..0888b7d 100644 --- a/quadlets/blinko/blinko-db.container +++ b/quadlets/blinko/blinko-db.container @@ -13,6 +13,7 @@ WantedBy=default.target Image=docker.io/postgres ContainerName=blinko-db +Network=blinko.network HostName=blinko-db PublishPort=5435:5432 diff --git a/quadlets/blinko/blinko.container b/quadlets/blinko/blinko.container index 988f107..5a6f7f2 100644 --- a/quadlets/blinko/blinko.container +++ b/quadlets/blinko/blinko.container @@ -14,6 +14,7 @@ WantedBy=default.target Image=docker.io/blinkospace/blinko ContainerName=blinko +Network=blinko.network HostName=blinko PublishPort=1111:1111 diff --git a/quadlets/blinko/blinko.network b/quadlets/blinko/blinko.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/blinko/blinko.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/blinko/data.volume b/quadlets/blinko/data.volume index 4a843eb..a10fcd9 100644 --- a/quadlets/blinko/data.volume +++ b/quadlets/blinko/data.volume @@ -1,3 +1,4 @@ [Volume] VolumeName=blinko-data +VolumeName=blinko-db diff --git a/quadlets/blinko/db.volume b/quadlets/blinko/db.volume deleted file mode 100644 index 1bfbb0a..0000000 --- a/quadlets/blinko/db.volume +++ /dev/null @@ -1,3 +0,0 @@ -[Volume] -VolumeName=blinko-db - diff --git a/quadlets/caddy/config.volume b/quadlets/caddy/caddy.volume similarity index 60% rename from quadlets/caddy/config.volume rename to quadlets/caddy/caddy.volume index f395d99..0454404 100644 --- a/quadlets/caddy/config.volume +++ b/quadlets/caddy/caddy.volume @@ -1,2 +1,3 @@ [Volume] VolumeName=caddy-config +VolumeName=caddy-data diff --git a/quadlets/caddy/data.volume b/quadlets/caddy/data.volume deleted file mode 100644 index 2535edc..0000000 --- a/quadlets/caddy/data.volume +++ /dev/null @@ -1,2 +0,0 @@ -[Volume] -VolumeName=caddy-data diff --git a/quadlets/calibre/calibre.container b/quadlets/calibre/calibre.container index e21d0ec..6cc86d1 100644 --- a/quadlets/calibre/calibre.container +++ b/quadlets/calibre/calibre.container @@ -11,8 +11,9 @@ WantedBy=default.target [Container] Image=lscr.io/linuxserver/calibre:latest ContainerName=calibre -HostName=calibre +Network=calibre.network +HostName=calibre PublishPort=8080 Volume=calibre-config:/config diff --git a/quadlets/calibre/calibre.network b/quadlets/calibre/calibre.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/calibre/calibre.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/chartdb/chartdb.container b/quadlets/chartdb/chartdb.container index ba7a45f..5bd479a 100644 --- a/quadlets/chartdb/chartdb.container +++ b/quadlets/chartdb/chartdb.container @@ -12,6 +12,7 @@ WantedBy=default.target Image=ghcr.io/chartdb/chartdb ContainerName=chartdb +Network=chartdb.network HostName=chartdb PublishPort=8080:80 diff --git a/quadlets/chartdb/chartdb.network b/quadlets/chartdb/chartdb.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/chartdb/chartdb.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/dashdot/dashdot-nvidia.container b/quadlets/dashdot/dashdot-nvidia.container index 94da75c..425541b 100644 --- a/quadlets/dashdot/dashdot-nvidia.container +++ b/quadlets/dashdot/dashdot-nvidia.container @@ -13,7 +13,7 @@ Image=docker.io/mauricenino/dashdot:nvidia ContainerName=dashdot-nvidia AutoUpdate=registry -Network= +Network=dashdot.network HostName=dashdot PublishPort=3001:3001 diff --git a/quadlets/dashdot/dashdot.container b/quadlets/dashdot/dashdot.container index bdd546c..d9fe835 100644 --- a/quadlets/dashdot/dashdot.container +++ b/quadlets/dashdot/dashdot.container @@ -13,7 +13,7 @@ Image=docker.io/mauricenino/dashdot ContainerName=dashdot AutoUpdate=registry -Network= +Network=dashdot.network HostName=dashdot PublishPort=3001:3001 diff --git a/quadlets/dashdot/dashdot.network b/quadlets/dashdot/dashdot.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/dashdot/dashdot.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/dashy/dashy.container b/quadlets/dashy/dashy.container index 33926e4..a61b693 100644 --- a/quadlets/dashy/dashy.container +++ b/quadlets/dashy/dashy.container @@ -12,10 +12,10 @@ WantedBy=default.target [Container] Image=docker.io/lissy93/dashy:$dashy_version ContainerName=dashy -HostName=dashy AutoUpdate=registry -Network= +Network=dashy.network +HostName=dashy Volume=./user-data:/app/user-data diff --git a/quadlets/dashy/dashy.network b/quadlets/dashy/dashy.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/dashy/dashy.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/filebrowser/filebrowser.container b/quadlets/filebrowser/filebrowser.container index b79b9e9..3fce37c 100644 --- a/quadlets/filebrowser/filebrowser.container +++ b/quadlets/filebrowser/filebrowser.container @@ -12,8 +12,11 @@ WantedBy=multi-user.target default.target Image=docker.io/hurlenko/filebrowser:latest ContainerName=filebrowser +Network=filebrowser.network +Hostname=filebrowser + Volume=/path/to/what/you/want/to/share:/data:z Volume=fb-config:/config:z Volume=fb-branding:/branding:z -PublishPort=8008:8080 \ No newline at end of file +PublishPort=8008:8080 diff --git a/quadlets/filebrowser/filebrowser.network b/quadlets/filebrowser/filebrowser.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/filebrowser/filebrowser.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/filestash/filestash-wopi.container b/quadlets/filestash/filestash-wopi.container index 2e3d630..ce36606 100644 --- a/quadlets/filestash/filestash-wopi.container +++ b/quadlets/filestash/filestash-wopi.container @@ -13,6 +13,7 @@ Image=docker.io/collabora/code:24.04.10.2.1 ContainerName=filestash-wopi AutoUpdate=registry +Network=filestash.network HostName=filestash-wopi PublishPort=9980:9980 diff --git a/quadlets/filestash/filestash.container b/quadlets/filestash/filestash.container index 010d1c3..0dbc8dc 100644 --- a/quadlets/filestash/filestash.container +++ b/quadlets/filestash/filestash.container @@ -14,13 +14,15 @@ Image=docker.io/machines/filestash:latest ContainerName=filestash AutoUpdate=registry +Network=filestash.network HostName=filestash PublishPort=8334:8334 -Environment=APPLICATION_URL= +Volume=filestash:/app/data/state + +Environment=APPLICATION_URL=https://filestash.example.com Environment=CANARY=true Environment=OFFICE_URL=http://filestash-wopi:9980 Environment=OFFICE_FILESTASH_URL=http://filestash:8334 Environment=OFFICE_REWRITE_URL=http://127.0.0.1:9980 -Volume=filestash:/app/data/state diff --git a/quadlets/filestash/filestash.network b/quadlets/filestash/filestash.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/filestash/filestash.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/forgejo/forgejo.container b/quadlets/forgejo/forgejo.container index cb1a266..a98f04e 100644 --- a/quadlets/forgejo/forgejo.container +++ b/quadlets/forgejo/forgejo.container @@ -14,7 +14,7 @@ Image=codeberg.org/forgejo/forgejo:10 ContainerName=forgejo AutoUpdate=registry -Network= +Network=forgejo.network HostName=forgejo PublishPort=222:22 PublishPort=3000:3000 diff --git a/quadlets/forgejo/forgejo.network b/quadlets/forgejo/forgejo.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/forgejo/forgejo.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/foundryvtt/foundryvtt.container b/quadlets/foundryvtt/foundryvtt.container index 1c15b70..0bed12b 100644 --- a/quadlets/foundryvtt/foundryvtt.container +++ b/quadlets/foundryvtt/foundryvtt.container @@ -11,19 +11,19 @@ WantedBy=default.target [Container] Image=docker.io/felddy/foundryvtt:release ContainerName=foundryvtt -HostName=foundryvtt +AutoUpdate=registry +Network=foundryvtt.network +HostName=foundryvtt Volume=foundryvtt-data:/data PublishPort=30000:30000 -Environment=TIMEZONE= -Environment=FOUNDRY_UID= -Environment=FOUNDRY_GID= -Environment=FOUNDRY_PASSWORD= +Environment=TIMEZONE=Etc/UTC +Secret=foundry-password,type=env,target=FOUNDRY_PASSWORD Environment=FOUNDRY_USERNAME= -Environment=FOUNDRY_ADMIN_KEY= -Environment=FOUNDRY_LICENSE_KEY=XXXX-XXXX-XXXX-XXXX-XXXX-XXXX -Environment=FOUNDRY_HOT_RELOAD=true +Secret=foundry-admin-key,type=env,target=FOUNDRY_ADMIN_KEY +Secret=foundry-license-key,type=env,target=FOUNDRY_LICENSE_KEY=XXXX-XXXX-XXXX-XXXX-XXXX-XXXX +Environment=FOUNDRY_HOT_RELOAD=false Environment=CONTAINER_PRESERVE_CONFIG=true -Environment=CONTAINER_CACHE="/data/container_cache" \ No newline at end of file +Environment=CONTAINER_CACHE="/data/container_cache" diff --git a/quadlets/foundryvtt/foundryvtt.network b/quadlets/foundryvtt/foundryvtt.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/foundryvtt/foundryvtt.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/freshrss/fivefilters.container b/quadlets/freshrss/fivefilters.container index e13685b..fe6cd01 100644 --- a/quadlets/freshrss/fivefilters.container +++ b/quadlets/freshrss/fivefilters.container @@ -11,9 +11,9 @@ WantedBy=default.target [Container] Image=docker.io/heussd/fivefilters-full-text-rss:latest ContainerName=fivefilters -HostName=fivefilters Network=freshrss.network +HostName=fivefilters PublishPort=5000:80 -Environment=FTR_ADMIN_PASSWORD=XXXXXXXX \ No newline at end of file +Secret=ftr-admin-password,type=env,target=FTR_ADMIN_PASSWORD diff --git a/quadlets/freshrss/freshrss.container b/quadlets/freshrss/freshrss.container index b56cb90..6d7e7d8 100644 --- a/quadlets/freshrss/freshrss.container +++ b/quadlets/freshrss/freshrss.container @@ -1,5 +1,6 @@ [Unit] Description=FreshRSS Quadlet +Requires=fivefilters.service After=fivefilters.service [Service] @@ -12,13 +13,11 @@ WantedBy=default.target [Container] Image=docker.io/linuxserver/freshrss:latest ContainerName=freshrss -HostName=freshrss Network=freshrss.network +HostName=freshrss PublishPort=4422:80 -Volume=freshrss-config:/config:z +Volume=freshrss-config:/config -Environment=PUID=1001 -Environment=PGID=1001 -Environment=TZ=Europe/London \ No newline at end of file +Environment=TZ=Etc/UTC diff --git a/quadlets/freshrss/freshrss.network b/quadlets/freshrss/freshrss.network index 9a8b66d..264f70a 100644 --- a/quadlets/freshrss/freshrss.network +++ b/quadlets/freshrss/freshrss.network @@ -1,9 +1 @@ [Network] -Subnet=10.10.10.0/24 -Gateway=10.10.10.1 -Label=app=freshrss -Driver=pasta - - - - diff --git a/quadlets/glance/glance.container b/quadlets/glance/glance.container index e6f3146..dec3e14 100644 --- a/quadlets/glance/glance.container +++ b/quadlets/glance/glance.container @@ -13,8 +13,9 @@ Image=docker.io/glanceapp/glance ContainerName=glance AutoUpdate=registry +Network=glance.network HostName=glance -PublishPort=8080 +PublishPort=8080:8080 -Volume=./config:/app/config +Volume=glance-config:/app/config diff --git a/quadlets/glance/glance.volume b/quadlets/glance/glance.volume new file mode 100644 index 0000000..b8f94eb --- /dev/null +++ b/quadlets/glance/glance.volume @@ -0,0 +1,2 @@ +[Volume] +VolumeName=glance-config diff --git a/quadlets/glances/glances.container b/quadlets/glances/glances.container index 058cf91..f341ea5 100644 --- a/quadlets/glances/glances.container +++ b/quadlets/glances/glances.container @@ -11,9 +11,11 @@ WantedBy=default.target [Container] Image=docker.io/nicolargo/glances:$version_tag ContainerName=glances -HostName=glances AutoUpdate=registry +Network=glances.network +HostName=glances + 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 diff --git a/quadlets/glances/glances.network b/quadlets/glances/glances.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/glances/glances.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/gluetun/gluetun.container b/quadlets/gluetun/gluetun.container index e6ef28b..9a708ad 100644 --- a/quadlets/gluetun/gluetun.container +++ b/quadlets/gluetun/gluetun.container @@ -11,7 +11,7 @@ TimeoutStartSec=900 WantedBy=default.target [Container] -Image=docker.io/qmcgaw/gluetun:$gluetun_version +Image=docker.io/qmcgaw/gluetun ContainerName=gluetun HostName=gluetun AutoUpdate=registry @@ -20,7 +20,7 @@ AddDevice=/dev/net/tun:/dev/net/tun Volume=./config.toml:/gluetun/auth/config.toml -Environment=TZ=$timezone +Environment=TZ=Etc/UTC Environment=UPDATER_PERIOD=24h Environment=UPDATER_VPN_SERVICE_PROVIDERS=protonvpn Environment=VPN_SERVICE_PROVIDER=protonvpn diff --git a/quadlets/hoarder/hoarder-chrome.container b/quadlets/hoarder/hoarder-chrome.container index ac46f36..8a303fa 100644 --- a/quadlets/hoarder/hoarder-chrome.container +++ b/quadlets/hoarder/hoarder-chrome.container @@ -11,6 +11,9 @@ WantedBy=default.target [Container] Image=docker.io/zenika/alpine-chrome ContainerName=hoarder-chrome +AutoUpdate=registry + +Network=hoarder.network HostName=hoarder-chrome Exec=--no-sandbox --disable-gpu --disable-dev-shm-usage --remote-debugging-address=0.0.0.0 --remote-debugging-port=9222 --hide-scrollbars diff --git a/quadlets/hoarder/hoarder-meilisearch.container b/quadlets/hoarder/hoarder-meilisearch.container index 7967488..320c34c 100644 --- a/quadlets/hoarder/hoarder-meilisearch.container +++ b/quadlets/hoarder/hoarder-meilisearch.container @@ -1,7 +1,6 @@ [Unit] Description=Hoarder requirement - [Service] Restart=on-failure TimeoutStartSec=900 @@ -12,8 +11,11 @@ WantedBy=default.target [Container] Image=docker.io/getmeili/meilisearch:v1.6 ContainerName=hoarder-meilisearch +AutoUpdate=registry + +Network=hoarder.network HostName=hoarder-meilisearch EnvironmentFile=hoarder.env -Volume=meilisearch:/meili_data +Volume=hoarder-meilisearch:/meili_data diff --git a/quadlets/hoarder/hoarder.container b/quadlets/hoarder/hoarder.container index fd61a95..e201b3e 100644 --- a/quadlets/hoarder/hoarder.container +++ b/quadlets/hoarder/hoarder.container @@ -12,9 +12,11 @@ WantedBy=default.target [Container] Image=ghcr.io/hoarder-app/hoarder:release ContainerName=hoarder -HostName=hoarder +AutoUpdate=registry -PublishPort=3000 +Network=hoarder.network +HostName=hoarder +PublishPort=3000:3000 Volume=hoarder-data:/data diff --git a/quadlets/hoarder/data.volume b/quadlets/hoarder/hoarder.volume similarity index 51% rename from quadlets/hoarder/data.volume rename to quadlets/hoarder/hoarder.volume index dcce9d0..976da3b 100644 --- a/quadlets/hoarder/data.volume +++ b/quadlets/hoarder/hoarder.volume @@ -1,2 +1,3 @@ [Volume] VolumeName=hoarder-data +VolumeName=hoarder-meilisearch diff --git a/quadlets/hoarder/meilisearch.volume b/quadlets/hoarder/meilisearch.volume deleted file mode 100644 index 718daec..0000000 --- a/quadlets/hoarder/meilisearch.volume +++ /dev/null @@ -1,2 +0,0 @@ -[Volume] -VolumeName=meilisearch diff --git a/quadlets/homarr/data.volume b/quadlets/homarr/data.volume deleted file mode 100644 index 43cafa2..0000000 --- a/quadlets/homarr/data.volume +++ /dev/null @@ -1,3 +0,0 @@ -[Volume] -VolumeName=homarr-data - diff --git a/quadlets/homarr/homarr.container b/quadlets/homarr/homarr.container index 5e225bd..3a56014 100644 --- a/quadlets/homarr/homarr.container +++ b/quadlets/homarr/homarr.container @@ -1,7 +1,6 @@ [Unit] Description=Homarr - [Service] Restart=on-failure TimeoutStartSec=900 @@ -12,6 +11,8 @@ WantedBy=default.target [Container] Image=ghcr.io/ajnart/homarr:latest ContainerName=homarr + +Network=homarr.network HostName=homarr Volume=homarr-configs:/app/data/configs diff --git a/quadlets/homarr/homarr.network b/quadlets/homarr/homarr.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/homarr/homarr.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/homarr/configs.volume b/quadlets/homarr/homarr.volume similarity index 61% rename from quadlets/homarr/configs.volume rename to quadlets/homarr/homarr.volume index 75eb2e1..08d3096 100644 --- a/quadlets/homarr/configs.volume +++ b/quadlets/homarr/homarr.volume @@ -1,3 +1,4 @@ [Volume] VolumeName=homarr-configs +VolumeName=homarr-data diff --git a/quadlets/homer/homer.container b/quadlets/homer/homer.container index b2ba754..e8a6a23 100644 --- a/quadlets/homer/homer.container +++ b/quadlets/homer/homer.container @@ -11,8 +11,10 @@ WantedBy=default.target [Container] Image=docker.io/b4bz/homer ContainerName=homer -HostName=homer +AutoUpdate=registry +Network=homer.network +HostName=homer PublishPort=8080:8080 Volume=homer-assets:/www/assets diff --git a/quadlets/homer/homer.network b/quadlets/homer/homer.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/homer/homer.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/homer/assets.volume b/quadlets/homer/homer.volume similarity index 100% rename from quadlets/homer/assets.volume rename to quadlets/homer/homer.volume diff --git a/quadlets/it-tools/it-tools.container b/quadlets/it-tools/it-tools.container index b191b46..e760994 100644 --- a/quadlets/it-tools/it-tools.container +++ b/quadlets/it-tools/it-tools.container @@ -11,6 +11,7 @@ WantedBy=default.target [Container] Image=docker.io/corentinth/it-tools:latest ContainerName=it-tools -HostName=it-tools -PublishPort=8088:80 \ No newline at end of file +Network=it-tools.network +HostName=it-tools +PublishPort=8088:80 diff --git a/quadlets/it-tools/it-tools.network b/quadlets/it-tools/it-tools.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/it-tools/it-tools.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/joplin/joplin.container b/quadlets/joplin/joplin.container index 6581334..0966367 100644 --- a/quadlets/joplin/joplin.container +++ b/quadlets/joplin/joplin.container @@ -10,9 +10,11 @@ WantedBy=default.target [Container] Image=docker.io/joplin/server:latest -ContainerName=joplin-server -HostName=joplin-server +ContainerName=joplin +AutoUpdate=registry +Network=joplin.network +HostName=joplin PublishPort=22300:22300 Environment=APP_BASE_URL=https://joplin.example.com diff --git a/quadlets/joplin/joplin.network b/quadlets/joplin/joplin.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/joplin/joplin.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/joplin/joplindb-data.volume b/quadlets/joplin/joplin.volume similarity index 100% rename from quadlets/joplin/joplindb-data.volume rename to quadlets/joplin/joplin.volume diff --git a/quadlets/kavita/kavita.container b/quadlets/kavita/kavita.container index d1c4b66..674f317 100644 --- a/quadlets/kavita/kavita.container +++ b/quadlets/kavita/kavita.container @@ -12,13 +12,14 @@ WantedBy=default.target [Container] Image=ghcr.io/kareadita/kavita:latest ContainerName=kavita -HostName=kavita AutoUpdate=registry +Network=kavita.network +HostName=kavita PublishPort=5000 Volume=kavita-config:/kavita/config Volume=/volumes/books:/library -Environment=TZ= +Environment=TZ=Etc/UTC diff --git a/quadlets/kavita/kavita.network b/quadlets/kavita/kavita.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/kavita/kavita.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/kavita/kavita-config.volume b/quadlets/kavita/kavita.volume similarity index 100% rename from quadlets/kavita/kavita-config.volume rename to quadlets/kavita/kavita.volume diff --git a/quadlets/kibitzr/kibitzr.container b/quadlets/kibitzr/kibitzr.container index d1211c0..5e48a67 100644 --- a/quadlets/kibitzr/kibitzr.container +++ b/quadlets/kibitzr/kibitzr.container @@ -10,11 +10,11 @@ WantedBy=default.target [Container] Image=docker.io/peterdemin/kibitzr:latest -AutoUpdate=registry ContainerName=kibitzr -HostName=kibitzr +AutoUpdate=registry -Network= +Network=kibitzr.network +HostName=kibitzr Volume=kibitzr-root:/root diff --git a/quadlets/kibitzr/kibitzr.network b/quadlets/kibitzr/kibitzr.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/kibitzr/kibitzr.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/kibitzr/root.volume b/quadlets/kibitzr/kibitzr.volume similarity index 100% rename from quadlets/kibitzr/root.volume rename to quadlets/kibitzr/kibitzr.volume diff --git a/quadlets/lazylibrarian/lazylibrarian.container b/quadlets/lazylibrarian/lazylibrarian.container index c2c9817..8685fcf 100644 --- a/quadlets/lazylibrarian/lazylibrarian.container +++ b/quadlets/lazylibrarian/lazylibrarian.container @@ -11,8 +11,10 @@ WantedBy=default.target [Container] ContainerName=lazylibrarian Image=lscr.io/linuxserver/lazylibrarian:latest -HostName=lazylibrar +AutoUpdate=registry +Network=lazylibrarian +HostName=lazylibrarian PublishPort=5299 Volume=lazylibrarian-config:/config diff --git a/quadlets/lazylibrarian/lazylibrarian.network b/quadlets/lazylibrarian/lazylibrarian.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/lazylibrarian/lazylibrarian.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/lazylibrarian/config.volume b/quadlets/lazylibrarian/lazylibrarian.volume similarity index 100% rename from quadlets/lazylibrarian/config.volume rename to quadlets/lazylibrarian/lazylibrarian.volume diff --git a/quadlets/librenms/data.volume b/quadlets/librenms/librenms.volume similarity index 100% rename from quadlets/librenms/data.volume rename to quadlets/librenms/librenms.volume diff --git a/quadlets/librespeed/librespeed.container b/quadlets/librespeed/librespeed.container index fc0eb2d..6fa8de4 100644 --- a/quadlets/librespeed/librespeed.container +++ b/quadlets/librespeed/librespeed.container @@ -1,7 +1,5 @@ [Unit] Description=Speedtest server -After=gluetun.service -BindsTo=gluetun.service [Service] Restart=on-failure @@ -13,10 +11,10 @@ WantedBy=default.target [Container] Image=ghcr.io/librespeed/speedtest:latest ContainerName=librespeed -HostName=librespeed AutoUpdate=registry -Network= +Network=librespeed.network +HostName=librespeed Volume=/volumes/librespeed/database:/database diff --git a/quadlets/librespeed/librespeed.network b/quadlets/librespeed/librespeed.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/librespeed/librespeed.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/linkwarden/data.volume b/quadlets/linkwarden/data.volume deleted file mode 100644 index 3d6bc2c..0000000 --- a/quadlets/linkwarden/data.volume +++ /dev/null @@ -1,2 +0,0 @@ -[Volume] -VolumeName=linkwarden-data diff --git a/quadlets/linkwarden/linkwarden-database.container b/quadlets/linkwarden/linkwarden-database.container index 3ed0f9f..6868e30 100644 --- a/quadlets/linkwarden/linkwarden-database.container +++ b/quadlets/linkwarden/linkwarden-database.container @@ -12,6 +12,9 @@ WantedBy=default.target [Container] Image=docker.io/postgres:16-alpine ContainerName=linkwarden-database +AutoUpdate=registry + +Network=linkwarden.network HostName=linkwarden-database Volume=linkwarden-database:/var/lib/postgresql/data diff --git a/quadlets/linkwarden/linkwarden.container b/quadlets/linkwarden/linkwarden.container index 9d6ab87..fb9fcf8 100644 --- a/quadlets/linkwarden/linkwarden.container +++ b/quadlets/linkwarden/linkwarden.container @@ -12,7 +12,9 @@ WantedBy=default.target [Container] Image=ghcr.io/linkwarden/linkwarden:latest ContainerName=linkwarden +AutoUpdate=registry +Network=linkwarden.network HostName=linkwarden PublishPort=3000 diff --git a/quadlets/linkwarden/database.volume b/quadlets/linkwarden/linkwarden.volume similarity index 59% rename from quadlets/linkwarden/database.volume rename to quadlets/linkwarden/linkwarden.volume index bbea65e..64019da 100644 --- a/quadlets/linkwarden/database.volume +++ b/quadlets/linkwarden/linkwarden.volume @@ -1,3 +1,3 @@ [Volume] +VolumeName=linkwarden-data VolumeName=linkwarden-database - diff --git a/quadlets/matrix/matrix-db.container b/quadlets/matrix/matrix-db.container index 6dfe973..4e93ca1 100644 --- a/quadlets/matrix/matrix-db.container +++ b/quadlets/matrix/matrix-db.container @@ -1,5 +1,6 @@ [Unit] -Description=Matrix Synapse Quadlet +Description=Matrix Synapse DB Quadlet +WantedBy=matrix.service [Service] Restart=always @@ -9,16 +10,20 @@ TimeoutStartSec=900 WantedBy=default.target [Container] -Image=docker.io/matrixdotorg/synapse:latest -ContainerName=matrix_synapse -HostName=matrix_synapse +Image=docker.io/library/postgres:15 +ContainerName=matrix-db +AutoUpdate=registry -PublishPort=8008:8008 +Network=matrix.network +HostName=matrix-db +PublishPort=5432:5432 -Volume=matrix-data:/data +Volume=matrix-db:/var/lib/postgresql/data -Environment=VIRTUAL_HOST=matrix.example.com -Environment=VIRTUAL_PORT=8008 -Environment=LETSENCRYPT_HOST=matrix.example.com -Environment=SYNAPSE_SERVER_NAME=matrix.example.com -Environment=SYNAPSE_REPORT_STATS=no \ No newline at end of file +Environment=POSTGRES_PASSWORD=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +Environment=POSTGRES_USER=synapse_user +Environment=POSTGRES_DB=synapse +Environment=LANG=C +Environment=LC_COLLATE=C +Environment=LC_CTYPE=C +Environment=POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C diff --git a/quadlets/matrix/matrix-db.volume b/quadlets/matrix/matrix-db.volume deleted file mode 100644 index 020734b..0000000 --- a/quadlets/matrix/matrix-db.volume +++ /dev/null @@ -1,2 +0,0 @@ -[Volume] -VolumeName=matrix-db-data \ No newline at end of file diff --git a/quadlets/matrix/matrix.container b/quadlets/matrix/matrix.container index 427d59e..b765336 100644 --- a/quadlets/matrix/matrix.container +++ b/quadlets/matrix/matrix.container @@ -1,6 +1,7 @@ [Unit] -Description=Matrix Synapse DB Quadlet -WantedBy=matrix.service +Description=Matrix Synapse Quadlet +Requires=matrix-db.service +After=matrix-db.service [Service] Restart=always @@ -10,18 +11,18 @@ TimeoutStartSec=900 WantedBy=default.target [Container] -Image=docker.io/library/postgres:15 -ContainerName=matrix_synapse_db -HostName=matrix_synapse_db +Image=docker.io/matrixdotorg/synapse:latest +ContainerName=matrix +AutoUpdate=registry -PublishPort=5432:5432 +Network=matrix.network +HostName=matrix +PublishPort=8008:8008 -Volume=matrix-db-data:/var/lib/postgresql/data:z +Volume=matrix-db:/data -Environment=POSTGRES_PASSWORD=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -Environment=POSTGRES_USER=synapse_user -Environment=POSTGRES_DB=synapse -Environment=LANG=C -Environment=LC_COLLATE=C -Environment=LC_CTYPE=C -Environment=POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C \ No newline at end of file +Environment=VIRTUAL_HOST=matrix.example.com +Environment=VIRTUAL_PORT=8008 +Environment=LETSENCRYPT_HOST=matrix.example.com +Environment=SYNAPSE_SERVER_NAME=matrix.example.com +Environment=SYNAPSE_REPORT_STATS=no diff --git a/quadlets/matrix/matrix.network b/quadlets/matrix/matrix.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/matrix/matrix.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/matrix/matrix.volume b/quadlets/matrix/matrix.volume index 18cc26b..d596468 100644 --- a/quadlets/matrix/matrix.volume +++ b/quadlets/matrix/matrix.volume @@ -1,2 +1,2 @@ [Volume] -VolumeName=matrix-data \ No newline at end of file +VolumeName=matrix-db diff --git a/quadlets/mealie/mealie.container b/quadlets/mealie/mealie.container index 0ab4f44..a936578 100644 --- a/quadlets/mealie/mealie.container +++ b/quadlets/mealie/mealie.container @@ -11,6 +11,8 @@ WantedBy=default.target [Container] Image=docker.io/hkotel/mealie:latest ContainerName=mealie + +Network=mealie.network HostName=mealie Volume=mealie-data:/app/data diff --git a/quadlets/mealie/mealie.network b/quadlets/mealie/mealie.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/mealie/mealie.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/mealie/data.volume b/quadlets/mealie/mealie.volume similarity index 100% rename from quadlets/mealie/data.volume rename to quadlets/mealie/mealie.volume diff --git a/quadlets/memos/memos.container b/quadlets/memos/memos.container index 173b419..62e8b0c 100644 --- a/quadlets/memos/memos.container +++ b/quadlets/memos/memos.container @@ -12,6 +12,7 @@ WantedBy=default.target Image=docker.io/neosmemo/memos:stable ContainerName=memos +Network=memos.network HostName=memos PublishPort=5230 diff --git a/quadlets/memos/memos.network b/quadlets/memos/memos.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/memos/memos.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/memos/data.volume b/quadlets/memos/memos.volume similarity index 100% rename from quadlets/memos/data.volume rename to quadlets/memos/memos.volume diff --git a/quadlets/minio/minio.container b/quadlets/minio/minio.container index 49a09a7..7f36c69 100644 --- a/quadlets/minio/minio.container +++ b/quadlets/minio/minio.container @@ -11,7 +11,9 @@ WantedBy=default.target [Container] ContainerName=minio Image=docker.io/minio/minio +AutoUpdate=registry +Network=minio.network HostName=minio PublishPort=9000:9000 PublishPort=9001:9001 diff --git a/quadlets/minio/minio.network b/quadlets/minio/minio.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/minio/minio.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/minio/data.volume b/quadlets/minio/minio.volume similarity index 100% rename from quadlets/minio/data.volume rename to quadlets/minio/minio.volume diff --git a/quadlets/mirotalk/mirotalk.container b/quadlets/mirotalk/mirotalk.container index da03867..c4d1389 100644 --- a/quadlets/mirotalk/mirotalk.container +++ b/quadlets/mirotalk/mirotalk.container @@ -11,8 +11,10 @@ WantedBy=default.target [Container] Image=docker.io/mirotalk/p2p ContainerName=mirotalk +AutoUpdate=registry +Network=mirotalk.network HostName=mirotalk -PublishPort=3000 +PublishPort=3000:3000 Volume=./mirotalk.env:/src/.env diff --git a/quadlets/mirotalk/mirotalk.network b/quadlets/mirotalk/mirotalk.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/mirotalk/mirotalk.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/netboot-xyz/netboot-xyz.container b/quadlets/netboot-xyz/netboot-xyz.container index b39bd51..79669fb 100644 --- a/quadlets/netboot-xyz/netboot-xyz.container +++ b/quadlets/netboot-xyz/netboot-xyz.container @@ -11,18 +11,18 @@ WantedBy=default.target [Container] Image=lscr.io/linuxserver/netbootxyz:latest ContainerName=netboot-xyz +AutoUpdate=registry + +Network=netboot-xyz.network HostName=netboot-xyz - -Volume=netboot-xyz-config:/config -Volume=netboot-xyz-assets:/assets:z - PublishPort=3000:3000 PublishPort=8082:80 PublishPort=69:69/udp -Environment=PUID= -Environment=PGID= -Environment=TZ= +Volume=netboot-xyz-config:/config +Volume=netboot-xyz-assets:/assets:z + +Environment=TZ=Etc/UTC Environment=PORT_RANGE=30000:30010 Environment=SUBFOLDER=/ Environment=WEB_APP_PORT=3000 diff --git a/quadlets/netboot-xyz/netboot-xyz.network b/quadlets/netboot-xyz/netboot-xyz.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/netboot-xyz/netboot-xyz.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/netdata/cache.volume b/quadlets/netdata/cache.volume deleted file mode 100644 index 407cd2c..0000000 --- a/quadlets/netdata/cache.volume +++ /dev/null @@ -1,3 +0,0 @@ -[Volume] -VolumeName=netdatacache - diff --git a/quadlets/netdata/config.volume b/quadlets/netdata/config.volume deleted file mode 100644 index b339555..0000000 --- a/quadlets/netdata/config.volume +++ /dev/null @@ -1,3 +0,0 @@ -[Volume] -VolumeName=netdataconfig - diff --git a/quadlets/netdata/lib.volume b/quadlets/netdata/lib.volume deleted file mode 100644 index a99bf2f..0000000 --- a/quadlets/netdata/lib.volume +++ /dev/null @@ -1,3 +0,0 @@ -[Volume] -VolumeName=netdatalib - diff --git a/quadlets/netdata/netdata.container b/quadlets/netdata/netdata.container index 6578d92..69cfedb 100644 --- a/quadlets/netdata/netdata.container +++ b/quadlets/netdata/netdata.container @@ -11,16 +11,17 @@ WantedBy=default.target [Container] Image=docker.io/netdata/netdata:stable ContainerName=netdata -HostName=netdata +AutoUpdate=registry AddCapability=SYS_PTRACE AddCapability=SYS_ADMIN Network=host +HostName=netdata -Volume=netdataconfig:/etc/netdata -Volume=netdatalib:/var/lib/netdata -Volume=netdatacache:/var/cache/netdata +Volume=netdata-config:/etc/netdata +Volume=netdata-lib:/var/lib/netdata +Volume=netdata-cache:/var/cache/netdata Volume=/:/host/root:ro,rslave Volume=/etc/passwd:/host/etc/passwd:ro Volume=/etc/group:/host/etc/group:ro diff --git a/quadlets/netdata/netdata.volume b/quadlets/netdata/netdata.volume new file mode 100644 index 0000000..ef033e4 --- /dev/null +++ b/quadlets/netdata/netdata.volume @@ -0,0 +1,5 @@ +[Volume] +VolumeName=netdata-cache +VolumeName=netdata-config +VolumeName=netdata-lib + diff --git a/quadlets/nginx/nginx.container b/quadlets/nginx/nginx.container index be2f6e5..810a52b 100644 --- a/quadlets/nginx/nginx.container +++ b/quadlets/nginx/nginx.container @@ -11,11 +11,13 @@ WantedBy=default.target [Container] Image=docker.io/nginx ContainerName=nginx -HostName=nginx +AutoUpdate=registry +Network=nginx.network +HostName=nginx PublishPort=80:80 PublishPort=443:443 -Volume=nginx-html:/usr/share/nginx/html:Z,U +Volume=nginx-html:/usr/share/nginx/html Environment=TZ=Etc/UTC diff --git a/quadlets/nginx/nginx.network b/quadlets/nginx/nginx.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/nginx/nginx.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/nginx/html.volume b/quadlets/nginx/nginx.volume similarity index 100% rename from quadlets/nginx/html.volume rename to quadlets/nginx/nginx.volume diff --git a/quadlets/openspeedtest/openspeedtest.container b/quadlets/openspeedtest/openspeedtest.container index 5f86f44..fa603bf 100644 --- a/quadlets/openspeedtest/openspeedtest.container +++ b/quadlets/openspeedtest/openspeedtest.container @@ -13,6 +13,7 @@ Image=docker.io/openspeedtest/latest ContainerName=openspeedtest AutoUpdate=registry +Network=openspeedtest.network HostName=openspeedtest PublishPort=80:3000 PublishPort=443:3001 diff --git a/quadlets/pi-hole/pihole.container b/quadlets/pi-hole/pihole.container index df6cefe..518cbf4 100644 --- a/quadlets/pi-hole/pihole.container +++ b/quadlets/pi-hole/pihole.container @@ -12,7 +12,7 @@ WantedBy=default.target Image=docker.io/pihole:latest ContainerName=pihole ## WARNING: This should not be enabled unless you have good backups and -# recovery plans. DNS is a critical piece of you network. +# recovery plans. DNS is a critical piece of your network. # AutoUpdate=registry # DHCP diff --git a/quadlets/pocket-id/pocket-id.container b/quadlets/pocket-id/pocket-id.container index 4e3b4e1..2ed7180 100644 --- a/quadlets/pocket-id/pocket-id.container +++ b/quadlets/pocket-id/pocket-id.container @@ -13,6 +13,7 @@ Image=ghcr.io/pocket-id/pocket-id ContainerName=pocket-id AutoUpdate=registry +Network=pocket-id.network HostName=pocket-id PublishPort=3000:80 diff --git a/quadlets/pocket-id/pocket-id.network b/quadlets/pocket-id/pocket-id.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/pocket-id/pocket-id.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/pointspend/pointspend.container b/quadlets/pointspend/pointspend.container index 1e340fc..e1fb412 100644 --- a/quadlets/pointspend/pointspend.container +++ b/quadlets/pointspend/pointspend.container @@ -13,13 +13,12 @@ TimeoutStartSec=900 WantedBy=default.target [Container] -# TODO: Is `latest` safe for this container? Image=docker.io/myanonamouse/pointspend:latest ContainerName=pointspend -HostName=pointspend AutoUpdate=registry -Network= +Network=container:gluetun +HostName=pointspend Environment=BUFFER=1000 Environment=WEDGEHOURS=0 diff --git a/quadlets/postiz/postiz-postgres.container b/quadlets/postiz/postiz-postgres.container index 7e81cef..7d42e14 100644 --- a/quadlets/postiz/postiz-postgres.container +++ b/quadlets/postiz/postiz-postgres.container @@ -13,7 +13,7 @@ Image=docker.io/postgres:17-alpine ContainerName=postiz-postgres AutoUpdate=registry -Network= +Network=postiz.network HostName=postiz-postgres Volume=postiz-db:/var/lib/postgresql/data diff --git a/quadlets/postiz/postiz-redis.container b/quadlets/postiz/postiz-redis.container index 507c5bf..0e400e0 100644 --- a/quadlets/postiz/postiz-redis.container +++ b/quadlets/postiz/postiz-redis.container @@ -13,7 +13,7 @@ Image=docker.io/redis:7.2 ContainerName=postiz-redis AutoUpdate=registry -Network= +Network=postiz.network HostName=postiz-redis Volume=postiz-redis-data:/data diff --git a/quadlets/postiz/postiz.container b/quadlets/postiz/postiz.container index 17055ca..965c319 100644 --- a/quadlets/postiz/postiz.container +++ b/quadlets/postiz/postiz.container @@ -17,7 +17,7 @@ Image=ghcr.io/gitroomhq/postiz-app:latest ContainerName=postiz AutoUpdate=registry -Network= +Network=postiz.network HostName=postiz PublishPort=5000:5000 diff --git a/quadlets/postiz/postiz.network b/quadlets/postiz/postiz.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/postiz/postiz.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/prometheus/prometheus.container b/quadlets/prometheus/prometheus.container index d25f073..3b10c2d 100644 --- a/quadlets/prometheus/prometheus.container +++ b/quadlets/prometheus/prometheus.container @@ -11,7 +11,9 @@ WantedBy=default.target [Container] Image=quay.io/prometheus/prometheus ContainerName=prometheus +AutoUpdate=registry +Network=prometheus.network HostName=prometheus PublishPort=9090:9090 diff --git a/quadlets/prometheus/data.volume b/quadlets/prometheus/prometheus.volume similarity index 100% rename from quadlets/prometheus/data.volume rename to quadlets/prometheus/prometheus.volume diff --git a/quadlets/protonmail-bridge/protonmail-bridge.container b/quadlets/protonmail-bridge/protonmail-bridge.container index 18dad3c..713854c 100644 --- a/quadlets/protonmail-bridge/protonmail-bridge.container +++ b/quadlets/protonmail-bridge/protonmail-bridge.container @@ -13,7 +13,9 @@ WantedBy=default.target [Container] Image=docker.io/shenxn/protonmail-bridge ContainerName=protonmail-bridge +AutoUpdate=registry +Network=protonmail-bridge.network HostName=protonmail-bridge PublishPort=1143:143/tcp PublishPort=1025:25/tcp diff --git a/quadlets/protonmail-bridge/protonmail-bridge.network b/quadlets/protonmail-bridge/protonmail-bridge.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/protonmail-bridge/protonmail-bridge.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/protonmail-bridge/data.volume b/quadlets/protonmail-bridge/protonmail-bridge.volume similarity index 100% rename from quadlets/protonmail-bridge/data.volume rename to quadlets/protonmail-bridge/protonmail-bridge.volume diff --git a/quadlets/prowlarr/prowlarr.container b/quadlets/prowlarr/prowlarr.container index 5e125e6..2795e4b 100644 --- a/quadlets/prowlarr/prowlarr.container +++ b/quadlets/prowlarr/prowlarr.container @@ -1,7 +1,6 @@ [Unit] Description=Manage indexers - [Service] Restart=on-failure TimeoutStartSec=900 @@ -12,10 +11,12 @@ WantedBy=default.target [Container] Image=ghcr.io/hotio/prowlarr ContainerName=prowlarr +AutoUpdate=registry + +Network=prowlarr.network HostName=prowlarr - -Volume=prowlarr-config:/config -Volume=/volumes/video:/data - PublishPort=9696 +Volume=prowlarr-config:/config +Volume=/path/to/video:/data + diff --git a/quadlets/prowlarr/prowlarr.network b/quadlets/prowlarr/prowlarr.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/prowlarr/prowlarr.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/prowlarr/config.volume b/quadlets/prowlarr/prowlarr.volume similarity index 100% rename from quadlets/prowlarr/config.volume rename to quadlets/prowlarr/prowlarr.volume diff --git a/quadlets/qbittorrent-port-forward-gluetun-server/qbittorrent-port-forward-gluetun-server.container b/quadlets/qbittorrent-port-forward-gluetun-server/qbittorrent-port-forward-gluetun-server.container index c6d4511..91b933d 100644 --- a/quadlets/qbittorrent-port-forward-gluetun-server/qbittorrent-port-forward-gluetun-server.container +++ b/quadlets/qbittorrent-port-forward-gluetun-server/qbittorrent-port-forward-gluetun-server.container @@ -13,14 +13,12 @@ TimeoutStartSec=900 WantedBy=default.target [Container] -# TODO: Replace this with one that has tags -# Probably have to repack my own Image=docker.io/mjmeli/qbittorrent-port-forward-gluetun-server:latest ContainerName=qbittorrent-port-forward-gluetun-server -HostName=qbittorrent-port-forward-gluetun-server AutoUpdate=registry -Network= +Network=container:gluetun +HostName=qbittorrent-port-forward-gluetun-server Environment=QBT_USERNAME=$qbt_user Environment=QBT_ADDR=http://localhost:8080 diff --git a/quadlets/qbittorrent/config.volume b/quadlets/qbittorrent/config.volume deleted file mode 100644 index 91dc6a8..0000000 --- a/quadlets/qbittorrent/config.volume +++ /dev/null @@ -1,3 +0,0 @@ -[Volume] -VolumeName=qbittorrent-config - diff --git a/quadlets/qbittorrent/qbittorrent.container b/quadlets/qbittorrent/qbittorrent.container index 4e4fc54..fdd8c94 100644 --- a/quadlets/qbittorrent/qbittorrent.container +++ b/quadlets/qbittorrent/qbittorrent.container @@ -1,7 +1,7 @@ [Unit] Description=qbittorrent client +Requires=gluetun.service After=gluetun.service -BindsTo=gluetun.service [Service] Restart=on-failure @@ -13,13 +13,15 @@ WantedBy=default.target [Container] Image=docker.io/qbittorrentofficial/qbittorrent-nox:$qbt_version ContainerName=qbittorrent -HostName=qbittorrent AutoUpdate=registry +Network=container:gluetun +HostName=qbittorrent + Volume=qbittorrent-config:/config Volume=qbittorrent-downloads:/downloads Environment=QBT_LEGAL_NOTICE=confirm Environment=QBT_VERSION=$qbt_version -Environment=TZ=$timezone +Environment=TZ=Etc/UTC diff --git a/quadlets/qbittorrent/downloads.volume b/quadlets/qbittorrent/qbittorrent.volume similarity index 57% rename from quadlets/qbittorrent/downloads.volume rename to quadlets/qbittorrent/qbittorrent.volume index 37c4bab..436b747 100644 --- a/quadlets/qbittorrent/downloads.volume +++ b/quadlets/qbittorrent/qbittorrent.volume @@ -1,2 +1,4 @@ [Volume] +VolumeName=qbittorrent-config VolumeName=qbittorrent-downloads + diff --git a/quadlets/radarr/radarr.container b/quadlets/radarr/radarr.container index 8ac717b..0c88429 100644 --- a/quadlets/radarr/radarr.container +++ b/quadlets/radarr/radarr.container @@ -1,7 +1,6 @@ [Unit] Description=Movie metadata manager - [Service] Restart=on-failure TimeoutStartSec=900 @@ -12,10 +11,11 @@ WantedBy=default.target [Container] Image=ghcr.io/hotio/radarr ContainerName=radarr +AutoUpdate=registry + +Network=radarr.network HostName=radarr - -Volume=radarr-config:/config -Volume=/volumes/media:/data - PublishPort=7878 +Volume=radarr-config:/config +Volume=/path/to/media:/data diff --git a/quadlets/radarr/radarr.network b/quadlets/radarr/radarr.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/radarr/radarr.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/radarr/config.volume b/quadlets/radarr/radarr.volume similarity index 100% rename from quadlets/radarr/config.volume rename to quadlets/radarr/radarr.volume diff --git a/quadlets/seedboxapi/seedboxapi.container b/quadlets/seedboxapi/seedboxapi.container index 1f82b9b..fc37da0 100644 --- a/quadlets/seedboxapi/seedboxapi.container +++ b/quadlets/seedboxapi/seedboxapi.container @@ -13,13 +13,12 @@ TimeoutStartSec=900 WantedBy=default.target [Container] -# TODO: Is `latest` safe for this container? Image=docker.io/myanonamouse/seedboxapi:latest ContainerName=seedboxapi -HostName=seedboxapi AutoUpdate=registry -Network= +Network=container:gluetun +HostName=seedboxapi Volume=/volumes/books/seedboxapi/config:/config diff --git a/quadlets/snowflake/snowflake.container b/quadlets/snowflake/snowflake.container index f80320a..79599fd 100644 --- a/quadlets/snowflake/snowflake.container +++ b/quadlets/snowflake/snowflake.container @@ -11,4 +11,7 @@ WantedBy=default.target [Container] Image=docker.io/thetorproject/snowflake-proxy ContainerName=snowflake +AutoUpdate=registry + +Network=snowflake.container HostName=snowflake diff --git a/quadlets/snowflake/snowflake.network b/quadlets/snowflake/snowflake.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/snowflake/snowflake.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/sonarr/sonarr.container b/quadlets/sonarr/sonarr.container index da6f3ae..8637fa8 100644 --- a/quadlets/sonarr/sonarr.container +++ b/quadlets/sonarr/sonarr.container @@ -1,7 +1,6 @@ [Unit] Description=TV show metadata manager - [Service] Restart=on-failure TimeoutStartSec=900 @@ -12,10 +11,10 @@ WantedBy=default.target [Container] Image=ghcr.io/hotio/sonarr ContainerName=sonarr + +Network=sonarr.network HostName=sonarr +PublishPort=8989 Volume=sonarr-config:/config Volume=/volumes/media:/data - -PublishPort=8989 - diff --git a/quadlets/sonarr/sonarr.network b/quadlets/sonarr/sonarr.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/sonarr/sonarr.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/sonarr/config.volume b/quadlets/sonarr/sonarr.volume similarity index 100% rename from quadlets/sonarr/config.volume rename to quadlets/sonarr/sonarr.volume diff --git a/quadlets/stirlingPDF/stirlingPDF.container b/quadlets/stirlingPDF/stirlingpdf.container similarity index 91% rename from quadlets/stirlingPDF/stirlingPDF.container rename to quadlets/stirlingPDF/stirlingpdf.container index a603437..60d692d 100644 --- a/quadlets/stirlingPDF/stirlingPDF.container +++ b/quadlets/stirlingPDF/stirlingpdf.container @@ -1,7 +1,6 @@ [Unit] Description=StirlingPDF - [Service] Restart=always TimeoutStartSec=900 @@ -12,9 +11,10 @@ WantedBy= default.target [Container] Image=docker.io/frooodle/s-pdf:latest ContainerName=stirlingPDF -HostName=stirlingPDF +AutoUpdate=registry -Network= +Network=stirlingpdf.network +HostName=stirlingPDF Volume=/volumes/stirlingPDF/usr/share/tesseract-ocr/5/tessdata:/usr/share/tesseract-ocr/5/tessdata Volume=/volumes/stirlingPDF/configs:/configs diff --git a/quadlets/stirlingPDF/stirlingpdf.network b/quadlets/stirlingPDF/stirlingpdf.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/stirlingPDF/stirlingpdf.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/syslog-ng/syslog-ng.container b/quadlets/syslog-ng/syslog-ng.container index 8dd6c81..568dcbe 100644 --- a/quadlets/syslog-ng/syslog-ng.container +++ b/quadlets/syslog-ng/syslog-ng.container @@ -13,7 +13,7 @@ Image=lscr.io/linuxserver/syslog-ng:latest ContainerName=syslog-ng AutoUpdate=registry -Network= +Network=syslog-ng.network HostName=syslog-ng PublishPort=514:5514/udp PublishPort=601:6601/tcp diff --git a/quadlets/syslog-ng/syslog-ng.network b/quadlets/syslog-ng/syslog-ng.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/syslog-ng/syslog-ng.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/tandoor/tandoor-db.container b/quadlets/tandoor/tandoor-db.container index ea17836..2040a0b 100644 --- a/quadlets/tandoor/tandoor-db.container +++ b/quadlets/tandoor/tandoor-db.container @@ -12,6 +12,9 @@ WantedBy=default.target [Container] Image=docker.io/postgres:16-alpine ContainerName=tandoor-db +AutoUpdate=registry + +Network=tandoor.network HostName=tandoor-db Volume=tandoor-db:/var/lib/postgresql/data diff --git a/quadlets/tandoor/tandoor-db.volume b/quadlets/tandoor/tandoor-db.volume deleted file mode 100644 index 2233f50..0000000 --- a/quadlets/tandoor/tandoor-db.volume +++ /dev/null @@ -1,3 +0,0 @@ -[Volume] -VolumeName=tandoor-db - diff --git a/quadlets/tandoor/tandoor-media.volume b/quadlets/tandoor/tandoor-media.volume deleted file mode 100644 index c2e7fd7..0000000 --- a/quadlets/tandoor/tandoor-media.volume +++ /dev/null @@ -1,3 +0,0 @@ -[Volume] -VolumeName=tandoor-media - diff --git a/quadlets/tandoor/tandoor-nginx-config.volume b/quadlets/tandoor/tandoor-nginx-config.volume deleted file mode 100644 index 04df63d..0000000 --- a/quadlets/tandoor/tandoor-nginx-config.volume +++ /dev/null @@ -1,3 +0,0 @@ -[Volume] -VolumeName=tandoor-nginx-config - diff --git a/quadlets/tandoor/tandoor-nginx.container b/quadlets/tandoor/tandoor-nginx.container index 0dc5d70..6677c80 100644 --- a/quadlets/tandoor/tandoor-nginx.container +++ b/quadlets/tandoor/tandoor-nginx.container @@ -13,9 +13,10 @@ WantedBy=default.target [Container] Image=docker.io/nginx:mainline-alpine ContainerName=tandoor-nginx -HostName=tandoor-nginx +AutoUpdate=registry -Network=protonvpn.network +Network=tandoor.network +HostName=tandoor-nginx Volume=tandoor-nginx-config:/etc/nginx/conf.d Volume=tandoor-static:/static diff --git a/quadlets/tandoor/tandoor-static.volume b/quadlets/tandoor/tandoor-static.volume deleted file mode 100644 index 05dc534..0000000 --- a/quadlets/tandoor/tandoor-static.volume +++ /dev/null @@ -1,3 +0,0 @@ -[Volume] -VolumeName=tandoor-static - diff --git a/quadlets/tandoor/tandoor.container b/quadlets/tandoor/tandoor.container index afb2f05..f6a4025 100644 --- a/quadlets/tandoor/tandoor.container +++ b/quadlets/tandoor/tandoor.container @@ -15,12 +15,15 @@ WantedBy=default.target [Container] Image=docker.io/vabene1111/recipes ContainerName=tandoor +AutoUpdate=registry + +Network=tandoor.network HostName=tandoor +EnvironmentFile=tandoor.env + Volume=tandoor-db:/var/lib/postgresql/data Volume=tandoor-static:/opt/recipes/staticfiles Volume=tandoor-media:/opt/recipes/mediafiles Volume=tandoor-external:/opt/recipes/externalfiles Volume=tandoor-nginx-config:/opt/recipes/nginx/conf.d - -EnvironmentFile=tandoor.env diff --git a/quadlets/tandoor/tandoor.network b/quadlets/tandoor/tandoor.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/tandoor/tandoor.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/tandoor/tandoor.volume b/quadlets/tandoor/tandoor.volume new file mode 100644 index 0000000..4b038b6 --- /dev/null +++ b/quadlets/tandoor/tandoor.volume @@ -0,0 +1,6 @@ +[Volume] +VolumeName=tandoor-static +VolumeName=tandoor-nginx-config +VolumeName=tandoor-media +VolumeName=tandoor-db + diff --git a/quadlets/termix/termix.container b/quadlets/termix/termix.container index d9f0ce8..ca53190 100644 --- a/quadlets/termix/termix.container +++ b/quadlets/termix/termix.container @@ -11,8 +11,9 @@ WantedBy=default.target [Container] Image=ghcr.io/lukegus/termix:latest ContainerName=termix +AutoUpdate=registry -Network= +Network=termix.network HostName=termix PublishPort=8080:8080 diff --git a/quadlets/termix/termix.network b/quadlets/termix/termix.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/termix/termix.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/termix/termix-db.volume b/quadlets/termix/termix.volume similarity index 100% rename from quadlets/termix/termix-db.volume rename to quadlets/termix/termix.volume diff --git a/quadlets/thelounge/thelounge.container b/quadlets/thelounge/thelounge.container index 0a89fa3..c9b183d 100644 --- a/quadlets/thelounge/thelounge.container +++ b/quadlets/thelounge/thelounge.container @@ -11,9 +11,10 @@ WantedBy=default.target [Container] Image=ghcr.io/thelounge/thelounge:latest ContainerName=thelounge -HostName=thelounge AutoUpdate=registry +Network=thelounge.network +HostName=thelounge PublishPort=9000 Volume=thelounge-data:/var/opt/thelounge diff --git a/quadlets/thelounge/thelounge.network b/quadlets/thelounge/thelounge.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/thelounge/thelounge.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/thelounge/data.volume b/quadlets/thelounge/thelounge.volume similarity index 100% rename from quadlets/thelounge/data.volume rename to quadlets/thelounge/thelounge.volume diff --git a/quadlets/traggo/traggo.container b/quadlets/traggo/traggo.container index 795e7d7..fa07b8f 100644 --- a/quadlets/traggo/traggo.container +++ b/quadlets/traggo/traggo.container @@ -1,7 +1,6 @@ [Unit] Description=Tag-based time tracking - [Service] Restart=on-failure TimeoutStartSec=900 @@ -12,9 +11,10 @@ WantedBy=default.target [Container] Image=docker.io/traggo/server:latest ContainerName=traggo -HostName=traggo +AutoUpdate=registry -Network= +Network=traggo.network +HostName=traggo Volume=/volumes/traggo/opt/traggo/data:/opt/traggo/data diff --git a/quadlets/traggo/traggo.network b/quadlets/traggo/traggo.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/traggo/traggo.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/vaultwarden/vaultwarden.container b/quadlets/vaultwarden/vaultwarden.container index dcd62d0..70a0a95 100644 --- a/quadlets/vaultwarden/vaultwarden.container +++ b/quadlets/vaultwarden/vaultwarden.container @@ -13,6 +13,7 @@ Image=docker.io/vaultwarden/server:latest ContainerName=vaultwarden AutoUpdate=registry +Network=vaultwarden.network HostName=vaultwarden PublishPort=80:80 diff --git a/quadlets/vaultwarden/vaultwarden.network b/quadlets/vaultwarden/vaultwarden.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/vaultwarden/vaultwarden.network @@ -0,0 +1 @@ +[Network] diff --git a/quadlets/weechat/weechat.container b/quadlets/weechat/weechat.container index 16d38ed..56be589 100644 --- a/quadlets/weechat/weechat.container +++ b/quadlets/weechat/weechat.container @@ -11,12 +11,15 @@ WantedBy=default.target [Container] Image=docker.io/weechat/weechat:latest-alpine-slim ContainerName=weechat -HostName=weechat AutoUpdate=registry +Network=weechat.network +HostName=weechat + Volume=/volumes/books/weechat/home/user:/home/user # FIXME: Better way to attach stdin and tty. Quadlets don't seem to support -# this, probably because attaching to containers is weirder than `exec sh` into -# it +# this well, probably because attaching to containers is weirder than `exec sh` +# into it. This works the first time, but detaching doesn't work right and +# reattaching a second time is pretty broken PodmanArgs=-a stdin --tty=true diff --git a/quadlets/weechat/weechat.network b/quadlets/weechat/weechat.network new file mode 100644 index 0000000..264f70a --- /dev/null +++ b/quadlets/weechat/weechat.network @@ -0,0 +1 @@ +[Network]