Merge branch 'env-vars'

Author: codedmonkey

.env.dirigent

@@ -15,7 +15,6 @@
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
 GITHUB_TOKEN=
-TRUSTED_PROXIES=
 
 ###> symfony/framework-bundle ###
 APP_ENV=dev

config/packages/framework.yaml

@@ -2,9 +2,6 @@
 framework:
     secret: '%env(APP_SECRET)%'
 
-    trusted_proxies: '%env(TRUSTED_PROXIES)%'
-    trusted_headers: ['x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port', 'x-forwarded-prefix']
-
     # Note that the session will be started ONLY if you read or write from it.
     session: true
 

docker/config.yaml

@@ -4,3 +4,15 @@ parameters:
 
 framework:
   secret: '%kernel_secret%'
+
+  messenger:
+    transports:
+      async:
+        dsn: 'doctrine://default?auto_setup=0'
+
+  trusted_proxies: '%env(TRUSTED_PROXIES)%'
+  trusted_headers: ['x-forwarded-for', 'x-forwarded-host', 'x-forwarded-port', 'x-forwarded-prefix', 'x-forwarded-proto']
+
+doctrine:
+  dbal:
+    url: 'postgresql://dirigent@127.0.0.1:5432/dirigent?serverVersion=16&charset=utf8'

docker/env.php

@@ -2,13 +2,12 @@
 
 return [
     'APP_ENV' => 'prod',
-    'DATABASE_URL' => 'postgresql://dirigent@127.0.0.1:5432/dirigent?serverVersion=16&charset=utf8',
     'DIRIGENT_IMAGE' => '1',
+    'SYMFONY_DOTENV_PATH' => './.env.dirigent',
+
     'GITHUB_TOKEN' => '',
     'KERNEL_SECRET_FILE' => '/srv/config/secrets/kernel_secret',
     'MAILER_DSN' => 'null://null',
-    'MESSENGER_TRANSPORT_DSN' => 'doctrine://default?auto_setup=0',
     'SENTRY_DSN' => '',
-    'SYMFONY_DOTENV_PATH' => './.env.dirigent',
     'TRUSTED_PROXIES' => '',
 ];

docs/installation/docker-standalone.md

@@ -65,6 +65,16 @@ dirigent:
 
 For a complete list of configuration options, see the [Configuration Reference][docs-configuration-reference].
 
+### Environment variables
+
+- `DECRYPTION_KEY` / `DECRYPTION_KEY_FILE`
+- `ENCRYPTION_KEY` / `ENCRYPTION_KEY_FILE`
+- `GITHUB_TOKEN`
+- `KERNEL_SECRET` / `KERNEL_SECRET_FILE`
+- `MAILER_DSN`
+- `SENTRY_DSN`
+- `TRUSTED_PROXIES`
+
 ## Running the image
 
 After following the steps above you're ready to boot the image, so run the Docker command to start your