From fc16d00687f55d38fd237e7c76b86f7149150cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Wed, 9 Feb 2022 20:07:45 -0800 Subject: [PATCH] Tweak Docker image for PHP 8 --- .dockerignore | 2 +- .gitattributes | 4 +--- .gitignore | 1 + docker/etc/php8/conf.d/local.ini | 16 ++++++++-------- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.dockerignore b/.dockerignore index eb9510f92..c2baed0e0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,6 +5,7 @@ .idea .DS_Store .htaccess +.vscode *.lock *.md *.js @@ -17,7 +18,6 @@ tests ChangeLog composer.json Dockerfile -Dockerfile.* Makefile Vagrantfile web.config diff --git a/.gitattributes b/.gitattributes index 1eb022cb9..bec19e755 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,15 +7,13 @@ app/constants.php export-subst docker export-ignore Dockerfile export-ignore -Dockerfile.* export-ignore docker-compose.yml export-ignore Makefile export-ignore README.md export-ignore +SECURITY.md export-ignore Vagrantfile export-ignore data/*.sqlite export-ignore tests export-ignore -CONTRIBUTING export-ignore -app.json export-ignore composer.json export-ignore composer.lock export-ignore diff --git a/.gitignore b/.gitignore index 29cfe64c2..7f8f907e2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ .project /.settings/ .idea +.vscode /nbproject/ .DS_Store ehthumbs.db diff --git a/docker/etc/php8/conf.d/local.ini b/docker/etc/php8/conf.d/local.ini index 0c1795f2b..9559148e1 100644 --- a/docker/etc/php8/conf.d/local.ini +++ b/docker/etc/php8/conf.d/local.ini @@ -1,15 +1,15 @@ expose_php = Off error_reporting = E_ALL -display_errors = Off -log_errors = On +display_errors = stderr +log_errors = 1 error_log = /dev/stderr date.timezone = UTC -allow_url_fopen = On +allow_url_fopen = 1 post_max_size = 32M upload_max_filesize = 32M -opcache.max_accelerated_files = 7963 -opcache.validate_timestamps = Off +opcache.enable = 1 +opcache.enable_cli = 1 opcache.save_comments = 0 -opcache.load_comments = 0 -opcache.fast_shutdown = 1 -opcache.enable_file_override = On +opcache.enable_file_override = 1 +opcache.jit_buffer_size = 100M +opcache.jit = tracing