From 1d9adca5e221b01295bf289f7fffc89d5ea570e7 Mon Sep 17 00:00:00 2001
From: Patrick Weyck <p.weyck@shopware.com>
Date: Wed, 24 Jan 2024 13:34:56 +0100
Subject: [PATCH] Make trusted proxies configurable by env TRUSTED_PROXIES

---
 .../docker/0.1/config/packages/prod/production_docker.yaml   | 4 ++++
 shopware/docker/0.1/config/packages/trusted_env.yaml         | 5 +++++
 shopware/docker/0.1/manifest.json                            | 4 ----
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 shopware/docker/0.1/config/packages/trusted_env.yaml

diff --git a/shopware/docker/0.1/config/packages/prod/production_docker.yaml b/shopware/docker/0.1/config/packages/prod/production_docker.yaml
index 5e913035..7fa7809f 100644
--- a/shopware/docker/0.1/config/packages/prod/production_docker.yaml
+++ b/shopware/docker/0.1/config/packages/prod/production_docker.yaml
@@ -1,3 +1,7 @@
+parameters:
+    env(JWT_PRIVATE_KEY): ""
+    env(JWT_PUBLIC_KEY): ""
+
 shopware:
     api:                                                                                                               
         jwt_key:                                                                                                       
diff --git a/shopware/docker/0.1/config/packages/trusted_env.yaml b/shopware/docker/0.1/config/packages/trusted_env.yaml
new file mode 100644
index 00000000..036d1554
--- /dev/null
+++ b/shopware/docker/0.1/config/packages/trusted_env.yaml
@@ -0,0 +1,5 @@
+parameters:
+    env(TRUSTED_PROXIES): ''
+
+framework:
+    trusted_proxies: '%env(TRUSTED_PROXIES)%'
diff --git a/shopware/docker/0.1/manifest.json b/shopware/docker/0.1/manifest.json
index df497494..b2c568fa 100644
--- a/shopware/docker/0.1/manifest.json
+++ b/shopware/docker/0.1/manifest.json
@@ -2,9 +2,5 @@
     "copy-from-recipe": {
         "docker/": "docker/",
         "config/": "%CONFIG_DIR%/"
-    },
-    "container": {
-        "env(JWT_PRIVATE_KEY)": "",
-        "env(JWT_PUBLIC_KEY)": ""
     }
 }