From 31eb278f0dde550a9e4f638e31f85b45d36a1561 Mon Sep 17 00:00:00 2001
From: Benjamin Brummer <info@benjamin-brummer.de>
Date: Mon, 13 Jan 2025 12:30:06 +0000
Subject: [PATCH] prefer files from image

---
 debian/Dockerfile         | 6 +++++-
 debian/docker-compose.yml | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/Dockerfile b/debian/Dockerfile
index 2be80b5..6832427 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -43,7 +43,11 @@ RUN ( curl -sSLf https://github.com/mlocati/docker-php-extension-installer/relea
         @composer
 
 # Configure PHP
-RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+RUN ln -s "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
+COPY php/php.ini /usr/local/etc/php/conf.d/invoiceninja.ini
+
+COPY php/php-fpm.ini /usr/local/etc/php-fpm.d/invoiceninja.conf
 
 # Copy scripts
 COPY rootfs /
diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml
index e643610..7a9a0df 100644
--- a/debian/docker-compose.yml
+++ b/debian/docker-compose.yml
@@ -14,9 +14,9 @@ services:
       - ./.env
     volumes:
       - ./.env:/var/www/html/.env
-      - ./php/php.ini:/usr/local/etc/php/conf.d/zzz-php.ini:ro
-      - ./php/php-fpm.conf:/usr/local/etc/php-fpm.d/zzz-php-fpm.conf:ro
-      - ./supervisor/supervisord.conf:/etc/supervisor/conf.d/supervisord.conf:ro
+      # - ./php/php.ini:/usr/local/etc/php/conf.d/invoiceninja.ini:ro
+      # - ./php/php-fpm.conf:/usr/local/etc/php-fpm.d/invoiceninja.conf:ro
+      # - ./supervisor/supervisord.conf:/etc/supervisor/conf.d/supervisord.conf:ro
       - app_cache:/var/www/html/bootstrap/cache
       - app_public:/var/www/html/public
       - app_storage:/var/www/html/storage