chore : bump version to v1.9.11

Keep only Docker-based deployment workflow.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.dockerignore

@@ -2,10 +2,10 @@
 .gitea
 .env.local
 .env.test
-docker/
+infra/dev/
-deploy/docker/docker-compose.prod.yml
+infra/prod/docker-compose.yml
-deploy/docker/deploy.sh
+infra/prod/deploy.sh
-deploy/docker/.env.example
+infra/prod/.env.example
 frontend/node_modules
 frontend/.nuxt
 frontend/.output

.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 \
             .

.gitea/workflows/release-artefact.yml

@@ -1,67 +0,0 @@
-name: Build Release Artefact
-
-on:
-  push:
-    tags:
-      - "v*"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: "8.4"
-          extensions: mbstring, intl, pdo_pgsql, xml, curl, zip, gd
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: "lts/*"
-
-      - name: Install backend deps (prod)
-        env:
-          APP_ENV: prod
-          APP_DEBUG: "0"
-        run: composer install --no-dev --optimize-autoloader --no-interaction --no-scripts
-
-      - name: Build frontend (static)
-        run: |
-          cd frontend
-          npm ci
-          CI=1 NUXT_TELEMETRY_DISABLED=1 NUXT_PUBLIC_API_BASE_URL=/api NUXT_PUBLIC_APP_BASE=/ npm run generate
-          test -f .output/public/index.html
-
-      - name: Build artefact
-        shell: bash
-        run: |
-          set -euo pipefail
-          mkdir -p release
-          tar -czf "release/inventory-${GITHUB_REF_NAME}.tar.gz" \
-            .env \
-            bin \
-            config \
-            migrations \
-            public \
-            src \
-            templates \
-            vendor \
-            composer.json \
-            composer.lock \
-            symfony.lock \
-            VERSION \
-            frontend/.output
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: release/inventory-${{ github.ref_name }}.tar.gz
-        env:
-          GITHUB_TOKEN: ${{ secrets.REGISTRY_TOKEN }}

.gitignore

@@ -20,7 +20,7 @@
 ###< phpunit/phpunit ###
 
 ###> docker ###
-docker/.env.docker.local
+infra/dev/.env.docker.local
 ###< docker ###
 ###> migration archives ###
 /_archives/

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
 

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '1.9.9'
+    app.version: '1.9.11'

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
+      - ./infra/dev/php.ini:/usr/local/etc/php/php.ini
-      - ./docker/php/config/vhost.conf:/etc/apache2/sites-available/000-default.conf
+      - ./infra/dev/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/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:

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 infra/prod/supervisord.conf /etc/supervisor/conf.d/app.conf
-COPY deploy/docker/nginx.conf /etc/nginx/sites-enabled/inventory.conf
+COPY infra/prod/nginx.conf /etc/nginx/sites-enabled/inventory.conf
 
 # Backend from stage 1
 COPY --from=backend-build /app /var/www/html

makefile

@@ -1,6 +1,6 @@
 # Permet d'utiliser un .env.docker.local pour override
-ENV_DEFAULT = docker/.env.docker
+ENV_DEFAULT = infra/dev/.env.docker
-ENV_LOCAL   = docker/.env.docker.local
+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:"