From 26aa6b45c12cc88c7d3a6e2a68c1141a09bef4de Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Tue, 30 Sep 2025 13:39:14 +0200 Subject: [PATCH 1/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 bff22f0..307badc 100644 --- a/debian/docker-compose.yml +++ b/debian/docker-compose.yml @@ -8,7 +8,6 @@ x-logging: &default-logging x-app-volumes: &volumes volumes: - - ./.env:/app/.env - app_storage:/app/storage - caddy_data:/data From de1a30979d648e3e6bd00daa96686f33e2f4f8eb Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Tue, 30 Sep 2025 13:40:07 +0200 Subject: [PATCH 2/5] Do not pass all variables into mysql container --- debian/docker-compose.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml index 307badc..543e2fa 100644 --- a/debian/docker-compose.yml +++ b/debian/docker-compose.yml @@ -82,8 +82,6 @@ services: mysql: image: mysql:8 restart: unless-stopped - env_file: - - ./.env environment: MYSQL_DATABASE: ${DB_DATABASE} MYSQL_USER: ${DB_USERNAME} @@ -113,8 +111,6 @@ services: # mariadb: # image: mariadb:11.4 # restart: unless-stopped - # env_file: - # - ./.env # environment: # MARIADB_DATABASE: ${DB_DATABASE} # MARIADB_USER: ${DB_USERNAME} From cc2cc537b513976b8f893929687579c04af14020 Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Wed, 1 Oct 2025 07:34:49 +0200 Subject: [PATCH 3/5] Use docker default logging configuration --- debian/docker-compose.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml index 543e2fa..b8df7a3 100644 --- a/debian/docker-compose.yml +++ b/debian/docker-compose.yml @@ -1,11 +1,5 @@ # name: invoiceninja -x-logging: &default-logging - options: - max-size: "10m" - max-file: "3" - driver: json-file - x-app-volumes: &volumes volumes: - app_storage:/app/storage @@ -38,7 +32,6 @@ services: # condition: service_healthy # valkey: # condition: service_healthy - logging: *default-logging app-worker: image: invoiceninja/invoiceninja-octane:${TAG:-latest} @@ -59,7 +52,6 @@ services: depends_on: app: condition: service_healthy - logging: *default-logging app-scheduler: image: invoiceninja/invoiceninja-octane:${TAG:-latest} @@ -77,7 +69,6 @@ services: depends_on: app: condition: service_healthy - logging: *default-logging mysql: image: mysql:8 @@ -94,7 +85,6 @@ services: interval: 10s timeout: 5s retries: 5 - logging: *default-logging redis: image: redis:alpine @@ -106,7 +96,6 @@ services: interval: 10s timeout: 5s retries: 5 - logging: *default-logging # mariadb: # image: mariadb:11.4 @@ -121,7 +110,6 @@ services: # healthcheck: # test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"] # start_period: 60s - # logging: *default-logging # valkey: # image: valkey/valkey:8 @@ -131,7 +119,6 @@ services: # healthcheck: # test: [ "CMD", "valkey-cli", "ping" ] # start_period: 10s - # logging: *default-logging volumes: app_storage: From 7eee4e770e6b739ce43e546a27f1fc2bd31fee7f Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Wed, 1 Oct 2025 07:37:30 +0200 Subject: [PATCH 4/5] disable json logs --- debian/docker-compose.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml index b8df7a3..25268d4 100644 --- a/debian/docker-compose.yml +++ b/debian/docker-compose.yml @@ -2,8 +2,8 @@ x-app-volumes: &volumes volumes: - - app_storage:/app/storage - - caddy_data:/data + - app_storage:/app/storage + - caddy_data:/data services: app: @@ -12,12 +12,12 @@ services: image: invoiceninja/invoiceninja-octane:${TAG:-latest} restart: unless-stopped # php artisan help octane:frankenphp - command: --port=80 --workers=2 --log-level=info + command: --port=80 --workers=2 # command: --host=example.com --port=443 --workers=2 --https --http-redirect --log-level=info ports: - "80:80" # HTTP # - "443:443" # HTTPS - # - "443:443/udp" # HTTP/3, Works for chromium based browser, but causes H3_GENERAL_PROTOCOL_ERROR for pdf previews in Firefox + # - "443:443/udp" # HTTP/3, Works for chromium based browser, but causes H3_GENERAL_PROTOCOL_ERROR for pdf previews in Firefox env_file: - ./.env environment: @@ -32,7 +32,7 @@ services: # condition: service_healthy # valkey: # condition: service_healthy - + app-worker: image: invoiceninja/invoiceninja-octane:${TAG:-latest} restart: unless-stopped @@ -81,7 +81,16 @@ services: volumes: - mysql_data:/var/lib/mysql 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 @@ -92,7 +101,7 @@ services: volumes: - redis_data:/data healthcheck: - test: [ "CMD", "redis-cli", "ping" ] + test: ["CMD", "redis-cli", "ping"] interval: 10s timeout: 5s retries: 5 From 54e5031703bf2a66d3bca4826ad63613ce658ad0 Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Wed, 1 Oct 2025 07:49:24 +0200 Subject: [PATCH 5/5] Default timing configuration for healthcheck should be sufficient --- debian/docker-compose.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml index 25268d4..546126d 100644 --- a/debian/docker-compose.yml +++ b/debian/docker-compose.yml @@ -48,7 +48,6 @@ services: <<: *volumes healthcheck: test: ["CMD", "pgrep", "-f", "queue:work"] - start_period: 10s depends_on: app: condition: service_healthy @@ -65,7 +64,6 @@ services: <<: *volumes healthcheck: test: ["CMD", "pgrep", "-f", "schedule:work"] - start_period: 10s depends_on: app: condition: service_healthy @@ -91,9 +89,6 @@ services: "-u${MYSQL_USER}", "-p${MYSQL_PASSWORD}", ] - interval: 10s - timeout: 5s - retries: 5 redis: image: redis:alpine @@ -102,12 +97,9 @@ services: - redis_data:/data healthcheck: test: ["CMD", "redis-cli", "ping"] - interval: 10s - timeout: 5s - retries: 5 # mariadb: - # image: mariadb:11.4 + # image: mariadb:11.8 # restart: unless-stopped # environment: # MARIADB_DATABASE: ${DB_DATABASE} @@ -118,7 +110,6 @@ services: # - mariadb:/var/lib/mysql # healthcheck: # test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"] - # start_period: 60s # valkey: # image: valkey/valkey:8 @@ -127,7 +118,7 @@ services: # - valkey:/data # healthcheck: # test: [ "CMD", "valkey-cli", "ping" ] - # start_period: 10s + volumes: app_storage: