From 184a5ff0def938cbf018e59bf29b114d6ef705a2 Mon Sep 17 00:00:00 2001
From: Frank <frank.van.den.berg@eleaf.com>
Date: Tue, 10 Mar 2026 22:04:23 +0100
Subject: [PATCH] Fix database container creation

---
 docker/compose.yaml |  2 +-
 docker/restart.sh   |  7 ++++++-
 docker/setup.sh     | 12 ++++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 docker/restart.sh
 mode change 100755 => 100644 docker/setup.sh

diff --git a/docker/compose.yaml b/docker/compose.yaml
index 221c685..32d5bfc 100644
--- a/docker/compose.yaml
+++ b/docker/compose.yaml
@@ -135,7 +135,7 @@ services:
       timeout: 5s
       retries: 10
       start_period: 30s
-    command: ["--default-authentication-plugin=mysql_native_password", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci"]
+    command: ["--default-authentication-plugin=mysql_native_password", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci", "--lower-case-table-names=1", "--innodb-use-native-aio=0"]
     volumes:
       - ../var/volumes/db:/var/lib/mysql:rw
       - ./mysql/init:/docker-entrypoint-initdb.d:ro
diff --git a/docker/restart.sh b/docker/restart.sh
old mode 100755
new mode 100644
index 03064d3..078959f
--- a/docker/restart.sh
+++ b/docker/restart.sh
@@ -8,13 +8,18 @@ DOCKER_DIR=$(cd "$(dirname "$0")" && pwd)
 ROOT_DIR=$(cd "$DOCKER_DIR/.." && pwd)
 
 echo "Stopping and removing containers..."
+(cd "$DOCKER_DIR" && docker compose -f compose.yaml -f compose.override.yaml down -v) || true
 docker rm -f escapepage-db escapepage-php escapepage-nginx escapepage-mercure escapepage-mailer escapepage-php-worker || true
 
 echo "Clearing Docker build cache..."
 docker builder prune -af
 
-echo "Setting permissions for var/volumes/db..."
+echo "Setting permissions for var/volumes/db and var directories..."
 sudo chown -R 1000:1000 "$ROOT_DIR/var/volumes/db" || true
+sudo chmod -R 777 "$ROOT_DIR/var/volumes/db" || true
+sudo mkdir -p "$ROOT_DIR/var/cache" "$ROOT_DIR/var/log" "$ROOT_DIR/var/sessions"
+sudo chown -R 1000:1000 "$ROOT_DIR/var" || true
+sudo chmod -R 777 "$ROOT_DIR/var" || true
 
 echo "Running setup script..."
 "$DOCKER_DIR/setup.sh" --no-build
diff --git a/docker/setup.sh b/docker/setup.sh
old mode 100755
new mode 100644
index 607452f..c5c3179
--- a/docker/setup.sh
+++ b/docker/setup.sh
@@ -104,9 +104,17 @@ fi
 
 # Prepare DB
 echo "Creating database if it doesn't exist..."
-pexec php bin/console doctrine:database:create --if-not-exists
+if ! pexec php bin/console doctrine:database:create --if-not-exists; then
+  echo "Error: Database creation failed. Check Docker logs for details." >&2
+  dc logs database
+  exit 1
+fi
+
 echo "Running migrations..."
-pexec php bin/console doctrine:migrations:migrate -n
+if ! pexec php bin/console doctrine:migrations:migrate -n; then
+  echo "Error: Migrations failed." >&2
+  exit 1
+fi
 
 # Import JS deps (Importmap/Asset Mapper)
 if [ -f "$ROOT_DIR/importmap.php" ]; then