From 0f046dfbd29022b46a97d2f9336b2758a0df1472 Mon Sep 17 00:00:00 2001
From: Martin Janser <martin.janser@liip.ch>
Date: Mon, 28 Oct 2024 16:00:37 +0100
Subject: [PATCH] Provide environment to services

---
 compose.override.example.yaml          | 3 ---
 compose.yaml                           | 2 +-
 docker/services/doctrine-migrations/up | 2 ++
 docker/services/messenger-worker-1/run | 3 ++-
 docker/services/messenger-worker-2/run | 3 ++-
 docker/services/php-fpm/run            | 1 +
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/compose.override.example.yaml b/compose.override.example.yaml
index 1c39db5..b6748d6 100644
--- a/compose.override.example.yaml
+++ b/compose.override.example.yaml
@@ -8,9 +8,6 @@ services:
     environment:
       # Permanently enable the debug mode
       XDEBUG_MODE: develop,debug
-      # Add Blackfire ID and Token for Profiling
-      BLACKFIRE_CLIENT_ID: the-client-id-here
-      BLACKFIRE_CLIENT_TOKEN: the-token-here
     # Mount your local Composer cache folder into the project to re-use the host local cache, if existing
     volumes:
       - "./:/www:z"
diff --git a/compose.yaml b/compose.yaml
index 46b10c1..baddf0d 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -30,7 +30,7 @@ services:
     image: getmeili/meilisearch:v1.10
     restart: unless-stopped
     environment:
-      MEILI_NO_ANALYTICS: '1'
+      MEILI_NO_ANALYTICS: 'true'
       MEILI_MASTER_KEY: ${MEILI_MASTER_KEY:-cWwx3jxAworhaQAVHeRYlK37wdVnLNc6P_Uyz8WLTyM}
     volumes:
       - meilisearch_data:/meili_data:rw
diff --git a/docker/services/doctrine-migrations/up b/docker/services/doctrine-migrations/up
index 43304a9..b321b56 100755
--- a/docker/services/doctrine-migrations/up
+++ b/docker/services/doctrine-migrations/up
@@ -1,3 +1,5 @@
+#!/bin/sh
+with-contenv
 foreground { echo "Doctrine: running database migrations ..." }
 su php -s "/bin/ash" \
     -c "/www/bin/console doctrine:migrations:migrate -n -v"
diff --git a/docker/services/messenger-worker-1/run b/docker/services/messenger-worker-1/run
index 995863f..39442b9 100755
--- a/docker/services/messenger-worker-1/run
+++ b/docker/services/messenger-worker-1/run
@@ -1,4 +1,5 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh
+with-contenv
 exec 2>&1
 su php \
     -s "/bin/ash" \
diff --git a/docker/services/messenger-worker-2/run b/docker/services/messenger-worker-2/run
index 0f6d4d3..5d24549 100755
--- a/docker/services/messenger-worker-2/run
+++ b/docker/services/messenger-worker-2/run
@@ -1,4 +1,5 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh
+with-contenv
 exec 2>&1
 su php \
     -s "/bin/ash" \
diff --git a/docker/services/php-fpm/run b/docker/services/php-fpm/run
index 5ec42b1..28e8792 100755
--- a/docker/services/php-fpm/run
+++ b/docker/services/php-fpm/run
@@ -1,3 +1,4 @@
 #!/command/execlineb -P
 
+with-contenv
 php-fpm83