prefer files from image

This commit is contained in:
Benjamin Brummer
2025-01-13 12:30:06 +00:00
parent 44b460bf13
commit 31eb278f0d
2 changed files with 8 additions and 4 deletions

6
debian/Dockerfile vendored
View File

@@ -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 /

View File

@@ -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