From 18cb9d5d801432da4a83b26b97cfaaaeb8c20b0d Mon Sep 17 00:00:00 2001 From: r-dev Date: Thu, 2 Apr 2026 08:11:35 +0200 Subject: [PATCH] refactor(infra) : reorganize docker config into infra/dev and infra/prod Align project structure with Lesstime: move docker/ to infra/dev/ and deploy/ to infra/prod/. Update all references in docker-compose, makefile, CI workflow, Dockerfile, .gitignore and .dockerignore. Co-Authored-By: Claude Opus 4.6 (1M context) --- .dockerignore | 8 ++++---- .gitea/workflows/build-docker.yml | 2 +- .gitignore | 2 +- README.md | 4 ++-- docker-compose.yml | 8 ++++---- {docker => infra/dev}/.env.docker | 0 {docker => infra/dev}/.env.docker.local | 0 {docker/php => infra/dev}/Dockerfile | 0 {docker => infra/dev}/pgadmin/pgpass | 0 {docker => infra/dev}/pgadmin/servers.json | 0 {docker/php/config => infra/dev}/php.ini | 0 {docker/php/config => infra/dev}/vhost.conf | 0 .../docker-php-ext-xdebug.ini => infra/dev/xdebug.ini | 0 {deploy/docker => infra/prod}/.env.example | 0 deploy/docker/Dockerfile.prod => infra/prod/Dockerfile | 4 ++-- {deploy/docker => infra/prod}/deploy.sh | 0 .../prod/docker-compose.yml | 0 .../inventory-docker.conf => infra/prod/nginx-proxy.conf | 0 {deploy/docker => infra/prod}/nginx.conf | 0 {deploy/docker => infra/prod}/supervisord.conf | 0 makefile | 8 ++++---- 21 files changed, 18 insertions(+), 18 deletions(-) rename {docker => infra/dev}/.env.docker (100%) rename {docker => infra/dev}/.env.docker.local (100%) rename {docker/php => infra/dev}/Dockerfile (100%) rename {docker => infra/dev}/pgadmin/pgpass (100%) rename {docker => infra/dev}/pgadmin/servers.json (100%) rename {docker/php/config => infra/dev}/php.ini (100%) rename {docker/php/config => infra/dev}/vhost.conf (100%) rename docker/php/config/docker-php-ext-xdebug.ini => infra/dev/xdebug.ini (100%) rename {deploy/docker => infra/prod}/.env.example (100%) rename deploy/docker/Dockerfile.prod => infra/prod/Dockerfile (94%) rename {deploy/docker => infra/prod}/deploy.sh (100%) rename deploy/docker/docker-compose.prod.yml => infra/prod/docker-compose.yml (100%) rename deploy/nginx/inventory-docker.conf => infra/prod/nginx-proxy.conf (100%) rename {deploy/docker => infra/prod}/nginx.conf (100%) rename {deploy/docker => infra/prod}/supervisord.conf (100%) diff --git a/.dockerignore b/.dockerignore index db2ba9d..38b6026 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,10 +2,10 @@ .gitea .env.local .env.test -docker/ -deploy/docker/docker-compose.prod.yml -deploy/docker/deploy.sh -deploy/docker/.env.example +infra/dev/ +infra/prod/docker-compose.yml +infra/prod/deploy.sh +infra/prod/.env.example frontend/node_modules frontend/.nuxt frontend/.output diff --git a/.gitea/workflows/build-docker.yml b/.gitea/workflows/build-docker.yml index dd3f71f..b76bb26 100644 --- a/.gitea/workflows/build-docker.yml +++ b/.gitea/workflows/build-docker.yml @@ -19,7 +19,7 @@ jobs: - name: Build Docker image run: | docker build \ - -f deploy/docker/Dockerfile.prod \ + -f infra/prod/Dockerfile \ -t gitea.malio.fr/malio-dev/inventory:${{ gitea.ref_name }} \ -t gitea.malio.fr/malio-dev/inventory:latest \ . diff --git a/.gitignore b/.gitignore index 76880a0..dbc9db7 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,7 @@ ###< phpunit/phpunit ### ###> docker ### -docker/.env.docker.local +infra/dev/.env.docker.local ###< docker ### ###> migration archives ### /_archives/ diff --git a/README.md b/README.md index 0f36c6c..20b2d36 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ make start make install ``` -> Si `make start` échoue sur le port de la BDD, modifier `POSTGRES_PORT` dans `docker/.env.docker.local`. +> Si `make start` échoue sur le port de la BDD, modifier `POSTGRES_PORT` dans `infra/dev/.env.docker.local`. ### Que fait `make install` ? @@ -254,7 +254,7 @@ Configuration PhpStorm / VSCode : - **Port** : `8081` - **Path mapping** : racine du projet → `/var/www/html` -> Sous WSL, modifier `XDEBUG_CLIENT_HOST` dans `docker/.env.docker.local` avec votre IP locale. +> Sous WSL, modifier `XDEBUG_CLIENT_HOST` dans `infra/dev/.env.docker.local` avec votre IP locale. ## Git diff --git a/docker-compose.yml b/docker-compose.yml index f9b0087..d3a4c18 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ services: web: container_name: php-${DOCKER_APP_NAME}-apache build: - context: ./docker/php + context: ./infra/dev dockerfile: Dockerfile args: DOCKER_PHP_VERSION: ${DOCKER_PHP_VERSION} @@ -20,9 +20,9 @@ services: - ~/.cache:/var/www/.cache # Pour la cache de composer - ~/.config:/var/www/.config # Pour la config de yarn - ~/.composer:/var/www/.composer # Pour la config de composer - - ./docker/php/config/php.ini:/usr/local/etc/php/php.ini - - ./docker/php/config/vhost.conf:/etc/apache2/sites-available/000-default.conf - - ./docker/php/config/docker-php-ext-xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini + - ./infra/dev/php.ini:/usr/local/etc/php/php.ini + - ./infra/dev/vhost.conf:/etc/apache2/sites-available/000-default.conf + - ./infra/dev/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini - ./LOG:/var/www/html/LOG - ./LOG/logs_apache:/var/log/apache2/ extra_hosts: diff --git a/docker/.env.docker b/infra/dev/.env.docker similarity index 100% rename from docker/.env.docker rename to infra/dev/.env.docker diff --git a/docker/.env.docker.local b/infra/dev/.env.docker.local similarity index 100% rename from docker/.env.docker.local rename to infra/dev/.env.docker.local diff --git a/docker/php/Dockerfile b/infra/dev/Dockerfile similarity index 100% rename from docker/php/Dockerfile rename to infra/dev/Dockerfile diff --git a/docker/pgadmin/pgpass b/infra/dev/pgadmin/pgpass similarity index 100% rename from docker/pgadmin/pgpass rename to infra/dev/pgadmin/pgpass diff --git a/docker/pgadmin/servers.json b/infra/dev/pgadmin/servers.json similarity index 100% rename from docker/pgadmin/servers.json rename to infra/dev/pgadmin/servers.json diff --git a/docker/php/config/php.ini b/infra/dev/php.ini similarity index 100% rename from docker/php/config/php.ini rename to infra/dev/php.ini diff --git a/docker/php/config/vhost.conf b/infra/dev/vhost.conf similarity index 100% rename from docker/php/config/vhost.conf rename to infra/dev/vhost.conf diff --git a/docker/php/config/docker-php-ext-xdebug.ini b/infra/dev/xdebug.ini similarity index 100% rename from docker/php/config/docker-php-ext-xdebug.ini rename to infra/dev/xdebug.ini diff --git a/deploy/docker/.env.example b/infra/prod/.env.example similarity index 100% rename from deploy/docker/.env.example rename to infra/prod/.env.example diff --git a/deploy/docker/Dockerfile.prod b/infra/prod/Dockerfile similarity index 94% rename from deploy/docker/Dockerfile.prod rename to infra/prod/Dockerfile index 5e12134..f28d0b0 100644 --- a/deploy/docker/Dockerfile.prod +++ b/infra/prod/Dockerfile @@ -61,8 +61,8 @@ RUN ln -sf /dev/stdout /var/log/nginx/access.log \ RUN rm -f /etc/nginx/sites-enabled/default # Configs -COPY deploy/docker/supervisord.conf /etc/supervisor/conf.d/app.conf -COPY deploy/docker/nginx.conf /etc/nginx/sites-enabled/inventory.conf +COPY infra/prod/supervisord.conf /etc/supervisor/conf.d/app.conf +COPY infra/prod/nginx.conf /etc/nginx/sites-enabled/inventory.conf # Backend from stage 1 COPY --from=backend-build /app /var/www/html diff --git a/deploy/docker/deploy.sh b/infra/prod/deploy.sh similarity index 100% rename from deploy/docker/deploy.sh rename to infra/prod/deploy.sh diff --git a/deploy/docker/docker-compose.prod.yml b/infra/prod/docker-compose.yml similarity index 100% rename from deploy/docker/docker-compose.prod.yml rename to infra/prod/docker-compose.yml diff --git a/deploy/nginx/inventory-docker.conf b/infra/prod/nginx-proxy.conf similarity index 100% rename from deploy/nginx/inventory-docker.conf rename to infra/prod/nginx-proxy.conf diff --git a/deploy/docker/nginx.conf b/infra/prod/nginx.conf similarity index 100% rename from deploy/docker/nginx.conf rename to infra/prod/nginx.conf diff --git a/deploy/docker/supervisord.conf b/infra/prod/supervisord.conf similarity index 100% rename from deploy/docker/supervisord.conf rename to infra/prod/supervisord.conf diff --git a/makefile b/makefile index 7b1ff4e..1024c61 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,6 @@ # Permet d'utiliser un .env.docker.local pour override -ENV_DEFAULT = docker/.env.docker -ENV_LOCAL = docker/.env.docker.local +ENV_DEFAULT = infra/dev/.env.docker +ENV_LOCAL = infra/dev/.env.docker.local ENV_FILE := $(if $(wildcard $(ENV_LOCAL)),$(ENV_LOCAL),$(ENV_DEFAULT)) # Permet d'avoir les variables du fichier .env.docker.local @@ -25,13 +25,13 @@ DATA_SQL_NORM ?= data_norm.sql #======================================================================================== env-init: - @mkdir -p docker + @mkdir -p infra/dev @cp --update=none $(ENV_DEFAULT) $(ENV_LOCAL) # Lance le container start: env-init @echo "**** START CONTAINERS ****" - @cp --update=none docker/.env.docker docker/.env.docker.local + @cp --update=none infra/dev/.env.docker infra/dev/.env.docker.local CURRENT_UID=$(shell id -u) CURRENT_GID=$(shell id -g) $(DOCKER_COMPOSE) up -d @echo "" @echo "URLs disponibles:"