From e1cf8751dbaa9ea8bb96a5d9473dc77009a834d0 Mon Sep 17 00:00:00 2001
From: Benjamin Brummer <benjamin.brummer@pinteam.eu>
Date: Tue, 30 Sep 2025 13:16:14 +0200
Subject: [PATCH 1/5] Do not pass all variables into mysql container

---
 debian/docker-compose.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml
index ec2429f..bc675a7 100644
--- a/debian/docker-compose.yml
+++ b/debian/docker-compose.yml
@@ -47,8 +47,6 @@ services:
   mysql:
     image: mysql:8
     restart: unless-stopped
-    env_file:
-      - ./.env
     environment:
       MYSQL_DATABASE: ${DB_DATABASE}
       MYSQL_USER: ${DB_USERNAME}
@@ -59,7 +57,16 @@ services:
     networks:
       - app-network
     healthcheck:
-      test: [ "CMD", "mysqladmin", "ping", "-h", "localhost", "-u${MYSQL_USER}", "-p${MYSQL_PASSWORD}" ]
+      test:
+        [
+          "CMD",
+          "mysqladmin",
+          "ping",
+          "-h",
+          "localhost",
+          "-u${MYSQL_USER}",
+          "-p${MYSQL_PASSWORD}",
+        ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -73,7 +80,7 @@ services:
     networks:
       - app-network
     healthcheck:
-      test: [ "CMD", "redis-cli", "ping" ]
+      test: ["CMD", "redis-cli", "ping"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -87,7 +94,7 @@ volumes:
   app_public:
     driver: local
   app_storage:
-    driver: local  
+    driver: local
   mysql_data:
     driver: local
   redis_data:

From 5970556335773ea92fcbfdca0743b5a0a454f8ec Mon Sep 17 00:00:00 2001
From: Benjamin Brummer <benjamin.brummer@pinteam.eu>
Date: Tue, 30 Sep 2025 13:20:39 +0200
Subject: [PATCH 2/5] Mounting .env file is redundant with env_file:

---
 debian/docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml
index bc675a7..467ded1 100644
--- a/debian/docker-compose.yml
+++ b/debian/docker-compose.yml
@@ -13,7 +13,6 @@ services:
     env_file:
       - ./.env
     volumes:
-      - ./.env:/var/www/html/.env
       # - ./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

From b1ee5a8e98a3ca8b999dbdde53173d6fd034cfc7 Mon Sep 17 00:00:00 2001
From: Benjamin Brummer <benjamin.brummer@pinteam.eu>
Date: Wed, 1 Oct 2025 07:18:49 +0200
Subject: [PATCH 3/5] Use docker default logging configuration

---
 debian/docker-compose.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml
index 467ded1..2ab5fac 100644
--- a/debian/docker-compose.yml
+++ b/debian/docker-compose.yml
@@ -1,9 +1,3 @@
-x-logging: &default-logging
-  options:
-    max-size: "10m"
-    max-file: "3"
-  driver: json-file
-
 services:
   app:
     build:
@@ -25,7 +19,6 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
-    logging: *default-logging
 
   nginx:
     image: nginx:alpine
@@ -41,7 +34,6 @@ services:
     depends_on:
       app:
         condition: service_healthy
-    logging: *default-logging
 
   mysql:
     image: mysql:8
@@ -69,7 +61,6 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
-    logging: *default-logging
 
   redis:
     image: redis:alpine
@@ -83,7 +74,6 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
-    logging: *default-logging
 
 networks:
   app-network:

From 15feba28e5b83a4794076a70fd3c5f1dc0dfcdc3 Mon Sep 17 00:00:00 2001
From: Benjamin Brummer <benjamin.brummer@pinteam.eu>
Date: Wed, 1 Oct 2025 07:23:58 +0200
Subject: [PATCH 4/5] Let compose create the network for the stack

---
 debian/docker-compose.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml
index 2ab5fac..daabde4 100644
--- a/debian/docker-compose.yml
+++ b/debian/docker-compose.yml
@@ -12,8 +12,6 @@ services:
       # - ./supervisor/supervisord.conf:/etc/supervisor/conf.d/supervisord.conf:ro
       - app_public:/var/www/html/public
       - app_storage:/var/www/html/storage
-    networks:
-      - app-network
     depends_on:
       mysql:
         condition: service_healthy
@@ -29,8 +27,6 @@ services:
       - ./nginx:/etc/nginx/conf.d:ro
       - app_public:/var/www/html/public:ro
       - app_storage:/var/www/html/storage:ro
-    networks:
-      - app-network
     depends_on:
       app:
         condition: service_healthy
@@ -45,8 +41,6 @@ services:
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
     volumes:
       - mysql_data:/var/lib/mysql
-    networks:
-      - app-network
     healthcheck:
       test:
         [
@@ -67,18 +61,12 @@ services:
     restart: unless-stopped
     volumes:
       - redis_data:/data
-    networks:
-      - app-network
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 10s
       timeout: 5s
       retries: 5
 
-networks:
-  app-network:
-    driver: bridge
-
 volumes:
   app_public:
     driver: local

From 3ea9b66fde10e47591ff21a3cbb42c3b283a2adc Mon Sep 17 00:00:00 2001
From: Benjamin Brummer <benjamin.brummer@pinteam.eu>
Date: Wed, 1 Oct 2025 07:50:27 +0200
Subject: [PATCH 5/5] Default timing configuration for healthcheck should be
 sufficient

---
 debian/docker-compose.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml
index daabde4..34a5f23 100644
--- a/debian/docker-compose.yml
+++ b/debian/docker-compose.yml
@@ -52,9 +52,6 @@ services:
           "-u${MYSQL_USER}",
           "-p${MYSQL_PASSWORD}",
         ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
 
   redis:
     image: redis:alpine
@@ -63,9 +60,6 @@ services:
       - redis_data:/data
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
 
 volumes:
   app_public: