From 85e903586e3c3eaf8a5f271efa4d4db6ec30031c Mon Sep 17 00:00:00 2001
From: Pierre Massat <pierre.massat@sentry.io>
Date: Thu, 7 Mar 2024 09:18:31 -0500
Subject: [PATCH 1/3] feat(vroom): Allow to customize vroom's environment
 variables in a different file

---
 docker-compose.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index d47602a352..5cd256aaa5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -444,6 +444,9 @@ services:
       SENTRY_KAFKA_BROKERS_OCCURRENCES: "kafka:9092"
       SENTRY_BUCKET_PROFILES: file://localhost//var/lib/sentry-profiles
       SENTRY_SNUBA_HOST: "http://snuba-api:1218"
+    env_file:
+      - path: ./vroom.env
+        required: false
     volumes:
       - sentry-vroom:/var/lib/sentry-profiles
     depends_on:

From 04547b8fc6b5e4cfc38da7f08c695f0cd0a71927 Mon Sep 17 00:00:00 2001
From: Pierre Massat <pierre.massat@sentry.io>
Date: Thu, 7 Mar 2024 09:29:56 -0500
Subject: [PATCH 2/3] Move defaults to new environment file

---
 docker-compose.yml | 7 +------
 vroom.env          | 4 ++++
 2 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 vroom.env

diff --git a/docker-compose.yml b/docker-compose.yml
index 5cd256aaa5..f619490181 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -440,13 +440,8 @@ services:
     <<: *restart_policy
     image: "$VROOM_IMAGE"
     environment:
-      SENTRY_KAFKA_BROKERS_PROFILING: "kafka:9092"
-      SENTRY_KAFKA_BROKERS_OCCURRENCES: "kafka:9092"
-      SENTRY_BUCKET_PROFILES: file://localhost//var/lib/sentry-profiles
-      SENTRY_SNUBA_HOST: "http://snuba-api:1218"
     env_file:
-      - path: ./vroom.env
-        required: false
+      - ./vroom.env
     volumes:
       - sentry-vroom:/var/lib/sentry-profiles
     depends_on:
diff --git a/vroom.env b/vroom.env
new file mode 100644
index 0000000000..b629e09dde
--- /dev/null
+++ b/vroom.env
@@ -0,0 +1,4 @@
+SENTRY_KAFKA_BROKERS_PROFILING="kafka:9092"
+SENTRY_KAFKA_BROKERS_OCCURRENCES="kafka:9092"
+SENTRY_BUCKET_PROFILES=file://localhost//var/lib/sentry-profiles
+SENTRY_SNUBA_HOST="http://snuba-api:1218"

From 7143d887430ebfa624df75d18448a49df6c908c5 Mon Sep 17 00:00:00 2001
From: Pierre Massat <pierre.massat@sentry.io>
Date: Thu, 7 Mar 2024 09:32:29 -0500
Subject: [PATCH 3/3] Fix typo

---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f619490181..af643ec226 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -439,7 +439,6 @@ services:
   vroom:
     <<: *restart_policy
     image: "$VROOM_IMAGE"
-    environment:
     env_file:
       - ./vroom.env
     volumes: