From 06143c88b8d242b6d0cf32b546f54ce643c2bc61 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Mon, 15 Sep 2025 17:31:15 +0200
Subject: [PATCH] svg

---
 .dockerignore          | 41 +++++++++++++++++++++++++++++++++++++++++
 compose.yaml           | 12 ++++++++++--
 misc/docker/Dockerfile | 27 ++++++++++++++++-----------
 3 files changed, 67 insertions(+), 13 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..0459cf6
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,41 @@
+# Dépendances locales (elles seront réinstallées dans l’image)
+vendor/
+node_modules/
+
+# Fichiers de config locaux ou secrets
+.env.local
+.env.*.local
+
+# Cache et logs Symfony
+var/cache/
+var/log/
+
+# Build front-end
+public/build/
+public/bundles/
+
+# Tests, docs, etc.
+phpunit.xml
+phpunit.xml.dist
+tests/
+docs/
+
+# IDE & OS
+*.log
+*.md
+*.swp
+.idea/
+.vscode/
+.DS_Store
+Thumbs.db
+
+# Git
+.git
+.gitignore
+
+# uploads
+uploads/
+public/uploads/
+
+# Volume
+volume/
diff --git a/compose.yaml b/compose.yaml
index e16b448..c5cbb53 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -26,8 +26,16 @@ services:
     ports:
       - "8008:80"
     volumes:
-      - .:/app:delegated
-
+      - ./src:/app/src:delegated
+      - ./templates:/app/templates:delegated
+      - ./config:/app/config:delegated
+      - ./public/uploads:/app/public/uploads:delegated
+      - ./uploads:/app/uploads:delegated
+      - ./misc:/app/misc:delegated
+      - ./public/lib:/app/public/lib:delegated
+      - ./.env.local:/app/.env.local
+      - ./vendor:/app/vendor:delegated
+      - ./public/bundles:/app/public/bundles:delegated
   adminer:
     image: adminer
     container_name: ninecompta-adminer
diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile
index d208704..8bfa7a4 100644
--- a/misc/docker/Dockerfile
+++ b/misc/docker/Dockerfile
@@ -1,21 +1,26 @@
 FROM reg.cadoles.com/envole/nineapache:8.2
 
+USER root
+
+RUN apk add --no-cache tzdata
+ENV TZ=Europe/Paris
+RUN ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime && echo "Europe/Paris" > /etc/timezone
+
 COPY ./misc/docker/apache.conf /etc/apache2/conf.d/nine/site.conf
 
 RUN echo "* * * * * /app/bin/console app:Cron --env=prod" >> /var/spool/cron/crontabs/root
 
-WORKDIR /app
-COPY . .
+RUN mkdir -p /app/vendor && chown -R apache:apache /app
 
-# Installation des dépendances composer
-RUN composer install --no-interaction
+USER apache
+COPY --chown=apache:apache . .
 
-RUN mkdir -p /app/public/uploads
-RUN chown apache /app/public/uploads -R
-RUN chmod u+w /app/public/uploads -R
+#RUN composer install --no-interaction
 
-RUN mkdir -p /app/var
-RUN chown apache /app/var -R
-RUN chmod u+w /app/var -R
+RUN mkdir -p /app/uploads \
+    && mkdir -p /app/public/uploads/avatar \
+    && mkdir -p /app/public/uploads/logo \
+    && cp -rf /app/public/medias/logo /app/public/uploads/logo \
+    && cp -rf /app/public/medias/avatar /app/public/uploads/avatar
 
-CMD  /app/misc/script/reconfigure.sh && /etc/apache2/apache2.sh
+CMD ["/app/misc/script/reconfigure.sh","/etc/apache2/apache2.sh"]