diff --git a/.github/workflows/docker.build.yaml b/.github/workflows/docker.build.yaml index 6290cf5..6ebf205 100644 --- a/.github/workflows/docker.build.yaml +++ b/.github/workflows/docker.build.yaml @@ -12,7 +12,7 @@ jobs: build: strategy: matrix: - php: [ 7.4.33, 8.0.26, 8.1.13 ] + php: [ 7.4.33, 8.0.26, 8.1.13, 8.2.0 ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index 9ee8c09..9803e0e 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ similar mechanism in Kubernetes or your actual platform. | Variable Name | Type | Default | Description | | ----------------------- | ------- | -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- | | PHP_BASE_PATH | string | /opt/flownative/php | Base path for PHP (read-only) | -| PHP_DATE_TIMEZONE | string | | Default timezone ([doc](https://www.php.net/manual/en/datetime.configuration.php#ini.date.timezone)) | +| PHP_DATE_TIMEZONE | string | UTC | Default timezone ([doc](https://www.php.net/manual/en/datetime.configuration.php#ini.date.timezone)) | | PHP_ERROR_REPORTING | string | 2147483647 | PHP error reporting log levels ([doc](https://www.php.net/manual/en/errorfunc.configuration.php#ini.error-reporting)) | | PHP_DISPLAY_ERRORS | string | off | Display PHP errors ([doc](https://www.php.net/manual/en/errorfunc.configuration.php#ini.display-errors)) | | PHP_ERROR_LOG | string | /dev/stderr | Path leading to the file where PHP errors should be logged | diff --git a/root-files/build.sh b/root-files/build.sh index a80d497..5f4a978 100755 --- a/root-files/build.sh +++ b/root-files/build.sh @@ -177,7 +177,7 @@ build_compile_php() { --with-bz2 \ --without-pear \ >$(debug_device) - elif [[ "${PHP_VERSION}" =~ ^8.[0-1] ]]; then + elif [[ "${PHP_VERSION}" =~ ^8.[0-2] ]]; then ./configure \ --prefix=${PHP_BASE_PATH} \ --with-config-file-path="${PHP_BASE_PATH}/etc" \ @@ -211,7 +211,7 @@ build_compile_php() { --without-pear \ >$(debug_device) else - error "🛠 Unsupported PHP version ${PHP_VERSION}" + error "🛠 No configure call available for PHP version ${PHP_VERSION}" exit 1 fi @@ -430,7 +430,7 @@ case $1 in init) banner_flownative 'PHP' - if [[ ! "${PHP_VERSION}" =~ ^7.[1-4]|^8.[0-1] ]]; then + if [[ ! "${PHP_VERSION}" =~ ^7.[1-4]|^8.[0-2] ]]; then error "🛠 Unsupported PHP version '${PHP_VERSION}'" exit 1 fi diff --git a/root-files/opt/flownative/lib/php-fpm.sh b/root-files/opt/flownative/lib/php-fpm.sh index 8d31424..f7fffef 100755 --- a/root-files/opt/flownative/lib/php-fpm.sh +++ b/root-files/opt/flownative/lib/php-fpm.sh @@ -27,7 +27,7 @@ export PHP_TMP_PATH="${PHP_TMP_PATH:-${PHP_BASE_PATH}/tmp}" export PHP_LOG_PATH="${PHP_LOG_PATH:-${PHP_BASE_PATH}/log}" export PHP_MEMORY_LIMIT="${PHP_MEMORY_LIMIT:-750M}" -export PHP_DATE_TIMEZONE="${PHP_DATE_TIMEZONE:-}" +export PHP_DATE_TIMEZONE="${PHP_DATE_TIMEZONE:-UTC}" export PHP_DISPLAY_ERRORS="${PHP_DISPLAY_ERRORS:-off}" export PHP_ERROR_REPORTING="${PHP_ERROR_REPORTING:-2147483647}" export PHP_ERROR_LOG="${PHP_ERROR_LOG:-/dev/stderr}" diff --git a/root-files/opt/flownative/php/build/extensions/xdebug/xdebug.sh b/root-files/opt/flownative/php/build/extensions/xdebug/xdebug.sh index e1ebc47..844b51a 100644 --- a/root-files/opt/flownative/php/build/extensions/xdebug/xdebug.sh +++ b/root-files/opt/flownative/php/build/extensions/xdebug/xdebug.sh @@ -38,7 +38,9 @@ extensions_xdebug_runtime_packages() { # @return string # extensions_xdebug_url() { - if [[ "${PHP_VERSION}" =~ ^8 ]]; then + if [[ "${PHP_VERSION}" =~ ^8.2 ]]; then + echo "https://xdebug.org/files/xdebug-3.2.0.tgz" + elif [[ "${PHP_VERSION}" =~ ^8 ]]; then echo "https://xdebug.org/files/xdebug-3.1.6.tgz" else echo "https://xdebug.org/files/xdebug-2.9.8.tgz"