From c1014de637dfc92de3635515af65e499d2ef11a1 Mon Sep 17 00:00:00 2001 From: tristan Date: Mon, 6 Apr 2026 15:21:38 +0200 Subject: [PATCH] feat : add Gitea env vars, mount Docker socket and deploy dirs Co-Authored-By: Claude Opus 4.6 (1M context) --- .env | 5 +++++ docker-compose.yml | 1 + infra/prod/Dockerfile | 2 +- infra/prod/docker-compose.yml | 7 ++++--- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.env b/.env index e6825f4..0c3cfae 100644 --- a/.env +++ b/.env @@ -43,3 +43,8 @@ DEFAULT_URI=http://localhost # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4" DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8" ###< doctrine/doctrine-bundle ### + +###> gitea ### +GITEA_API_URL=https://gitea.malio.fr +GITEA_API_TOKEN=change_me_in_env_local +###< gitea ### diff --git a/docker-compose.yml b/docker-compose.yml index 13929fa..2a0c757 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,6 +25,7 @@ services: - ./infra/dev/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini - ./LOG:/var/www/html/LOG - uploads_data:/var/www/html/var/uploads + - /var/run/docker.sock:/var/run/docker.sock extra_hosts: - "host.docker.internal:host-gateway" depends_on: diff --git a/infra/prod/Dockerfile b/infra/prod/Dockerfile index 9cfef21..30c6244 100644 --- a/infra/prod/Dockerfile +++ b/infra/prod/Dockerfile @@ -40,7 +40,7 @@ FROM php:8.4-fpm AS production RUN apt-get update && apt-get install -y \ libicu-dev libpq-dev libpng-dev libzip-dev libxml2-dev \ - nginx supervisor \ + nginx supervisor docker.io \ && docker-php-ext-install -j$(nproc) intl pdo_pgsql zip gd opcache \ && rm -rf /var/lib/apt/lists/* diff --git a/infra/prod/docker-compose.yml b/infra/prod/docker-compose.yml index b44caf0..d00019f 100644 --- a/infra/prod/docker-compose.yml +++ b/infra/prod/docker-compose.yml @@ -8,9 +8,10 @@ services: volumes: - ./config/jwt:/var/www/html/config/jwt:ro - ./uploads:/var/www/html/var/uploads - - /var/www/sirh:/var/www/maintenance/sirh - - /var/www/lesstime:/var/www/maintenance/lesstime - - /var/www/inventory:/var/www/maintenance/inventory + - /var/run/docker.sock:/var/run/docker.sock + - /var/www/sirh:/var/www/sirh + - /var/www/lesstime:/var/www/lesstime + - /var/www/inventory:/var/www/inventory extra_hosts: - "host.docker.internal:host-gateway" restart: unless-stopped