From 701c40e09eec027cf228d683657972028717602b Mon Sep 17 00:00:00 2001
From: Michi Hoffmann <cleptric@users.noreply.github.com>
Date: Thu, 11 May 2023 14:03:25 +0200
Subject: [PATCH] Fix DB connection with sockets (#62)

---
 .env.example                           | 5 ++++-
 config/app.php                         | 5 ++++-
 docker-compose.yml                     | 5 ++++-
 docker/backend/apache/environment.conf | 5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.env.example b/.env.example
index 9bec01e8..2994e43d 100755
--- a/.env.example
+++ b/.env.example
@@ -9,7 +9,10 @@ export APP_DEFAULT_TIMEZONE="UTC"
 export SECURITY_SALT="__SALT__"
 export MAIN_DOMAIN="__MAIN_DOMAIN__"
 
-export DATABASE_URL="mysql://my_app:secret@localhost/${APP_NAME}?encoding=utf8mb4&timezone=UTC&cacheMetadata=true&quoteIdentifiers=false&persistent=false"
+export DATABASE_USER="__DATABASE_USER__"
+export DATABASE_PASSWORD="__DATABASE_PASSWORD__"
+export DATABASE_NAME="__DATABASE_NAME__"
+export DATABASE_SOCKET="__DATABASE_SOCKET__"
 
 export SLACK_CLIENT_ID="__SLACK_CLIENT_ID__"
 export SLACK_CLIENT_SECRET="__SLACK_CLIENT_SECRET__"
diff --git a/config/app.php b/config/app.php
index 6622adc8..b4f8e4bf 100644
--- a/config/app.php
+++ b/config/app.php
@@ -341,7 +341,10 @@
              */
             // 'init' => ['SET GLOBAL innodb_stats_on_metadata = 0'],
 
-            'url' => env('DATABASE_URL', null),
+            'username' => env('DATABASE_USER'),
+            'password' => env('DATABASE_PASSWORD'),
+            'database' => env('DATABASE_NAME'),
+            'unix_socket' => env('DATABASE_SOCKET'),
         ],
     ],
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 10071264..9ce60726 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,10 @@ services:
         - APP_DEFAULT_TIMEZONE
         - SECURITY_SALT
         - MAIN_DOMAIN
-        - DATABASE_URL
+        - DATABASE_USER
+        - DATABASE_PASSWORD
+        - DATABASE_NAME
+        - DATABASE_SOCKET
         - SLACK_CLIENT_ID
         - SLACK_CLIENT_SECRET
         - SLACK_SIGNING_SECRET
diff --git a/docker/backend/apache/environment.conf b/docker/backend/apache/environment.conf
index 48b1a612..0d1b192b 100644
--- a/docker/backend/apache/environment.conf
+++ b/docker/backend/apache/environment.conf
@@ -7,7 +7,10 @@ PassENV APP_DEFAULT_LOCALE
 PassEnv APP_DEFAULT_TIMEZONE
 PassEnv SECURITY_SALT
 PassEnv MAIN_DOMAIN
-PassEnv DATABASE_URL
+PassEnv DATABASE_USER
+PassEnv DATABASE_PASSWORD
+PassEnv DATABASE_NAME
+PassEnv DATABASE_SOCKET
 PassEnv SLACK_CLIENT_ID
 PassEnv SLACK_CLIENT_SECRET
 PassEnv SLACK_SIGNING_SECRET