From 361fc4acfde4057965eabdf004251a53427d7506 Mon Sep 17 00:00:00 2001 From: smilerz Date: Mon, 30 Oct 2023 15:00:16 -0500 Subject: [PATCH 01/16] add tandoor container --- compose/.apps/tandoor/tandoor.aarch64.yml | 3 +++ compose/.apps/tandoor/tandoor.hostname.yml | 3 +++ compose/.apps/tandoor/tandoor.labels.yml | 12 ++++++++++++ compose/.apps/tandoor/tandoor.netmode.yml | 3 +++ compose/.apps/tandoor/tandoor.ports.yml | 4 ++++ compose/.apps/tandoor/tandoor.x86_64.yml | 3 +++ compose/.apps/tandoor/tandoor.yml | 18 ++++++++++++++++++ docs/apps/tandoor.md | 17 +++++++++++++++++ mkdocs.yml | 1 + 9 files changed, 64 insertions(+) create mode 100755 compose/.apps/tandoor/tandoor.aarch64.yml create mode 100755 compose/.apps/tandoor/tandoor.hostname.yml create mode 100755 compose/.apps/tandoor/tandoor.labels.yml create mode 100755 compose/.apps/tandoor/tandoor.netmode.yml create mode 100755 compose/.apps/tandoor/tandoor.ports.yml create mode 100755 compose/.apps/tandoor/tandoor.x86_64.yml create mode 100755 compose/.apps/tandoor/tandoor.yml create mode 100644 docs/apps/tandoor.md diff --git a/compose/.apps/tandoor/tandoor.aarch64.yml b/compose/.apps/tandoor/tandoor.aarch64.yml new file mode 100755 index 0000000000..4bd4e3dcd2 --- /dev/null +++ b/compose/.apps/tandoor/tandoor.aarch64.yml @@ -0,0 +1,3 @@ +services: + tandoor: + image: docker.io/vabene1111/recipes:${POSTGRES_TAG} diff --git a/compose/.apps/tandoor/tandoor.hostname.yml b/compose/.apps/tandoor/tandoor.hostname.yml new file mode 100755 index 0000000000..87e94cb6bd --- /dev/null +++ b/compose/.apps/tandoor/tandoor.hostname.yml @@ -0,0 +1,3 @@ +services: + tandoor: + hostname: ${DOCKERHOSTNAME} diff --git a/compose/.apps/tandoor/tandoor.labels.yml b/compose/.apps/tandoor/tandoor.labels.yml new file mode 100755 index 0000000000..85620d7769 --- /dev/null +++ b/compose/.apps/tandoor/tandoor.labels.yml @@ -0,0 +1,12 @@ +services: + tandoor: + labels: + com.dockstarter.appinfo.deprecated: "false" + com.dockstarter.appinfo.description: "The recipe manager that allows you to manage your ever growing collection of digital recipes." + com.dockstarter.appinfo.nicename: "Tandoor" + com.dockstarter.appvars.tandoor: "false" + com.dockstarter.appvars.tandoor_network_mode: "" + com.dockstarter.appvars.tandoor_secret_key: "change_me" + com.dockstarter.appvars.tandoor_port_8080: "8080" + com.dockstarter.appvars.tandoor_restart: "unless-stopped" + com.dockstarter.appvars.tandoor_tag: "latest" diff --git a/compose/.apps/tandoor/tandoor.netmode.yml b/compose/.apps/tandoor/tandoor.netmode.yml new file mode 100755 index 0000000000..16efeae28f --- /dev/null +++ b/compose/.apps/tandoor/tandoor.netmode.yml @@ -0,0 +1,3 @@ +services: + tandoor: + network_mode: ${TANDOOR_NETWORK_MODE} diff --git a/compose/.apps/tandoor/tandoor.ports.yml b/compose/.apps/tandoor/tandoor.ports.yml new file mode 100755 index 0000000000..86d1ea247d --- /dev/null +++ b/compose/.apps/tandoor/tandoor.ports.yml @@ -0,0 +1,4 @@ +services: + tandoor: + ports: + - ${TANDOOR_PORT_8080}:8080 diff --git a/compose/.apps/tandoor/tandoor.x86_64.yml b/compose/.apps/tandoor/tandoor.x86_64.yml new file mode 100755 index 0000000000..ad8658e08b --- /dev/null +++ b/compose/.apps/tandoor/tandoor.x86_64.yml @@ -0,0 +1,3 @@ +services: + tandoor: + image: docker.io/vabene1111/recipes:${TANDOOR_TAG} diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml new file mode 100755 index 0000000000..111a4e6700 --- /dev/null +++ b/compose/.apps/tandoor/tandoor.yml @@ -0,0 +1,18 @@ +services: + postgres: + container_name: tandoor + environment: + - SECRET_KEY=${TANDOOR_SECRET_KEY} + - TZ=${TZ} + - TIMEZONE=${TZ} + logging: + driver: json-file + options: + max-file: ${DOCKERLOGGING_MAXFILE} + max-size: ${DOCKERLOGGING_MAXSIZE} + restart: ${TANDOOR_RESTART} + volumes: + - /etc/localtime:/etc/localtime:ro + - ${DOCKERCONFDIR}/tandoor/staticfiles:/opt/recipes/staticfiles + - ${DOCKERCONFDIR}/tandoor/mediafiles:/opt/recipes/mediafiles + - ${DOCKERSTORAGEDIR}:/storage diff --git a/docs/apps/tandoor.md b/docs/apps/tandoor.md new file mode 100644 index 0000000000..208335967d --- /dev/null +++ b/docs/apps/tandoor.md @@ -0,0 +1,17 @@ +# Sonarr + +[![Docker Pulls](https://img.shields.io/docker/pulls/vabene1111/recipes?style=flat-square&color=607D8B&label=docker%20pulls&logo=docker)](https://hub.docker.com/r/vabene1111/recipes) +[![GitHub Stars](https://img.shields.io/github/stars//vabene1111/recipes?style=flat-square&color=607D8B&label=github%20stars&logo=github)](https://github.com//vabene1111/recipes) +[![Compose Templates](https://img.shields.io/static/v1?style=flat-square&color=607D8B&label=compose&message=templates)](https://github.com/GhostWriters/DockSTARTer/tree/master/compose/.apps/tandoor) + +## Description + +[Tandoor](https://docs.tandoor.dev/) is a recipe manager and so much more. +You can import recipes from thousands of websites, generate mealplans, manage your shopping list. +Share and collaborate with your friends and family using a mobile friendly web interface. + +## Install/Setup + +This application does not have any specific setup instructions documented. If +you need assistance setting up this application please visit our +[support page](https://dockstarter.com/basics/support/). diff --git a/mkdocs.yml b/mkdocs.yml index 244384e7d7..8b33a42307 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -234,6 +234,7 @@ nav: - apps/swag.md - apps/synclounge.md - apps/syncthing.md + - apps/tandoor.md - apps/tautulli.md - apps/tdarr.md - apps/tdarrnode.md From c69b93211e4538af068a112915ac8d6b392f504c Mon Sep 17 00:00:00 2001 From: smilerz Date: Mon, 30 Oct 2023 16:27:11 -0500 Subject: [PATCH 02/16] added allowed_hosts variable --- compose/.apps/tandoor/tandoor.labels.yml | 1 + compose/.apps/tandoor/tandoor.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/compose/.apps/tandoor/tandoor.labels.yml b/compose/.apps/tandoor/tandoor.labels.yml index 85620d7769..c3f982bba3 100755 --- a/compose/.apps/tandoor/tandoor.labels.yml +++ b/compose/.apps/tandoor/tandoor.labels.yml @@ -7,6 +7,7 @@ services: com.dockstarter.appvars.tandoor: "false" com.dockstarter.appvars.tandoor_network_mode: "" com.dockstarter.appvars.tandoor_secret_key: "change_me" + com.dockstarter.appvars.tandoor_allowed_hosts: "*" com.dockstarter.appvars.tandoor_port_8080: "8080" com.dockstarter.appvars.tandoor_restart: "unless-stopped" com.dockstarter.appvars.tandoor_tag: "latest" diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml index 111a4e6700..065ff7ff0b 100755 --- a/compose/.apps/tandoor/tandoor.yml +++ b/compose/.apps/tandoor/tandoor.yml @@ -3,6 +3,7 @@ services: container_name: tandoor environment: - SECRET_KEY=${TANDOOR_SECRET_KEY} + - ALLOWED_HOSTS=${TANDOOR_ALLOWED_HOSTS} - TZ=${TZ} - TIMEZONE=${TZ} logging: From 682d13a837e04ac7c5501e1c0eebecf02ffe36c9 Mon Sep 17 00:00:00 2001 From: smilerz Date: Mon, 30 Oct 2023 16:30:32 -0500 Subject: [PATCH 03/16] fixed tandoor_enabled label --- compose/.apps/tandoor/tandoor.labels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/.apps/tandoor/tandoor.labels.yml b/compose/.apps/tandoor/tandoor.labels.yml index c3f982bba3..93e469f834 100755 --- a/compose/.apps/tandoor/tandoor.labels.yml +++ b/compose/.apps/tandoor/tandoor.labels.yml @@ -4,7 +4,7 @@ services: com.dockstarter.appinfo.deprecated: "false" com.dockstarter.appinfo.description: "The recipe manager that allows you to manage your ever growing collection of digital recipes." com.dockstarter.appinfo.nicename: "Tandoor" - com.dockstarter.appvars.tandoor: "false" + com.dockstarter.appvars.tandoor_enabled: "false" com.dockstarter.appvars.tandoor_network_mode: "" com.dockstarter.appvars.tandoor_secret_key: "change_me" com.dockstarter.appvars.tandoor_allowed_hosts: "*" From 319cf122dc57de0910223251225138eceffd1afe Mon Sep 17 00:00:00 2001 From: smilerz Date: Mon, 30 Oct 2023 16:57:26 -0500 Subject: [PATCH 04/16] set db engine --- compose/.apps/tandoor/tandoor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml index 065ff7ff0b..41a6068336 100755 --- a/compose/.apps/tandoor/tandoor.yml +++ b/compose/.apps/tandoor/tandoor.yml @@ -1,9 +1,11 @@ services: - postgres: + tandoor: container_name: tandoor environment: - SECRET_KEY=${TANDOOR_SECRET_KEY} - ALLOWED_HOSTS=${TANDOOR_ALLOWED_HOSTS} + - DB_ENGINE=django.db.backends.sqlite3 + - GUNICORN_MEDIA=1 - TZ=${TZ} - TIMEZONE=${TZ} logging: From cf85d9574e1d41dec476de5fa62d115f9ee9218b Mon Sep 17 00:00:00 2001 From: smilerz Date: Mon, 30 Oct 2023 17:42:41 -0500 Subject: [PATCH 05/16] map sqlite to host --- compose/.apps/tandoor/tandoor.yml | 1 + docs/apps/tandoor.md | 30 +++++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml index 41a6068336..aa948ee6f0 100755 --- a/compose/.apps/tandoor/tandoor.yml +++ b/compose/.apps/tandoor/tandoor.yml @@ -18,4 +18,5 @@ services: - /etc/localtime:/etc/localtime:ro - ${DOCKERCONFDIR}/tandoor/staticfiles:/opt/recipes/staticfiles - ${DOCKERCONFDIR}/tandoor/mediafiles:/opt/recipes/mediafiles + - ${DOCKERCONFDIR}/tandoor/db.sqlite3:/opt/recipes/db.sqlite3 - ${DOCKERSTORAGEDIR}:/storage diff --git a/docs/apps/tandoor.md b/docs/apps/tandoor.md index 208335967d..d87ce62be1 100644 --- a/docs/apps/tandoor.md +++ b/docs/apps/tandoor.md @@ -12,6 +12,30 @@ Share and collaborate with your friends and family using a mobile friendly web i ## Install/Setup -This application does not have any specific setup instructions documented. If -you need assistance setting up this application please visit our -[support page](https://dockstarter.com/basics/support/). +This application has extensive customization options, most docker env variables are documented in the [.env.template](https://raw.githubusercontent.com/vabene1111/recipes/master/.env.template) +If you run into any issues, enable debug mode to collect logs before opening a ticket. +``` + tandoor: + environment: + - DEBUG=1 +``` + +### Running with PostgreSQL +It is highly recommended to use this application with a PostgreSQL database. +To setup with postgres, after installing a postgres server (or enabling the DockSTARTer app) create a database and edit docker-compose.override.yml similar to below. +``` + tandoor: + environment: + - DB_ENGINE=django.db.backends.postgresql + - POSTGRES_HOST=postgres + - POSTGRES_PORT=5432 + - POSTGRES_USER=tandoor_user + - POSTGRES_PASSWORD=tandoor_user_password + - POSTGRES_DB=tandoor_db + depends_on: //optional: if using a postgres container + - db_recipes +``` + +### Running with SWAG +It is also highly recommended to serve media files with a web server. If you are already using SWAG you can use nginx to accomplish this. +Edit the docker-compose.override.yml similar to below. From 5114b410822ecc744c7468e9ccd093e39d0690bf Mon Sep 17 00:00:00 2001 From: smilerz Date: Mon, 30 Oct 2023 22:08:42 -0500 Subject: [PATCH 06/16] moved sqlite db to host --- compose/.apps/tandoor/tandoor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml index aa948ee6f0..b03b522c5e 100755 --- a/compose/.apps/tandoor/tandoor.yml +++ b/compose/.apps/tandoor/tandoor.yml @@ -4,7 +4,7 @@ services: environment: - SECRET_KEY=${TANDOOR_SECRET_KEY} - ALLOWED_HOSTS=${TANDOOR_ALLOWED_HOSTS} - - DB_ENGINE=django.db.backends.sqlite3 + - DATABASE_URL=sqlite://localhost/data/db.sqlite3 - GUNICORN_MEDIA=1 - TZ=${TZ} - TIMEZONE=${TZ} @@ -18,5 +18,5 @@ services: - /etc/localtime:/etc/localtime:ro - ${DOCKERCONFDIR}/tandoor/staticfiles:/opt/recipes/staticfiles - ${DOCKERCONFDIR}/tandoor/mediafiles:/opt/recipes/mediafiles - - ${DOCKERCONFDIR}/tandoor/db.sqlite3:/opt/recipes/db.sqlite3 + - ${DOCKERCONFDIR}/tandoor/data:/opt/recipes/data - ${DOCKERSTORAGEDIR}:/storage From a8a2a6ce1b5d3bc39c9a15c313741f9de18a959e Mon Sep 17 00:00:00 2001 From: smilerz Date: Wed, 1 Nov 2023 20:53:40 -0500 Subject: [PATCH 07/16] instructions for settings up with postgres and nginx --- compose/.apps/tandoor/tandoor.yml | 4 ++++ docs/apps/tandoor.md | 20 +++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml index b03b522c5e..52141c5fde 100755 --- a/compose/.apps/tandoor/tandoor.yml +++ b/compose/.apps/tandoor/tandoor.yml @@ -20,3 +20,7 @@ services: - ${DOCKERCONFDIR}/tandoor/mediafiles:/opt/recipes/mediafiles - ${DOCKERCONFDIR}/tandoor/data:/opt/recipes/data - ${DOCKERSTORAGEDIR}:/storage + + +## TODO +- test add remove with swag -> update documentation diff --git a/docs/apps/tandoor.md b/docs/apps/tandoor.md index d87ce62be1..02acf84cb1 100644 --- a/docs/apps/tandoor.md +++ b/docs/apps/tandoor.md @@ -26,16 +26,22 @@ To setup with postgres, after installing a postgres server (or enabling the Dock ``` tandoor: environment: - - DB_ENGINE=django.db.backends.postgresql - - POSTGRES_HOST=postgres - - POSTGRES_PORT=5432 - - POSTGRES_USER=tandoor_user - - POSTGRES_PASSWORD=tandoor_user_password - - POSTGRES_DB=tandoor_db + - DATABASE_URL=postgresql://tandoor_user:tandoor_user_password@postgres_host/tandoor_db:5432 depends_on: //optional: if using a postgres container - - db_recipes + - postgres_host ``` ### Running with SWAG It is also highly recommended to serve media files with a web server. If you are already using SWAG you can use nginx to accomplish this. Edit the docker-compose.override.yml similar to below. + +``` + tandoor: + environment: + - GUNICORN_MEDIA=0 + swag: + volumes: + - ${DOCKERCONFDIR}/recipes/mediafiles:/media +``` + +Copy `swag/nginx/proxy-confs/recipes.subdomain.conf.sample` to recipes.subdomain.conf editing as necessary to match your setup and restart swag. From 7d50b1dcede15853c4d960b79675625e755e085f Mon Sep 17 00:00:00 2001 From: smilerz Date: Fri, 3 Nov 2023 09:02:14 -0500 Subject: [PATCH 08/16] move DATABASE_URL to labels --- compose/.apps/tandoor/tandoor.labels.yml | 1 + compose/.apps/tandoor/tandoor.yml | 2 +- docs/apps/tandoor.md | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/compose/.apps/tandoor/tandoor.labels.yml b/compose/.apps/tandoor/tandoor.labels.yml index 93e469f834..e1bb7b54c3 100755 --- a/compose/.apps/tandoor/tandoor.labels.yml +++ b/compose/.apps/tandoor/tandoor.labels.yml @@ -8,6 +8,7 @@ services: com.dockstarter.appvars.tandoor_network_mode: "" com.dockstarter.appvars.tandoor_secret_key: "change_me" com.dockstarter.appvars.tandoor_allowed_hosts: "*" + com.dockstarter.appvars.tandoor_database_url: "sqlite://localhost/data/db.sqlite3" com.dockstarter.appvars.tandoor_port_8080: "8080" com.dockstarter.appvars.tandoor_restart: "unless-stopped" com.dockstarter.appvars.tandoor_tag: "latest" diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml index 52141c5fde..6ba975218a 100755 --- a/compose/.apps/tandoor/tandoor.yml +++ b/compose/.apps/tandoor/tandoor.yml @@ -4,7 +4,7 @@ services: environment: - SECRET_KEY=${TANDOOR_SECRET_KEY} - ALLOWED_HOSTS=${TANDOOR_ALLOWED_HOSTS} - - DATABASE_URL=sqlite://localhost/data/db.sqlite3 + - DATABASE_URL=${TANDOOR_DATABASE_URL} - GUNICORN_MEDIA=1 - TZ=${TZ} - TIMEZONE=${TZ} diff --git a/docs/apps/tandoor.md b/docs/apps/tandoor.md index 02acf84cb1..6cd20067cc 100644 --- a/docs/apps/tandoor.md +++ b/docs/apps/tandoor.md @@ -22,12 +22,13 @@ If you run into any issues, enable debug mode to collect logs before opening a t ### Running with PostgreSQL It is highly recommended to use this application with a PostgreSQL database. -To setup with postgres, after installing a postgres server (or enabling the DockSTARTer app) create a database and edit docker-compose.override.yml similar to below. +To setup with postgres, after installing a postgres server (or enabling the DockSTARTer app) create a database and edit .env to use postgres instead of sqlite. +`postgresql://:@/:5432` + +Optionally, make tandoor dependent on the postgres container ``` tandoor: - environment: - - DATABASE_URL=postgresql://tandoor_user:tandoor_user_password@postgres_host/tandoor_db:5432 - depends_on: //optional: if using a postgres container + depends_on: - postgres_host ``` From 06cff6b1fa437520de68c674a8a143d976166e21 Mon Sep 17 00:00:00 2001 From: smilerz Date: Fri, 3 Nov 2023 09:32:15 -0500 Subject: [PATCH 09/16] Update tandoor.md --- docs/apps/tandoor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/apps/tandoor.md b/docs/apps/tandoor.md index 6cd20067cc..cac6230b41 100644 --- a/docs/apps/tandoor.md +++ b/docs/apps/tandoor.md @@ -23,7 +23,7 @@ If you run into any issues, enable debug mode to collect logs before opening a t ### Running with PostgreSQL It is highly recommended to use this application with a PostgreSQL database. To setup with postgres, after installing a postgres server (or enabling the DockSTARTer app) create a database and edit .env to use postgres instead of sqlite. -`postgresql://:@/:5432` +```postgresql://:@/:5432``` Optionally, make tandoor dependent on the postgres container ``` From 057c82a9733d214dc8b7afae988ea14a6bf452e2 Mon Sep 17 00:00:00 2001 From: smilerz Date: Fri, 3 Nov 2023 09:32:54 -0500 Subject: [PATCH 10/16] Update tandoor.md --- docs/apps/tandoor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/apps/tandoor.md b/docs/apps/tandoor.md index cac6230b41..b2da4313b0 100644 --- a/docs/apps/tandoor.md +++ b/docs/apps/tandoor.md @@ -1,7 +1,7 @@ # Sonarr [![Docker Pulls](https://img.shields.io/docker/pulls/vabene1111/recipes?style=flat-square&color=607D8B&label=docker%20pulls&logo=docker)](https://hub.docker.com/r/vabene1111/recipes) -[![GitHub Stars](https://img.shields.io/github/stars//vabene1111/recipes?style=flat-square&color=607D8B&label=github%20stars&logo=github)](https://github.com//vabene1111/recipes) +[![GitHub Stars](https://img.shields.io/github/stars/vabene1111/recipes?style=flat-square&color=607D8B&label=github%20stars&logo=github)](https://github.com//vabene1111/recipes) [![Compose Templates](https://img.shields.io/static/v1?style=flat-square&color=607D8B&label=compose&message=templates)](https://github.com/GhostWriters/DockSTARTer/tree/master/compose/.apps/tandoor) ## Description From 930b6869f519ee808b3256490045955c734d2f5d Mon Sep 17 00:00:00 2001 From: smilerz Date: Fri, 3 Nov 2023 09:35:47 -0500 Subject: [PATCH 11/16] Update tandoor.md --- docs/apps/tandoor.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/apps/tandoor.md b/docs/apps/tandoor.md index b2da4313b0..a61c1b6d05 100644 --- a/docs/apps/tandoor.md +++ b/docs/apps/tandoor.md @@ -23,7 +23,9 @@ If you run into any issues, enable debug mode to collect logs before opening a t ### Running with PostgreSQL It is highly recommended to use this application with a PostgreSQL database. To setup with postgres, after installing a postgres server (or enabling the DockSTARTer app) create a database and edit .env to use postgres instead of sqlite. -```postgresql://:@/:5432``` +``` +postgresql://:@/:5432 +``` Optionally, make tandoor dependent on the postgres container ``` From d1709912652a67c97ad8f26fef85d13a38c95092 Mon Sep 17 00:00:00 2001 From: smilerz Date: Fri, 3 Nov 2023 09:36:45 -0500 Subject: [PATCH 12/16] Update tandoor.md --- docs/apps/tandoor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/apps/tandoor.md b/docs/apps/tandoor.md index a61c1b6d05..cc863759e5 100644 --- a/docs/apps/tandoor.md +++ b/docs/apps/tandoor.md @@ -1,4 +1,4 @@ -# Sonarr +# Tandoor [![Docker Pulls](https://img.shields.io/docker/pulls/vabene1111/recipes?style=flat-square&color=607D8B&label=docker%20pulls&logo=docker)](https://hub.docker.com/r/vabene1111/recipes) [![GitHub Stars](https://img.shields.io/github/stars/vabene1111/recipes?style=flat-square&color=607D8B&label=github%20stars&logo=github)](https://github.com//vabene1111/recipes) From 553645ca6c0260738907e4c6c53130b486cdf3f7 Mon Sep 17 00:00:00 2001 From: smilerz Date: Thu, 9 Nov 2023 08:29:34 -0600 Subject: [PATCH 13/16] removed comments --- compose/.apps/tandoor/tandoor.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml index 6ba975218a..e1df2d3cd7 100755 --- a/compose/.apps/tandoor/tandoor.yml +++ b/compose/.apps/tandoor/tandoor.yml @@ -20,7 +20,3 @@ services: - ${DOCKERCONFDIR}/tandoor/mediafiles:/opt/recipes/mediafiles - ${DOCKERCONFDIR}/tandoor/data:/opt/recipes/data - ${DOCKERSTORAGEDIR}:/storage - - -## TODO -- test add remove with swag -> update documentation From 659d59d04ea226d75c434fd2f9809c4475966850 Mon Sep 17 00:00:00 2001 From: smilerz Date: Tue, 21 Nov 2023 07:12:23 -0600 Subject: [PATCH 14/16] update permissions --- compose/.apps/tandoor/tandoor.aarch64.yml | 0 compose/.apps/tandoor/tandoor.hostname.yml | 0 compose/.apps/tandoor/tandoor.labels.yml | 0 compose/.apps/tandoor/tandoor.netmode.yml | 0 compose/.apps/tandoor/tandoor.ports.yml | 0 compose/.apps/tandoor/tandoor.x86_64.yml | 0 compose/.apps/tandoor/tandoor.yml | 0 7 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 compose/.apps/tandoor/tandoor.aarch64.yml mode change 100755 => 100644 compose/.apps/tandoor/tandoor.hostname.yml mode change 100755 => 100644 compose/.apps/tandoor/tandoor.labels.yml mode change 100755 => 100644 compose/.apps/tandoor/tandoor.netmode.yml mode change 100755 => 100644 compose/.apps/tandoor/tandoor.ports.yml mode change 100755 => 100644 compose/.apps/tandoor/tandoor.x86_64.yml mode change 100755 => 100644 compose/.apps/tandoor/tandoor.yml diff --git a/compose/.apps/tandoor/tandoor.aarch64.yml b/compose/.apps/tandoor/tandoor.aarch64.yml old mode 100755 new mode 100644 diff --git a/compose/.apps/tandoor/tandoor.hostname.yml b/compose/.apps/tandoor/tandoor.hostname.yml old mode 100755 new mode 100644 diff --git a/compose/.apps/tandoor/tandoor.labels.yml b/compose/.apps/tandoor/tandoor.labels.yml old mode 100755 new mode 100644 diff --git a/compose/.apps/tandoor/tandoor.netmode.yml b/compose/.apps/tandoor/tandoor.netmode.yml old mode 100755 new mode 100644 diff --git a/compose/.apps/tandoor/tandoor.ports.yml b/compose/.apps/tandoor/tandoor.ports.yml old mode 100755 new mode 100644 diff --git a/compose/.apps/tandoor/tandoor.x86_64.yml b/compose/.apps/tandoor/tandoor.x86_64.yml old mode 100755 new mode 100644 diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml old mode 100755 new mode 100644 From 0a3ffac5d56eb33353b7428c3513d055aba81fc0 Mon Sep 17 00:00:00 2001 From: smilerz Date: Tue, 28 Nov 2023 09:19:15 -0600 Subject: [PATCH 15/16] updated documentation --- docs/apps/tandoor.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/apps/tandoor.md b/docs/apps/tandoor.md index cc863759e5..3ffd741b04 100644 --- a/docs/apps/tandoor.md +++ b/docs/apps/tandoor.md @@ -14,13 +14,14 @@ Share and collaborate with your friends and family using a mobile friendly web i This application has extensive customization options, most docker env variables are documented in the [.env.template](https://raw.githubusercontent.com/vabene1111/recipes/master/.env.template) If you run into any issues, enable debug mode to collect logs before opening a ticket. -``` +``` yaml tandoor: environment: - DEBUG=1 ``` ### Running with PostgreSQL + It is highly recommended to use this application with a PostgreSQL database. To setup with postgres, after installing a postgres server (or enabling the DockSTARTer app) create a database and edit .env to use postgres instead of sqlite. ``` @@ -28,17 +29,18 @@ postgresql://:@/:54 ``` Optionally, make tandoor dependent on the postgres container -``` +``` yaml tandoor: depends_on: - postgres_host ``` ### Running with SWAG + It is also highly recommended to serve media files with a web server. If you are already using SWAG you can use nginx to accomplish this. Edit the docker-compose.override.yml similar to below. -``` +``` yaml tandoor: environment: - GUNICORN_MEDIA=0 From ea3af16e7362e40cef13fc31663c8f1a7578c078 Mon Sep 17 00:00:00 2001 From: smilerz Date: Mon, 4 Dec 2023 09:08:27 -0600 Subject: [PATCH 16/16] removed deprecated label TIMEZONE --- compose/.apps/tandoor/tandoor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml index f0485cf0a5..0c8a08f077 100644 --- a/compose/.apps/tandoor/tandoor.yml +++ b/compose/.apps/tandoor/tandoor.yml @@ -7,7 +7,6 @@ services: - DEBUG=${TANDOOR_DEBUG} - GUNICORN_MEDIA=${TANDOOR_GUNICORN_MEDIA} - SECRET_KEY=${TANDOOR_SECRET_KEY} - - TIMEZONE=${TZ} - TZ=${TZ} logging: