diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 3f93ef0..14acfa9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -40,7 +40,7 @@ jobs: - '8.1' refs: - 'master' - - '0.122' + - '0.123' steps: # ------------------------------------------------------------ diff --git a/CHANGELOG.md b/CHANGELOG.md index 8322aa8..00c5fc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ ## Unreleased +## Release 0.123 + +#### Fixed +- Fixex `redis` module compilation for PHP 8.1 +- Fixed PHP Xdebug v3 defaults + +#### Changed +- Removed `pdo_dblib` from PHP 8.1 due to errors + + ## Release 0.122 #### Added diff --git a/Dockerfiles/base/data/php-ini.d/php-5.2.ini b/Dockerfiles/base/data/php-ini.d/php-5.2.ini index 2f614cd..6f300d3 100644 --- a/Dockerfiles/base/data/php-ini.d/php-5.2.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.2.ini @@ -10,40 +10,40 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = Off -display_startup_errors = Off -track_errors = On -log_errors = On -html_errors = Off +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On +html_errors = Off ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/base/data/php-ini.d/php-5.3.ini b/Dockerfiles/base/data/php-ini.d/php-5.3.ini index 966ee72..e25d49f 100644 --- a/Dockerfiles/base/data/php-ini.d/php-5.3.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.3.ini @@ -10,40 +10,40 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = Off -display_startup_errors = Off -track_errors = On -log_errors = On -html_errors = Off +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On +html_errors = Off ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/base/data/php-ini.d/php-5.4.ini b/Dockerfiles/base/data/php-ini.d/php-5.4.ini index dfb4d3b..8bbcb87 100644 --- a/Dockerfiles/base/data/php-ini.d/php-5.4.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.4.ini @@ -10,41 +10,41 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = Off -display_startup_errors = Off -track_errors = On -log_errors = On -html_errors = Off +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On +html_errors = Off ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/base/data/php-ini.d/php-5.5.ini b/Dockerfiles/base/data/php-ini.d/php-5.5.ini index 3684504..9c9279d 100644 --- a/Dockerfiles/base/data/php-ini.d/php-5.5.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.5.ini @@ -10,41 +10,41 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = Off -display_startup_errors = Off -track_errors = On -log_errors = On -html_errors = Off +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On +html_errors = Off ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/base/data/php-ini.d/php-5.6.ini b/Dockerfiles/base/data/php-ini.d/php-5.6.ini index 0784586..7a58b4f 100644 --- a/Dockerfiles/base/data/php-ini.d/php-5.6.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.6.ini @@ -10,41 +10,41 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = Off -display_startup_errors = Off -track_errors = On -log_errors = On -html_errors = Off +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On +html_errors = Off ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/base/data/php-ini.d/php-7.0.ini b/Dockerfiles/base/data/php-ini.d/php-7.0.ini index 29e7b10..d262549 100644 --- a/Dockerfiles/base/data/php-ini.d/php-7.0.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.0.ini @@ -10,41 +10,41 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = Off -display_startup_errors = Off -track_errors = On -log_errors = On -html_errors = Off +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On +html_errors = Off ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/base/data/php-ini.d/php-7.1.ini b/Dockerfiles/base/data/php-ini.d/php-7.1.ini index 8aea9f8..b2d0977 100644 --- a/Dockerfiles/base/data/php-ini.d/php-7.1.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.1.ini @@ -10,41 +10,41 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = Off -display_startup_errors = Off -track_errors = On -log_errors = On -html_errors = Off +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +track_errors = On +log_errors = On +html_errors = Off ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/base/data/php-ini.d/php-7.2.ini b/Dockerfiles/base/data/php-ini.d/php-7.2.ini index 0029179..17bf11d 100644 --- a/Dockerfiles/base/data/php-ini.d/php-7.2.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.2.ini @@ -10,40 +10,39 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = Off -display_startup_errors = Off -log_errors = On -html_errors = Off +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +log_errors = On +html_errors = Off ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.mode = Off +xdebug.start_with_request = Off +xdebug.client_port = 9000 diff --git a/Dockerfiles/base/data/php-ini.d/php-7.3.ini b/Dockerfiles/base/data/php-ini.d/php-7.3.ini index bac8bfe..09b5d0b 100644 --- a/Dockerfiles/base/data/php-ini.d/php-7.3.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.3.ini @@ -10,40 +10,39 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = Off -display_startup_errors = Off -log_errors = On -html_errors = Off +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +log_errors = On +html_errors = Off ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.mode = Off +xdebug.start_with_request = Off +xdebug.client_port = 9000 diff --git a/Dockerfiles/base/data/php-ini.d/php-7.4.ini b/Dockerfiles/base/data/php-ini.d/php-7.4.ini index a5be8cb..e498c09 100644 --- a/Dockerfiles/base/data/php-ini.d/php-7.4.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.4.ini @@ -10,40 +10,39 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = Off -display_startup_errors = Off -log_errors = On -html_errors = Off +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +log_errors = On +html_errors = Off ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.mode = Off +xdebug.start_with_request = Off +xdebug.client_port = 9000 diff --git a/Dockerfiles/base/data/php-ini.d/php-8.0.ini b/Dockerfiles/base/data/php-ini.d/php-8.0.ini index 25d4121..a08a216 100644 --- a/Dockerfiles/base/data/php-ini.d/php-8.0.ini +++ b/Dockerfiles/base/data/php-ini.d/php-8.0.ini @@ -10,40 +10,39 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = Off -display_startup_errors = Off -log_errors = On -html_errors = Off +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +log_errors = On +html_errors = Off ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.mode = Off +xdebug.start_with_request = Off +xdebug.client_port = 9000 diff --git a/Dockerfiles/base/data/php-ini.d/php-8.1.ini b/Dockerfiles/base/data/php-ini.d/php-8.1.ini index dc5fdee..8be3a58 100644 --- a/Dockerfiles/base/data/php-ini.d/php-8.1.ini +++ b/Dockerfiles/base/data/php-ini.d/php-8.1.ini @@ -10,40 +10,39 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = Off -display_startup_errors = Off -log_errors = On -html_errors = Off +error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = Off +display_startup_errors = Off +log_errors = On +html_errors = Off ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.mode = Off +xdebug.start_with_request = Off +xdebug.client_port = 9000 diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index 24b4790..3bfa46c 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -11,7 +11,6 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ alien \ firebird-dev \ - freetds-dev \ libaio-dev \ libbz2-dev \ libc-client-dev \ @@ -329,16 +328,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: pdo_dblib -------------------- -RUN set -eux \ - # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ - # Installation: Generic - # Type: Built-in extension - && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ - && true - - # -------------------- Installing PHP Extension: pdo_firebird -------------------- RUN set -eux \ # Installation: Generic @@ -421,7 +410,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: redis -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: GIT extension && git clone https://github.com/phpredis/phpredis /tmp/redis \ && cd /tmp/redis \ @@ -437,6 +426,8 @@ if [ -d "/usr/local/include/php/ext/msgpack" ]; then \ fi; \ phpize \ && ./configure --enable-redis ${REDIS_ARGS} \ +&& sed -i'' 's/ops->hash_init(ctx);/ops->hash_init(ctx, NULL);/g' library.c \ +&& sed -i'' 's/ops->hash_init(ctx);/ops->hash_init(ctx, NULL);/g' redis_array_impl.c \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ \ @@ -661,7 +652,6 @@ RUN set -eux \ libmemcachedutil2 \ libpng16-16 \ libpq5 \ - libsybdb5 \ libtidy5deb1 \ libvpx5 \ libwebp6 \ @@ -788,8 +778,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^pcre$' \ && php -m | grep -oiE '^pdo$' \ && php-fpm -m | grep -oiE '^pdo$' \ - && php -m | grep -oiE '^pdo_dblib$' \ - && php-fpm -m | grep -oiE '^pdo_dblib$' \ && php -m | grep -oiE '^pdo_firebird$' \ && php-fpm -m | grep -oiE '^pdo_firebird$' \ && php -m | grep -oiE '^pdo_mysql$' \ diff --git a/Dockerfiles/work/data/php-ini.d/php-5.2.ini b/Dockerfiles/work/data/php-ini.d/php-5.2.ini index 3cb919a..2ffce84 100644 --- a/Dockerfiles/work/data/php-ini.d/php-5.2.ini +++ b/Dockerfiles/work/data/php-ini.d/php-5.2.ini @@ -10,40 +10,40 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = On -display_startup_errors = On -track_errors = On -log_errors = On -html_errors = On +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/work/data/php-ini.d/php-5.3.ini b/Dockerfiles/work/data/php-ini.d/php-5.3.ini index 911194b..64b46a5 100644 --- a/Dockerfiles/work/data/php-ini.d/php-5.3.ini +++ b/Dockerfiles/work/data/php-ini.d/php-5.3.ini @@ -10,40 +10,40 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = On -display_startup_errors = On -track_errors = On -log_errors = On -html_errors = On +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/work/data/php-ini.d/php-5.4.ini b/Dockerfiles/work/data/php-ini.d/php-5.4.ini index 30c1a65..e9b8f64 100644 --- a/Dockerfiles/work/data/php-ini.d/php-5.4.ini +++ b/Dockerfiles/work/data/php-ini.d/php-5.4.ini @@ -10,41 +10,41 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = On -display_startup_errors = On -track_errors = On -log_errors = On -html_errors = On +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/work/data/php-ini.d/php-5.5.ini b/Dockerfiles/work/data/php-ini.d/php-5.5.ini index 08f7133..8ca7004 100644 --- a/Dockerfiles/work/data/php-ini.d/php-5.5.ini +++ b/Dockerfiles/work/data/php-ini.d/php-5.5.ini @@ -10,41 +10,41 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = On -display_startup_errors = On -track_errors = On -log_errors = On -html_errors = On +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/work/data/php-ini.d/php-5.6.ini b/Dockerfiles/work/data/php-ini.d/php-5.6.ini index ec0f14d..5c84e34 100644 --- a/Dockerfiles/work/data/php-ini.d/php-5.6.ini +++ b/Dockerfiles/work/data/php-ini.d/php-5.6.ini @@ -10,41 +10,41 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = On -display_startup_errors = On -track_errors = On -log_errors = On -html_errors = On +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/work/data/php-ini.d/php-7.0.ini b/Dockerfiles/work/data/php-ini.d/php-7.0.ini index 0d048f8..4bd2872 100644 --- a/Dockerfiles/work/data/php-ini.d/php-7.0.ini +++ b/Dockerfiles/work/data/php-ini.d/php-7.0.ini @@ -10,41 +10,41 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = On -display_startup_errors = On -track_errors = On -log_errors = On -html_errors = On +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/work/data/php-ini.d/php-7.1.ini b/Dockerfiles/work/data/php-ini.d/php-7.1.ini index e11e06a..0fc952c 100644 --- a/Dockerfiles/work/data/php-ini.d/php-7.1.ini +++ b/Dockerfiles/work/data/php-ini.d/php-7.1.ini @@ -10,41 +10,41 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = On -display_startup_errors = On -track_errors = On -log_errors = On -html_errors = On +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = On +display_startup_errors = On +track_errors = On +log_errors = On +html_errors = On ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.default_enable = Off +xdebug.profiler_enable = Off +xdebug.remote_enable = Off +xdebug.remote_autostart = Off diff --git a/Dockerfiles/work/data/php-ini.d/php-7.2.ini b/Dockerfiles/work/data/php-ini.d/php-7.2.ini index d94ce6e..2257b31 100644 --- a/Dockerfiles/work/data/php-ini.d/php-7.2.ini +++ b/Dockerfiles/work/data/php-ini.d/php-7.2.ini @@ -10,40 +10,39 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = On -display_startup_errors = On -log_errors = On -html_errors = On +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = On +display_startup_errors = On +log_errors = On +html_errors = On ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.mode = Off +xdebug.start_with_request = Off +xdebug.client_port = 9000 diff --git a/Dockerfiles/work/data/php-ini.d/php-7.3.ini b/Dockerfiles/work/data/php-ini.d/php-7.3.ini index ce0d34f..f8dac1b 100644 --- a/Dockerfiles/work/data/php-ini.d/php-7.3.ini +++ b/Dockerfiles/work/data/php-ini.d/php-7.3.ini @@ -10,40 +10,39 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = On -display_startup_errors = On -log_errors = On -html_errors = On +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = On +display_startup_errors = On +log_errors = On +html_errors = On ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.mode = Off +xdebug.start_with_request = Off +xdebug.client_port = 9000 diff --git a/Dockerfiles/work/data/php-ini.d/php-7.4.ini b/Dockerfiles/work/data/php-ini.d/php-7.4.ini index cfa9f90..cc3d03a 100644 --- a/Dockerfiles/work/data/php-ini.d/php-7.4.ini +++ b/Dockerfiles/work/data/php-ini.d/php-7.4.ini @@ -10,40 +10,39 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = On -display_startup_errors = On -log_errors = On -html_errors = On +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = On +display_startup_errors = On +log_errors = On +html_errors = On ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.mode = Off +xdebug.start_with_request = Off +xdebug.client_port = 9000 diff --git a/Dockerfiles/work/data/php-ini.d/php-8.0.ini b/Dockerfiles/work/data/php-ini.d/php-8.0.ini index b8ae839..627dff4 100644 --- a/Dockerfiles/work/data/php-ini.d/php-8.0.ini +++ b/Dockerfiles/work/data/php-ini.d/php-8.0.ini @@ -10,40 +10,39 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = On -display_startup_errors = On -log_errors = On -html_errors = On +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = On +display_startup_errors = On +log_errors = On +html_errors = On ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.mode = Off +xdebug.start_with_request = Off +xdebug.client_port = 9000 diff --git a/Dockerfiles/work/data/php-ini.d/php-8.1.ini b/Dockerfiles/work/data/php-ini.d/php-8.1.ini index a7f6175..a083939 100644 --- a/Dockerfiles/work/data/php-ini.d/php-8.1.ini +++ b/Dockerfiles/work/data/php-ini.d/php-8.1.ini @@ -10,40 +10,39 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = 512M +memory_limit = 512M ; Timeouts -max_execution_time = 120 -max_input_time = 120 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 72M -upload_max_filesize = 64M -max_file_uploads = 20 +post_max_size = 72M +upload_max_filesize = 64M +max_file_uploads = 20 ; Vars -variables_order = EGPCS -max_input_vars = 8000 -max_input_nesting_level = 64 +variables_order = EGPCS +max_input_vars = 8000 +max_input_nesting_level = 64 ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -xmlrpc_errors = Off -report_memleaks = On -display_errors = On -display_startup_errors = On -log_errors = On -html_errors = On +error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED +xmlrpc_errors = Off +report_memleaks = On +display_errors = On +display_startup_errors = On +log_errors = On +html_errors = On ; Xdebug settings -xdebug.default_enable = Off -xdebug.profiler_enable = Off -xdebug.remote_enable = Off -xdebug.remote_autostart = Off +xdebug.mode = Off +xdebug.start_with_request = Off +xdebug.client_port = 9000 diff --git a/README.md b/README.md index 690d282..c8cb205 100644 --- a/README.md +++ b/README.md @@ -685,7 +685,7 @@ Check out this table to see which Docker image provides what PHP modules. 8.1 Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib @@ -1179,7 +1179,10 @@ $ docker run -d \ ```shell # Create config directory to be mounted with dummy configuration $ mkdir config +# Xdebug 2 $ echo "xdebug.enable = 1" > config/xdebug.ini +# Xdebug 3 +$ echo "xdebug.mode = debug" > config/xdebug.ini # Run container and mount it $ docker run -d \ diff --git a/build/ansible/CONFIGURATIONS/php.ini.j2 b/build/ansible/CONFIGURATIONS/php.ini.j2 index 40ad4a8..329e18d 100644 --- a/build/ansible/CONFIGURATIONS/php.ini.j2 +++ b/build/ansible/CONFIGURATIONS/php.ini.j2 @@ -10,47 +10,53 @@ ; Memory ; Note: "memory_limit" should be larger than "post_max_size" -memory_limit = {{ item.cfg[item.key].memory_limit | default(item.cfg[item.alt].memory_limit) }} +memory_limit = {{ item.cfg[item.key].memory_limit | default(item.cfg[item.alt].memory_limit) }} ; Timeouts -max_execution_time = {{ item.cfg[item.key].max_execution_time | default(item.cfg[item.alt].max_execution_time) }} -max_input_time = {{ item.cfg[item.key].max_input_time | default(item.cfg[item.alt].max_input_time) }} +max_execution_time = {{ item.cfg[item.key].max_execution_time | default(item.cfg[item.alt].max_execution_time) }} +max_input_time = {{ item.cfg[item.key].max_input_time | default(item.cfg[item.alt].max_input_time) }} ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = {{ item.cfg[item.key].post_max_size | default(item.cfg[item.alt].post_max_size) }} -upload_max_filesize = {{ item.cfg[item.key].upload_max_filesize | default(item.cfg[item.alt].upload_max_filesize) }} -max_file_uploads = {{ item.cfg[item.key].max_file_uploads | default(item.cfg[item.alt].max_file_uploads) }} +post_max_size = {{ item.cfg[item.key].post_max_size | default(item.cfg[item.alt].post_max_size) }} +upload_max_filesize = {{ item.cfg[item.key].upload_max_filesize | default(item.cfg[item.alt].upload_max_filesize) }} +max_file_uploads = {{ item.cfg[item.key].max_file_uploads | default(item.cfg[item.alt].max_file_uploads) }} ; Vars -variables_order = {{ item.cfg[item.key].variables_order | default(item.cfg[item.alt].variables_order) }} +variables_order = {{ item.cfg[item.key].variables_order | default(item.cfg[item.alt].variables_order) }} {# Only available since PHP >=5.4 #} {% if not (php_version == 5.2 or php_version == 5.3 ) %} -max_input_vars = {{ item.cfg[item.key].max_input_vars | default(item.cfg[item.alt].max_input_vars) }} +max_input_vars = {{ item.cfg[item.key].max_input_vars | default(item.cfg[item.alt].max_input_vars) }} {% endif %} -max_input_nesting_level = {{ item.cfg[item.key].max_input_nesting_level | default(item.cfg[item.alt].max_input_nesting_level) }} +max_input_nesting_level = {{ item.cfg[item.key].max_input_nesting_level | default(item.cfg[item.alt].max_input_nesting_level) }} ; Error reporting ; Note: error_log is dynamic and handled during start to set appropriate setting -error_reporting = {{ item.cfg[item.key].error_reporting | default(item.cfg[item.alt].error_reporting) }} -xmlrpc_errors = {{ item.cfg[item.key].xmlrpc_errors | default(item.cfg[item.alt].xmlrpc_errors) }} -report_memleaks = {{ item.cfg[item.key].report_memleaks | default(item.cfg[item.alt].report_memleaks) }} -display_errors = {{ item.cfg[item.key].display_errors | default(item.cfg[item.alt].display_errors) }} -display_startup_errors = {{ item.cfg[item.key].display_startup_errors | default(item.cfg[item.alt].display_startup_errors) }} +error_reporting = {{ item.cfg[item.key].error_reporting | default(item.cfg[item.alt].error_reporting) }} +xmlrpc_errors = {{ item.cfg[item.key].xmlrpc_errors | default(item.cfg[item.alt].xmlrpc_errors) }} +report_memleaks = {{ item.cfg[item.key].report_memleaks | default(item.cfg[item.alt].report_memleaks) }} +display_errors = {{ item.cfg[item.key].display_errors | default(item.cfg[item.alt].display_errors) }} +display_startup_errors = {{ item.cfg[item.key].display_startup_errors | default(item.cfg[item.alt].display_startup_errors) }} {# Only available before PHP 7.2 #} {% if php_version == 5.2 or php_version == 5.3 or php_version == 5.4 or php_version == 5.5 or php_version == 5.6 or php_version == 7.0 or php_version == 7.1 %} -track_errors = {{ item.cfg[item.key].track_errors | default(item.cfg[item.alt].track_errors) }} +track_errors = {{ item.cfg[item.key].track_errors | default(item.cfg[item.alt].track_errors) }} {% endif %} -log_errors = {{ item.cfg[item.key].log_errors | default(item.cfg[item.alt].log_errors) }} -html_errors = {{ item.cfg[item.key].html_errors | default(item.cfg[item.alt].html_errors) }} +log_errors = {{ item.cfg[item.key].log_errors | default(item.cfg[item.alt].log_errors) }} +html_errors = {{ item.cfg[item.key].html_errors | default(item.cfg[item.alt].html_errors) }} ; Xdebug settings -xdebug.default_enable = {{ item.cfg[item.key].xdebug_default_enable | default(item.cfg[item.alt].xdebug_default_enable) }} -xdebug.profiler_enable = {{ item.cfg[item.key].xdebug_profiler_enable | default(item.cfg[item.alt].xdebug_profiler_enable) }} -xdebug.remote_enable = {{ item.cfg[item.key].xdebug_remote_enable | default(item.cfg[item.alt].xdebug_remote_enable) }} -xdebug.remote_autostart = {{ item.cfg[item.key].xdebug_remote_autostart | default(item.cfg[item.alt].xdebug_remote_autostart) }} +{% if php_version == 5.2 or php_version == 5.3 or php_version == 5.4 or php_version == 5.5 or php_version == 5.6 or php_version == 7.0 or php_version == 7.1 %} +xdebug.default_enable = {{ item.cfg[item.key].xdebug2_default_enable | default(item.cfg[item.alt].xdebug2_default_enable) }} +xdebug.profiler_enable = {{ item.cfg[item.key].xdebug2_profiler_enable | default(item.cfg[item.alt].xdebug2_profiler_enable) }} +xdebug.remote_enable = {{ item.cfg[item.key].xdebug2_remote_enable | default(item.cfg[item.alt].xdebug2_remote_enable) }} +xdebug.remote_autostart = {{ item.cfg[item.key].xdebug2_remote_autostart | default(item.cfg[item.alt].xdebug2_remote_autostart) }} +{% else %} +xdebug.mode = {{ item.cfg[item.key].xdebug3_mode | default(item.cfg[item.alt].xdebug3_mode) }} +xdebug.start_with_request = {{ item.cfg[item.key].xdebug3_start_with_request | default(item.cfg[item.alt].xdebug3_start_with_request) }} +xdebug.client_port = {{ item.cfg[item.key].xdebug3_client_port | default(item.cfg[item.alt].xdebug3_client_port) }} +{% endif %} diff --git a/build/ansible/group_vars/all/all-php-settings.yml b/build/ansible/group_vars/all/all-php-settings.yml index 04ed27f..74d087a 100644 --- a/build/ansible/group_vars/all/all-php-settings.yml +++ b/build/ansible/group_vars/all/all-php-settings.yml @@ -17,33 +17,37 @@ php_settings_ini: # ---- Sane default ---- base: # Memory - memory_limit: 512M + memory_limit: 512M # Timeouts - max_execution_time: "{{ php_timeout }}" - max_input_time: "{{ php_timeout }}" + max_execution_time: "{{ php_timeout }}" + max_input_time: "{{ php_timeout }}" # Uploads # Note: "post_max_size" should be greater than "upload_max_filesize" - post_max_size: 72M - upload_max_filesize: 64M - max_file_uploads: 20 + post_max_size: 72M + upload_max_filesize: 64M + max_file_uploads: 20 # Variables - variables_order: EGPCS - max_input_vars: 8000 - max_input_nesting_level: 64 + variables_order: EGPCS + max_input_vars: 8000 + max_input_nesting_level: 64 # Error reporting - error_reporting: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED - xmlrpc_errors: 'Off' - report_memleaks: 'On' - display_errors: 'Off' - display_startup_errors: 'Off' - track_errors: 'On' - log_errors: 'On' - html_errors: 'Off' - # Xdebug settings - xdebug_default_enable: 'Off' - xdebug_profiler_enable: 'Off' - xdebug_remote_enable: 'Off' - xdebug_remote_autostart: 'Off' + error_reporting: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED + xmlrpc_errors: 'Off' + report_memleaks: 'On' + display_errors: 'Off' + display_startup_errors: 'Off' + track_errors: 'On' + log_errors: 'On' + html_errors: 'Off' + # Xdebug2 settings + xdebug2_default_enable: 'Off' + xdebug2_profiler_enable: 'Off' + xdebug2_remote_enable: 'Off' + xdebug2_remote_autostart: 'Off' + # Xdebug3 settings + xdebug3_mode: 'Off' + xdebug3_start_with_request: 'Off' + xdebug3_client_port: '9000' # ---- Inherits from base ---- mods: @@ -52,20 +56,23 @@ php_settings_ini: # ---- Inherits from base and overwrites certain values ---- work: # Error reporting - error_reporting: E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED - xmlrpc_errors: 'Off' - report_memleaks: 'On' - display_errors: 'On' - display_startup_errors: 'On' - track_errors: 'On' - log_errors: 'On' - html_errors: 'On' - # Xdebug settings - xdebug_default_enable: 'Off' - xdebug_profiler_enable: 'Off' - xdebug_remote_enable: 'Off' - xdebug_remote_autostart: 'Off' - + error_reporting: E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED + xmlrpc_errors: 'Off' + report_memleaks: 'On' + display_errors: 'On' + display_startup_errors: 'On' + track_errors: 'On' + log_errors: 'On' + html_errors: 'On' + # Xdebug2 settings + xdebug2_default_enable: 'Off' + xdebug2_profiler_enable: 'Off' + xdebug2_remote_enable: 'Off' + xdebug2_remote_autostart: 'Off' + # Xdebug3 settings + xdebug3_mode: 'Off' + xdebug3_start_with_request: 'Off' + xdebug3_client_port: '9000' # ------------------------------------------------------------------------------------------------- # php-fpm.conf diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index da8c2c7..6052bb2 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -681,6 +681,7 @@ extensions_available: pdo: already_avail: "{{ php_all_versions }}" pdo_dblib: + disabled: [8.1] # php: symbol lookup error: pdo_dblib.so: undefined symbol: dbinit all: type: builtin pre: ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ @@ -850,6 +851,24 @@ extensions_available: 5.6: type: pecl version: 4.3.0 + 8.1: + type: git + git_url: https://github.com/phpredis/phpredis + git_ref: $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) + command: | + REDIS_ARGS=""; \ + if [ -d "/usr/local/include/php/ext/igbinary" ]; then \ + REDIS_ARGS="${REDIS_ARGS} --enable-redis-igbinary"; \ + fi; \ + if [ -d "/usr/local/include/php/ext/msgpack" ]; then \ + REDIS_ARGS="${REDIS_ARGS} --enable-redis-msgpack"; \ + fi; \ + phpize \ + && ./configure --enable-redis ${REDIS_ARGS} \ + && sed -i'' 's/ops->hash_init(ctx);/ops->hash_init(ctx, NULL);/g' library.c \ + && sed -i'' 's/ops->hash_init(ctx);/ops->hash_init(ctx, NULL);/g' redis_array_impl.c \ + && make -j$(getconf _NPROCESSORS_ONLN) \ + && make install \ all: type: git git_url: https://github.com/phpredis/phpredis