diff --git a/docker-compose.yml b/docker-compose.yml index 19b99c4..189521a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,7 @@ services: depends_on: - db ports: - - "3005:3003" + - "3003: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:-5437} + command: -p ${POSTGRES_PORT:-5436} environment: POSTGRES_DB: ${POSTGRES_DB} POSTGRES_USER: ${POSTGRES_USER} @@ -55,7 +55,7 @@ services: volumes: - pg_data:/var/lib/postgresql/data ports: - - "${POSTGRES_PORT:-5437}:${POSTGRES_PORT:-5437}" + - "${POSTGRES_PORT:-5436}:${POSTGRES_PORT:-5436}" restart: unless-stopped volumes: pg_data: diff --git a/infra/dev/.env.docker b/infra/dev/.env.docker index 47ed2c0..d8d24ac 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=5437 +POSTGRES_PORT=5436 XDEBUG_CLIENT_HOST=host.docker.internal HOST_APPS_PATH=/home/user/workspace diff --git a/infra/dev/Dockerfile b/infra/dev/Dockerfile index 71b6c59..b250909 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 -p /var/www/html/LOG /var/www/html/var/cache /var/www/html/var/log +RUN mkdir /var/www/html/LOG ###> User ### ARG CURRENT_UID diff --git a/makefile b/makefile index 3e2c7be..0680d3d 100644 --- a/makefile +++ b/makefile @@ -43,11 +43,7 @@ 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 -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 +composer-install: $(EXEC_PHP) composer install $(SYMFONY_CONSOLE) lexik:jwt:generate-keypair --skip-if-exists