[config] getenv() -> $_ENV

borazslo · Mar 3, 2024 · f866d63 · f866d63
1 parent fac2ebc
commit f866d63
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/config/config.dist.php b/config/config.dist.php
@@ -9,10 +9,10 @@
 
 $environment['default'] = [
     'connection' => [
-        'host' => 'mysql'),
-        'user' => getenv('MISEREND_MYSQL_USER'),
-        'password' => getenv('MISEREND_MYSQL_PASSWORD'),
-        'database' => getenv('MISEREND_MYSQL_DATABASE'),
+        'host' => 'mysql',
+        'user' => $_ENV['MISEREND_MYSQL_USER'],
+        'password' => $_ENV['MISEREND_MYSQL_PASSWORD'],
+        'database' => $_ENV['MISEREND_MYSQL_DATABASE'],
     ],
     'path' => [
         'domain' => 'https://miserend.hu',

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -81,14 +81,17 @@ services:
       - "${MISEREND_PORT:-8000}:8000"
     environment:
         MISEREND_WEBAPP_ENVIRONMENT: ${MISEREND_WEBAPP_ENVIRONMENT:-development}
+        MISEREND_MYSQL_DATABASE:  ${MISEREND_MYSQL_DATABASE}
+        MISEREND_MYSQL_USER:  ${MISEREND_MYSQL_USER}
+        MISEREND_MYSQL_PASSWORD:  ${MISEREND_MYSQL_PASSWORD}
     networks:
       inner:
         aliases:
           - miserend
     depends_on:
       - mysql
       - mailcatcher
-      - build
+      - miserend-build
 
 networks:
   inner: