From 123d9b306fb906e45f7b036a76ad74baa765b8f2 Mon Sep 17 00:00:00 2001
From: Matthieu <mtholot19@gmail.com>
Date: Wed, 8 Apr 2026 11:27:37 +0200
Subject: [PATCH] fix : resolve Docker port conflicts and fix var/ permissions
 on install
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Port PG 5436→5437, port frontend 3003→3005 to avoid conflicts with Coltura.
Add fix-permissions target in Makefile to create var/cache and var/log as root before composer install.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 docker-compose.yml    | 6 +++---
 infra/dev/.env.docker | 2 +-
 infra/dev/Dockerfile  | 2 +-
 makefile              | 6 +++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 189521a..19b99c4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
     depends_on:
       - db
     ports:
-        - "3003:3003"
+        - "3005:3003"
     restart: unless-stopped
   nginx:
     image: nginx:1.27-alpine
@@ -47,7 +47,7 @@ services:
     restart: unless-stopped
   db:
     image: postgres:16-alpine
-    command: -p ${POSTGRES_PORT:-5436}
+    command: -p ${POSTGRES_PORT:-5437}
     environment:
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_USER: ${POSTGRES_USER}
@@ -55,7 +55,7 @@ services:
     volumes:
       - pg_data:/var/lib/postgresql/data
     ports:
-      - "${POSTGRES_PORT:-5436}:${POSTGRES_PORT:-5436}"
+      - "${POSTGRES_PORT:-5437}:${POSTGRES_PORT:-5437}"
     restart: unless-stopped
 volumes:
   pg_data:
diff --git a/infra/dev/.env.docker b/infra/dev/.env.docker
index d8d24ac..47ed2c0 100644
--- a/infra/dev/.env.docker
+++ b/infra/dev/.env.docker
@@ -5,6 +5,6 @@ APP_USER=www-data
 POSTGRES_DB=central
 POSTGRES_USER=root
 POSTGRES_PASSWORD=root
-POSTGRES_PORT=5436
+POSTGRES_PORT=5437
 XDEBUG_CLIENT_HOST=host.docker.internal
 HOST_APPS_PATH=/home/user/workspace
diff --git a/infra/dev/Dockerfile b/infra/dev/Dockerfile
index b250909..71b6c59 100644
--- a/infra/dev/Dockerfile
+++ b/infra/dev/Dockerfile
@@ -81,7 +81,7 @@ RUN mkdir -p /var/www/.composer/cache/vcs \
 ENV COMPOSER_HOME=/var/www/.composer
 
 # Création de la structure du projet
-RUN mkdir /var/www/html/LOG
+RUN mkdir -p /var/www/html/LOG /var/www/html/var/cache /var/www/html/var/log
 
 ###> User ###
 ARG CURRENT_UID
diff --git a/makefile b/makefile
index 0680d3d..3e2c7be 100644
--- a/makefile
+++ b/makefile
@@ -43,7 +43,11 @@ install: composer-install cache-clear node-use build-nuxtJS migration-migrate
 # Supprime tout est réinstalle tout (Attention ça supprime la bdd aussi)
 reset: delete_built_dir remove_orphans build-without-cache start wait install
 
-composer-install:
+fix-permissions:
+	$(EXEC_PHP_ROOT) mkdir -p var/cache var/log
+	$(EXEC_PHP_ROOT) chown -R $(APP_USER):$(APP_USER) var/
+
+composer-install: fix-permissions
 	$(EXEC_PHP) composer install
 	$(SYMFONY_CONSOLE) lexik:jwt:generate-keypair --skip-if-exists