From 39b6680f0b540f9863e6f6a65c34f14237c84632 Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Tue, 7 Jan 2025 10:04:24 +0000 Subject: [PATCH 1/2] added example command for https and caddy_data volume for persistent certificates --- debian/docker-compose.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml index 2d14dc6..d8811bc 100644 --- a/debian/docker-compose.yml +++ b/debian/docker-compose.yml @@ -12,6 +12,7 @@ x-app-volumes: &volumes - ./php/php.ini:/usr/local/etc/php/conf.d/zzz-php.ini:ro - app_cache:/var/www/html/bootstrap/cache - app_storage:/app/storage + - caddy_data:/data services: app: @@ -20,9 +21,12 @@ services: image: invoiceninja/invoiceninja-debian:${TAG:-latest} restart: unless-stopped # php artisan help octane:frankenphp - command: --log-level=info + command: --port=80 --workers=2 --log-level=info + # command: --host=example.com --port=443 --workers=2 --https --http-redirect --log-level=info ports: - - "80:8000" + - "80:80" # HTTP + # - "443:443" # HTTPS + # - "443:443/udp" # HTTP/3, causes an error for pdf preview H3_GENERAL_PROTOCOL_ERROR env_file: - ./.env environment: @@ -135,14 +139,9 @@ services: volumes: app_cache: - driver: local app_storage: - driver: local + caddy_data: mysql_data: - driver: local redis_data: - driver: local # mariadb: - # driver: local # valkey: - # driver: local From 57724b7d9372a9b0bc0050ec9e465e74644498ac Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Tue, 7 Jan 2025 11:51:09 +0000 Subject: [PATCH 2/2] Single RUN for first stage to avoid insane build times --- debian/Dockerfile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index ca29520..8e306d5 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -4,17 +4,14 @@ RUN curl -s "https://api.github.com/repos/invoiceninja/invoiceninja/releases/lat grep -o '"browser_download_url": "[^"]*invoiceninja.tar"' | \ cut -d '"' -f 4 | \ xargs curl -sL | \ - tar -xz - -RUN ln -s ./resources/views/react/index.blade.php ./public/index.html - -# Set permissions: directories 755, files 644 -RUN chmod -R a=r,u+w,a+X . - -RUN php artisan storage:link - -# Octane -RUN php artisan octane:install --server=frankenphp + tar -xz \ + && ln -s ./resources/views/react/index.blade.php ./public/index.html \ + # Set permissions: directories 755, files 644 + && chmod -R a=r,u+w,a+X . \ + # Symlink + && php artisan storage:link \ + # Octane + && php artisan octane:install --server=frankenphp # ================== # InvoiceNinja image