added GUNICORN_MEDIA and DEBUG as variables

sorted yml labels alphabetically added example command to generate random secret
GhostWriters · Nov 28, 2023 · b1b7d62 · b1b7d62
1 parent aad1727
commit b1b7d62
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/compose/.apps/tandoor/tandoor.labels.yml b/compose/.apps/tandoor/tandoor.labels.yml
@@ -4,7 +4,9 @@ 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_debug: "false"
       com.dockstarter.appvars.tandoor_enabled: "false"
+      com.dockstarter.appvars.tandoor_gunicorn_media: "1"
       com.dockstarter.appvars.tandoor_network_mode: ""
       com.dockstarter.appvars.tandoor_secret_key: "change_me"
       com.dockstarter.appvars.tandoor_allowed_hosts: "*"

diff --git a/compose/.apps/tandoor/tandoor.yml b/compose/.apps/tandoor/tandoor.yml
@@ -2,12 +2,14 @@ services:
   tandoor:
     container_name: tandoor
     environment:
-      - SECRET_KEY=${TANDOOR_SECRET_KEY}
       - ALLOWED_HOSTS=${TANDOOR_ALLOWED_HOSTS}
       - DATABASE_URL=${TANDOOR_DATABASE_URL}
-      - GUNICORN_MEDIA=1
-      - TZ=${TZ}
+      - DEBUG=${TANDOOR_DEBUG}
+      - GUNICORN_MEDIA=${TANDOOR_GUNICORN_MEDIA}
+      - SECRET_KEY=${TANDOOR_SECRET_KEY}
       - TIMEZONE=${TZ}
+      - TZ=${TZ}
+
     logging:
       driver: json-file
       options:

diff --git a/docs/apps/tandoor.md b/docs/apps/tandoor.md
@@ -15,11 +15,8 @@ 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
-```
+The application requires a secret key for cryptographic signing.  It can be any string, but it is recommend to generate a random string.
+On linux you can run `tr -dc A-Za-z0-9 </dev/urandom | head -c 32; echo` to generate a random 32 character string.
 
 ### Running with PostgreSQL
 
@@ -38,12 +35,9 @@ Optionally, make tandoor dependent on the postgres container
 ### 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.
+Set GUNICORN_MEDIA to 0 and edit the docker-compose.override.yml similar to below.
 
 ``` yaml
-  tandoor:
-    environment:
-      - GUNICORN_MEDIA=0
   swag:
     volumes:
     - ${DOCKERCONFDIR}/recipes/mediafiles:/media