From 990eab4cbe7211cc74d19c54977e5e5fcb9cfd43 Mon Sep 17 00:00:00 2001 From: redbeardymcgee Date: Tue, 10 Dec 2024 15:21:43 -0600 Subject: [PATCH] wip: tandoor fix: corrected volumes and host/container name fix: remove extra container fix: correct volumes and dependencies --- README.md | 1 + quadlets/tandoor/tandoor-db.container | 19 ++++++++++++++++ quadlets/tandoor/tandoor-db.volume | 3 +++ quadlets/tandoor/tandoor-media.volume | 3 +++ quadlets/tandoor/tandoor-nginx-config.volume | 3 +++ quadlets/tandoor/tandoor-static.volume | 3 +++ quadlets/tandoor/tandoor.container | 24 ++++++++++++++++++++ quadlets/tandoor/tandoor.env | 18 +++++++++++++++ 8 files changed, 74 insertions(+) create mode 100644 quadlets/tandoor/tandoor-db.container create mode 100644 quadlets/tandoor/tandoor-db.volume create mode 100644 quadlets/tandoor/tandoor-media.volume create mode 100644 quadlets/tandoor/tandoor-nginx-config.volume create mode 100644 quadlets/tandoor/tandoor-static.volume create mode 100644 quadlets/tandoor/tandoor.container create mode 100644 quadlets/tandoor/tandoor.env diff --git a/README.md b/README.md index d8c4226..74cb472 100644 --- a/README.md +++ b/README.md @@ -208,6 +208,7 @@ that I intend to add to this repository. It is still growing, and I welcome - [x] [Sonarr](https://sonarr.tv) - [x] [Stirling PDF](https://stirlingpdf.io) - [ ] [Supervisord](http://supervisord.org/) +- [ ] [TandoorRecipes](https://github.com/TandoorRecipes/recipes) - [x] [traggo](https://traggo.net) - [ ] [Ubooquity](https://vaemendis.net/ubooquity/) - [ ] [UrBackup](https://urbackup.org) diff --git a/quadlets/tandoor/tandoor-db.container b/quadlets/tandoor/tandoor-db.container new file mode 100644 index 0000000..ea17836 --- /dev/null +++ b/quadlets/tandoor/tandoor-db.container @@ -0,0 +1,19 @@ +[Unit] +Description=Tandoor postgres +Wants=tandoor.service + +[Service] +Restart=on-failure +TimeoutStartSec=900 + +[Install] +WantedBy=default.target + +[Container] +Image=docker.io/postgres:16-alpine +ContainerName=tandoor-db +HostName=tandoor-db + +Volume=tandoor-db:/var/lib/postgresql/data + +EnvironmentFile=tandoor.env diff --git a/quadlets/tandoor/tandoor-db.volume b/quadlets/tandoor/tandoor-db.volume new file mode 100644 index 0000000..2233f50 --- /dev/null +++ b/quadlets/tandoor/tandoor-db.volume @@ -0,0 +1,3 @@ +[Volume] +VolumeName=tandoor-db + diff --git a/quadlets/tandoor/tandoor-media.volume b/quadlets/tandoor/tandoor-media.volume new file mode 100644 index 0000000..c2e7fd7 --- /dev/null +++ b/quadlets/tandoor/tandoor-media.volume @@ -0,0 +1,3 @@ +[Volume] +VolumeName=tandoor-media + diff --git a/quadlets/tandoor/tandoor-nginx-config.volume b/quadlets/tandoor/tandoor-nginx-config.volume new file mode 100644 index 0000000..04df63d --- /dev/null +++ b/quadlets/tandoor/tandoor-nginx-config.volume @@ -0,0 +1,3 @@ +[Volume] +VolumeName=tandoor-nginx-config + diff --git a/quadlets/tandoor/tandoor-static.volume b/quadlets/tandoor/tandoor-static.volume new file mode 100644 index 0000000..05dc534 --- /dev/null +++ b/quadlets/tandoor/tandoor-static.volume @@ -0,0 +1,3 @@ +[Volume] +VolumeName=tandoor-static + diff --git a/quadlets/tandoor/tandoor.container b/quadlets/tandoor/tandoor.container new file mode 100644 index 0000000..e14abc4 --- /dev/null +++ b/quadlets/tandoor/tandoor.container @@ -0,0 +1,24 @@ +[Unit] +Description=Tandoor +Requires=tandoor-db.service +After=tandoor-db.service + +[Service] +Restart=on-failure +TimeoutStartSec=900 + +[Install] +WantedBy=default.target + +[Container] +Image=docker.io/vabene1111/recipes +ContainerName=tandoor +HostName=tandoor + +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.env b/quadlets/tandoor/tandoor.env new file mode 100644 index 0000000..0b37c05 --- /dev/null +++ b/quadlets/tandoor/tandoor.env @@ -0,0 +1,18 @@ +# --------------------------------------------------------------------------- +# This template contains only required options. +# Visit the docs to find more https://docs.tandoor.dev/system/configuration/ +# --------------------------------------------------------------------------- + +# random secret key, use for example `base64 /dev/urandom | head -c50` to generate one +SECRET_KEY= + +# allowed hosts (see documentation), should be set to your hostname(s) but might be * (default) for some proxies/providers +# ALLOWED_HOSTS=recipes.mydomain.com + +# add only a database password if you want to run with the default postgres, otherwise change settings accordingly +DB_ENGINE=django.db.backends.postgresql +POSTGRES_HOST=db_recipes +POSTGRES_DB=djangodb +POSTGRES_PORT=5432 +POSTGRES_USER=djangouser +POSTGRES_PASSWORD=