diff --git a/build/__phpVersions.sh b/build/__phpVersions.sh index 9c6e492822..6c6a6fcb72 100644 --- a/build/__phpVersions.sh +++ b/build/__phpVersions.sh @@ -1,7 +1,7 @@ # This file was auto-generated from 'constants.yaml'. Changes may be overridden. -PHP_RUNTIME_BASE_TAG='20240116.2' -PHP_FPM_RUNTIME_BASE_TAG='20240116.2' +PHP_RUNTIME_BASE_TAG='20240222.2' +PHP_FPM_RUNTIME_BASE_TAG='20240222.2' COMPOSER_DEFAULT_VERSION='2.0.8' COMPOSER_SETUP_SHA384='e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02' COMPOSER1_9_VERSION='1.9.3' @@ -12,9 +12,9 @@ COMPOSER2_3_VERSION='2.3.10' COMPOSER2_4_VERSION='2.4.4' COMPOSER2_5_VERSION='2.5.8' COMPOSER2_6_VERSION='2.6.2' -PHP82_VERSION='8.2.14' +PHP82_VERSION='8.2.16' PHP82_KEYS='1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544' -PHP82_TAR_SHA256='763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583' +PHP82_TAR_SHA256='28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593' PHP81_VERSION='8.1.27' PHP81_KEYS='528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544' PHP81_TAR_SHA256='479e65c3f05714d4aace1370e617d78e49e996ec7a7579a5be47535be61f0658' diff --git a/build/constants.yaml b/build/constants.yaml index bd936e9283..fe98ec24f8 100644 --- a/build/constants.yaml +++ b/build/constants.yaml @@ -185,8 +185,8 @@ file-name-prefix: __ - name: php-versions constants: - php-runtime-base-tag: 20240116.2 - php-fpm-runtime-base-tag: 20240116.2 + php-runtime-base-tag: 20240222.2 + php-fpm-runtime-base-tag: 20240222.2 composer-default-version: 2.0.8 composer-setup-sha384: e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02 composer1-9-version: 1.9.3 @@ -197,9 +197,9 @@ composer2-4-version: 2.4.4 composer2-5-version: 2.5.8 composer2-6-version: 2.6.2 - php82-version: 8.2.14 + php82-version: 8.2.16 php82-keys: 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544 - php82-tar-sha256: 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583 + php82-tar-sha256: 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 php81-version: 8.1.27 php81-keys: 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 php81-tar-sha256: 479e65c3f05714d4aace1370e617d78e49e996ec7a7579a5be47535be61f0658 diff --git a/doc/supportedPlatformVersions.md b/doc/supportedPlatformVersions.md index 6826059ab7..12a954ea36 100644 --- a/doc/supportedPlatformVersions.md +++ b/doc/supportedPlatformVersions.md @@ -1012,6 +1012,7 @@ - 8.1.22 - 8.2.9 +- 8.2.16 ### bullseye @@ -1055,6 +1056,7 @@ - 8.2.8 - 8.2.9 - 8.2.14 +- 8.2.16 ### buster @@ -1112,6 +1114,7 @@ - 8.2.8 - 8.2.9 - 8.2.14 +- 8.2.16 ### focal-scm diff --git a/images/runtime/php-fpm/7.4/base.bullseye.Dockerfile b/images/runtime/php-fpm/7.4/base.bullseye.Dockerfile index c33412af10..df9b595b4d 100644 --- a/images/runtime/php-fpm/7.4/base.bullseye.Dockerfile +++ b/images/runtime/php-fpm/7.4/base.bullseye.Dockerfile @@ -97,8 +97,17 @@ RUN set -eux; \ # Install the Microsoft SQL Server PDO driver on supported versions only. # - https://docs.microsoft.com/en-us/sql/connect/php/installation-tutorial-linux-mac # - https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server +# For php|8.0, latest stable version of pecl/sqlsrv, pecl/pdo_sqlsrv is 5.11.0 RUN set -eux; \ - if [[ $PHP_VERSION == 8.* ]]; then \ + if [[ $PHP_VERSION == 8.0.* ]]; then \ + pecl install sqlsrv-5.11.0 pdo_sqlsrv-5.11.0 \ + && echo extension=pdo_sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/30-pdo_sqlsrv.ini \ + && echo extension=sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/20-sqlsrv.ini; \ + fi + +# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.1.0) +RUN set -eux; \ + if [[ $PHP_VERSION == 8.1.* || $PHP_VERSION == 8.2.* ]]; then \ pecl install sqlsrv pdo_sqlsrv \ && echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \ && echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini; \ diff --git a/images/runtime/php-fpm/8.0/base.bullseye.Dockerfile b/images/runtime/php-fpm/8.0/base.bullseye.Dockerfile index 612487b2a8..bb5859a61e 100644 --- a/images/runtime/php-fpm/8.0/base.bullseye.Dockerfile +++ b/images/runtime/php-fpm/8.0/base.bullseye.Dockerfile @@ -97,8 +97,17 @@ RUN set -eux; \ # Install the Microsoft SQL Server PDO driver on supported versions only. # - https://docs.microsoft.com/en-us/sql/connect/php/installation-tutorial-linux-mac # - https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server +# For php|8.0, latest stable version of pecl/sqlsrv, pecl/pdo_sqlsrv is 5.11.0 RUN set -eux; \ - if [[ $PHP_VERSION == 8.* ]]; then \ + if [[ $PHP_VERSION == 8.0.* ]]; then \ + pecl install sqlsrv-5.11.0 pdo_sqlsrv-5.11.0 \ + && echo extension=pdo_sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/30-pdo_sqlsrv.ini \ + && echo extension=sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/20-sqlsrv.ini; \ + fi + +# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.1.0) +RUN set -eux; \ + if [[ $PHP_VERSION == 8.1.* || $PHP_VERSION == 8.2.* ]]; then \ pecl install sqlsrv pdo_sqlsrv \ && echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \ && echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini; \ diff --git a/images/runtime/php-fpm/8.1/base.bullseye.Dockerfile b/images/runtime/php-fpm/8.1/base.bullseye.Dockerfile index 2e8fdc7ea2..4de7cb717d 100644 --- a/images/runtime/php-fpm/8.1/base.bullseye.Dockerfile +++ b/images/runtime/php-fpm/8.1/base.bullseye.Dockerfile @@ -97,13 +97,23 @@ RUN set -eux; \ # Install the Microsoft SQL Server PDO driver on supported versions only. # - https://docs.microsoft.com/en-us/sql/connect/php/installation-tutorial-linux-mac # - https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server +# For php|8.0, latest stable version of pecl/sqlsrv, pecl/pdo_sqlsrv is 5.11.0 RUN set -eux; \ - if [[ $PHP_VERSION == 8.* ]]; then \ + if [[ $PHP_VERSION == 8.0.* ]]; then \ + pecl install sqlsrv-5.11.0 pdo_sqlsrv-5.11.0 \ + && echo extension=pdo_sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/30-pdo_sqlsrv.ini \ + && echo extension=sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/20-sqlsrv.ini; \ + fi + +# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.1.0) +RUN set -eux; \ + if [[ $PHP_VERSION == 8.1.* || $PHP_VERSION == 8.2.* ]]; then \ pecl install sqlsrv pdo_sqlsrv \ && echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \ && echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini; \ fi + RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ diff --git a/images/runtime/php-fpm/8.2/8.2.bullseye.Dockerfile b/images/runtime/php-fpm/8.2/8.2.bullseye.Dockerfile index 04e6ea0414..abaeb08ca3 100644 --- a/images/runtime/php-fpm/8.2/8.2.bullseye.Dockerfile +++ b/images/runtime/php-fpm/8.2/8.2.bullseye.Dockerfile @@ -44,9 +44,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A -ENV PHP_VERSION 8.2.14 -ENV PHP_URL="https://www.php.net/get/php-8.2.14.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-8.2.14.tar.xz.asc/from/this/mirror" -ENV PHP_SHA256="763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583" PHP_MD5="" +ENV PHP_VERSION 8.2.16 +ENV PHP_URL="https://www.php.net/get/php-8.2.16.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-8.2.16.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593" PHP_MD5="" RUN set -eux; \ \ diff --git a/images/runtime/php-fpm/8.2/8.2.buster.Dockerfile b/images/runtime/php-fpm/8.2/8.2.buster.Dockerfile index 7e22e19b62..fedbd25464 100644 --- a/images/runtime/php-fpm/8.2/8.2.buster.Dockerfile +++ b/images/runtime/php-fpm/8.2/8.2.buster.Dockerfile @@ -44,9 +44,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A -ENV PHP_VERSION 8.2.14 -ENV PHP_URL="https://www.php.net/get/php-8.2.14.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-8.2.14.tar.xz.asc/from/this/mirror" -ENV PHP_SHA256="763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583" PHP_MD5="" +ENV PHP_VERSION 8.2.16 +ENV PHP_URL="https://www.php.net/get/php-8.2.16.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-8.2.16.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593" PHP_MD5="" RUN set -eux; \ \ diff --git a/images/runtime/php-fpm/8.2/base.bullseye.Dockerfile b/images/runtime/php-fpm/8.2/base.bullseye.Dockerfile index 0b75d55206..b19da8ad2f 100644 --- a/images/runtime/php-fpm/8.2/base.bullseye.Dockerfile +++ b/images/runtime/php-fpm/8.2/base.bullseye.Dockerfile @@ -1,6 +1,6 @@ FROM oryxdevmcr.azurecr.io/private/oryx/php-fpm-8.2-bullseye SHELL ["/bin/bash", "-c"] -ENV PHP_VERSION 8.2.14 +ENV PHP_VERSION 8.2.16 # An environment variable for oryx run-script to know the origin of php image so that # start-up command can be determined while creating run script @@ -97,8 +97,17 @@ RUN set -eux; \ # Install the Microsoft SQL Server PDO driver on supported versions only. # - https://docs.microsoft.com/en-us/sql/connect/php/installation-tutorial-linux-mac # - https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server +# For php|8.0, latest stable version of pecl/sqlsrv, pecl/pdo_sqlsrv is 5.11.0 RUN set -eux; \ - if [[ $PHP_VERSION == 8.* ]]; then \ + if [[ $PHP_VERSION == 8.0.* ]]; then \ + pecl install sqlsrv-5.11.0 pdo_sqlsrv-5.11.0 \ + && echo extension=pdo_sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/30-pdo_sqlsrv.ini \ + && echo extension=sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/20-sqlsrv.ini; \ + fi + +# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.1.0) +RUN set -eux; \ + if [[ $PHP_VERSION == 8.1.* || $PHP_VERSION == 8.2.* ]]; then \ pecl install sqlsrv pdo_sqlsrv \ && echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \ && echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini; \ diff --git a/images/runtime/php-fpm/template.base.Dockerfile b/images/runtime/php-fpm/template.base.Dockerfile index 479ae357e1..5c042b39e4 100644 --- a/images/runtime/php-fpm/template.base.Dockerfile +++ b/images/runtime/php-fpm/template.base.Dockerfile @@ -97,13 +97,23 @@ RUN set -eux; \ # Install the Microsoft SQL Server PDO driver on supported versions only. # - https://docs.microsoft.com/en-us/sql/connect/php/installation-tutorial-linux-mac # - https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server +# For php|8.0, latest stable version of pecl/sqlsrv, pecl/pdo_sqlsrv is 5.11.0 RUN set -eux; \ - if [[ $PHP_VERSION == 8.* ]]; then \ + if [[ $PHP_VERSION == 8.0.* ]]; then \ + pecl install sqlsrv-5.11.0 pdo_sqlsrv-5.11.0 \ + && echo extension=pdo_sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/30-pdo_sqlsrv.ini \ + && echo extension=sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/20-sqlsrv.ini; \ + fi + +# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.1.0) +RUN set -eux; \ + if [[ $PHP_VERSION == 8.1.* || $PHP_VERSION == 8.2.* ]]; then \ pecl install sqlsrv pdo_sqlsrv \ && echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \ && echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini; \ fi + RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ diff --git a/images/runtime/php/8.0/base.buster.Dockerfile b/images/runtime/php/8.0/base.buster.Dockerfile index 67bfb068e1..d8f7062fe4 100644 --- a/images/runtime/php/8.0/base.buster.Dockerfile +++ b/images/runtime/php/8.0/base.buster.Dockerfile @@ -105,14 +105,23 @@ RUN set -eux; \ # Install the Microsoft SQL Server PDO driver on supported versions only. # - https://docs.microsoft.com/en-us/sql/connect/php/installation-tutorial-linux-mac # - https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server -# pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 7.3.0) +# For php|8.0, latest stable version of pecl/sqlsrv, pecl/pdo_sqlsrv is 5.11.0 RUN set -eux; \ - if [[ $PHP_VERSION == 8.* ]]; then \ + if [[ $PHP_VERSION == 8.0.* ]]; then \ + pecl install sqlsrv-5.11.0 pdo_sqlsrv-5.11.0 \ + && echo extension=pdo_sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/30-pdo_sqlsrv.ini \ + && echo extension=sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/20-sqlsrv.ini; \ + fi + +# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.1.0) +RUN set -eux; \ + if [[ $PHP_VERSION == 8.1.* || $PHP_VERSION == 8.2.* ]]; then \ pecl install sqlsrv pdo_sqlsrv \ && echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \ && echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini; \ fi + RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ diff --git a/images/runtime/php/8.2/8.2.bullseye.Dockerfile b/images/runtime/php/8.2/8.2.bullseye.Dockerfile index 3d620fdaa0..69997959d2 100644 --- a/images/runtime/php/8.2/8.2.bullseye.Dockerfile +++ b/images/runtime/php/8.2/8.2.bullseye.Dockerfile @@ -100,9 +100,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A -ENV PHP_VERSION 8.2.14 -ENV PHP_URL="https://www.php.net/get/php-8.2.14.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-8.2.14.tar.xz.asc/from/this/mirror" -ENV PHP_SHA256="763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583" PHP_MD5="" +ENV PHP_VERSION 8.2.16 +ENV PHP_URL="https://www.php.net/get/php-8.2.16.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-8.2.16.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593" PHP_MD5="" RUN set -eux; \ \ diff --git a/images/runtime/php/8.2/8.2.buster.Dockerfile b/images/runtime/php/8.2/8.2.buster.Dockerfile index 8f9c17c223..2add127341 100644 --- a/images/runtime/php/8.2/8.2.buster.Dockerfile +++ b/images/runtime/php/8.2/8.2.buster.Dockerfile @@ -100,9 +100,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A -ENV PHP_VERSION 8.2.14 -ENV PHP_URL="https://www.php.net/get/php-8.2.14.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-8.2.14.tar.xz.asc/from/this/mirror" -ENV PHP_SHA256="763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583" PHP_MD5="" +ENV PHP_VERSION 8.2.16 +ENV PHP_URL="https://www.php.net/get/php-8.2.16.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-8.2.16.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593" PHP_MD5="" RUN set -eux; \ \ diff --git a/images/runtime/php/template.base.Dockerfile b/images/runtime/php/template.base.Dockerfile index 2a8814a60b..590778d877 100644 --- a/images/runtime/php/template.base.Dockerfile +++ b/images/runtime/php/template.base.Dockerfile @@ -105,9 +105,18 @@ RUN set -eux; \ # Install the Microsoft SQL Server PDO driver on supported versions only. # - https://docs.microsoft.com/en-us/sql/connect/php/installation-tutorial-linux-mac # - https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server -# pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 7.3.0) + +# For php|8.0, latest stable version of pecl/sqlsrv, pecl/pdo_sqlsrv is 5.11.0 +RUN set -eux; \ + if [[ $PHP_VERSION == 8.0.* ]]; then \ + pecl install sqlsrv-5.11.0 pdo_sqlsrv-5.11.0 \ + && echo extension=pdo_sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/30-pdo_sqlsrv.ini \ + && echo extension=sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/20-sqlsrv.ini; \ + fi + +# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.1.0) RUN set -eux; \ - if [[ $PHP_VERSION == 8.* ]]; then \ + if [[ $PHP_VERSION == 8.1.* || $PHP_VERSION == 8.2.* ]]; then \ pecl install sqlsrv pdo_sqlsrv \ && echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \ && echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini; \ diff --git a/platforms/php/versions/bookworm/versionsToBuild.txt b/platforms/php/versions/bookworm/versionsToBuild.txt index b8f099767a..e195609c77 100644 --- a/platforms/php/versions/bookworm/versionsToBuild.txt +++ b/platforms/php/versions/bookworm/versionsToBuild.txt @@ -1,4 +1,6 @@ # version, sha, gpg keys, dockerfile 8.1.22, 9ea4f4cfe775cb5866c057323d6b320f3a6e0adb1be41a068ff7bfec6f83e71d, 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544, -8.2.9, 1e6cb77f997613864ab3127fbfc6a8c7fdaa89a95e8ed6167617b913b4de4765, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, \ No newline at end of file +8.2.9, 1e6cb77f997613864ab3127fbfc6a8c7fdaa89a95e8ed6167617b913b4de4765, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, + +8.2.16, 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, diff --git a/platforms/php/versions/bullseye/versionsToBuild.txt b/platforms/php/versions/bullseye/versionsToBuild.txt index 0a8e8263de..3203ad4b2d 100644 --- a/platforms/php/versions/bullseye/versionsToBuild.txt +++ b/platforms/php/versions/bullseye/versionsToBuild.txt @@ -41,4 +41,5 @@ 8.2.7, 4b9fb3dcd7184fe7582d7e44544ec7c5153852a2528de3b6754791258ffbdfa0, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, 8.2.8, cfe1055fbcd486de7d3312da6146949aae577365808790af6018205567609801, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, 8.2.9, 1e6cb77f997613864ab3127fbfc6a8c7fdaa89a95e8ed6167617b913b4de4765, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, -8.2.14, 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, \ No newline at end of file +8.2.14, 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, +8.2.16, 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, \ No newline at end of file diff --git a/platforms/php/versions/buster/versionsToBuild.txt b/platforms/php/versions/buster/versionsToBuild.txt index f0689e93c3..00a6f3670f 100644 --- a/platforms/php/versions/buster/versionsToBuild.txt +++ b/platforms/php/versions/buster/versionsToBuild.txt @@ -55,4 +55,5 @@ 8.2.7, 4b9fb3dcd7184fe7582d7e44544ec7c5153852a2528de3b6754791258ffbdfa0, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, 8.2.8, cfe1055fbcd486de7d3312da6146949aae577365808790af6018205567609801, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, 8.2.9, 1e6cb77f997613864ab3127fbfc6a8c7fdaa89a95e8ed6167617b913b4de4765, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, -8.2.14, 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, \ No newline at end of file +8.2.14, 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, +8.2.16, 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, \ No newline at end of file diff --git a/src/BuildScriptGenerator/PhpVersions.cs b/src/BuildScriptGenerator/PhpVersions.cs index 409c08e55f..d4d4064633 100644 --- a/src/BuildScriptGenerator/PhpVersions.cs +++ b/src/BuildScriptGenerator/PhpVersions.cs @@ -6,8 +6,8 @@ namespace Microsoft.Oryx.BuildScriptGenerator.Common { public static class PhpVersions { - public const string PhpRuntimeBaseTag = "20240116.2"; - public const string PhpFpmRuntimeBaseTag = "20240116.2"; + public const string PhpRuntimeBaseTag = "20240222.2"; + public const string PhpFpmRuntimeBaseTag = "20240222.2"; public const string ComposerDefaultVersion = "2.0.8"; public const string ComposerSetupSha384 = "e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02"; public const string Composer19Version = "1.9.3"; @@ -18,9 +18,9 @@ public static class PhpVersions public const string Composer24Version = "2.4.4"; public const string Composer25Version = "2.5.8"; public const string Composer26Version = "2.6.2"; - public const string Php82Version = "8.2.14"; + public const string Php82Version = "8.2.16"; public const string Php82Keys = "1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544"; - public const string Php82TarSha256 = "763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583"; + public const string Php82TarSha256 = "28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593"; public const string Php81Version = "8.1.27"; public const string Php81Keys = "528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544"; public const string Php81TarSha256 = "479e65c3f05714d4aace1370e617d78e49e996ec7a7579a5be47535be61f0658";