From 350bad7f37fa55a2d965474e7e95f9075e989e10 Mon Sep 17 00:00:00 2001 From: kumaraksh1 <112485097+kumaraksh1@users.noreply.github.com> Date: Tue, 19 Mar 2024 21:44:16 +0530 Subject: [PATCH] Kumaraksh/php 8217 support (#2394) * Add support for PHP|8.2.17 * Add support for PHP|8.2.17 * update readme | php | 8.2.17 * Add support for PHP|8.2.17 * Update base tag | php|8.2.17 * nit fix | php|8.2.17 --- build/__phpVersions.sh | 8 ++++---- build/constants.yaml | 14 ++++++++++---- doc/supportedPlatformVersions.md | 4 ++++ images/runtime/php-fpm/8.2/8.2.bullseye.Dockerfile | 6 +++--- images/runtime/php-fpm/8.2/8.2.buster.Dockerfile | 6 +++--- .../runtime/php-fpm/8.2/base.bullseye.Dockerfile | 2 +- images/runtime/php/8.2/8.2.bullseye.Dockerfile | 6 +++--- images/runtime/php/8.2/8.2.buster.Dockerfile | 6 +++--- .../php/versions/bookworm/versionsToBuild.txt | 2 +- .../php/versions/bullseye/versionsToBuild.txt | 2 ++ platforms/php/versions/buster/versionsToBuild.txt | 2 ++ src/BuildScriptGenerator/PhpVersions.cs | 8 ++++---- 12 files changed, 40 insertions(+), 26 deletions(-) diff --git a/build/__phpVersions.sh b/build/__phpVersions.sh index 536f44686..5bf6570ed 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='20240318.5' -PHP_FPM_RUNTIME_BASE_TAG='20240318.4' +PHP_RUNTIME_BASE_TAG='20240319.1' +PHP_FPM_RUNTIME_BASE_TAG='20240319.1' COMPOSER_DEFAULT_VERSION='2.6.2' COMPOSER_SETUP_SHA384='e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02' COMPOSER1_9_VERSION='1.9.3' @@ -15,9 +15,9 @@ COMPOSER2_6_VERSION='2.6.2' PHP83_VERSION='8.3.4' PHP83_KEYS='1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA' PHP83_TAR_SHA256='39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63' -PHP82_VERSION='8.2.16' +PHP82_VERSION='8.2.17' PHP82_KEYS='1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544' -PHP82_TAR_SHA256='28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593' +PHP82_TAR_SHA256='1cc4ef733ba58f6557db648012471f1916e5bac316303aa165535bedab08ee35' PHP81_VERSION='8.1.27' PHP81_KEYS='528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544' PHP81_TAR_SHA256='479e65c3f05714d4aace1370e617d78e49e996ec7a7579a5be47535be61f0658' diff --git a/build/constants.yaml b/build/constants.yaml index 06541147f..ee9640303 100644 --- a/build/constants.yaml +++ b/build/constants.yaml @@ -185,8 +185,8 @@ file-name-prefix: __ - name: php-versions constants: - php-runtime-base-tag: 20240318.5 - php-fpm-runtime-base-tag: 20240318.4 + php-runtime-base-tag: 20240319.1 + php-fpm-runtime-base-tag: 20240319.1 composer-default-version: 2.6.2 composer-setup-sha384: e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02 composer1-9-version: 1.9.3 @@ -200,9 +200,9 @@ php83-version: 8.3.4 php83-keys: 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA php83-tar-sha256: 39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63 - php82-version: 8.2.16 + php82-version: 8.2.17 php82-keys: 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544 - php82-tar-sha256: 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 + php82-tar-sha256: 1cc4ef733ba58f6557db648012471f1916e5bac316303aa165535bedab08ee35 php81-version: 8.1.27 php81-keys: 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 php81-tar-sha256: 479e65c3f05714d4aace1370e617d78e49e996ec7a7579a5be47535be61f0658 @@ -233,6 +233,9 @@ - 8.1-debian-buster - 8.2-debian-bullseye - 8.2-debian-buster + - 8.3-debian-bullseye + - 8.3-debian-buster + - 8.3-debian-bookworm fpm-runtime-versions: - 7.4-fpm-debian-bullseye - 7.4-fpm-debian-buster @@ -242,6 +245,9 @@ - 8.1-fpm-debian-buster - 8.2-fpm-debian-bullseye - 8.2-fpm-debian-buster + - 8.3-fpm-debian-bullseye + - 8.3-fpm-debian-buster + - 8.3-fpm-debian-bookworm outputs: - type: csharp directory: src/BuildScriptGenerator diff --git a/doc/supportedPlatformVersions.md b/doc/supportedPlatformVersions.md index 55aea30ec..b66119dd8 100644 --- a/doc/supportedPlatformVersions.md +++ b/doc/supportedPlatformVersions.md @@ -1058,6 +1058,8 @@ - 8.2.9 - 8.2.14 - 8.2.16 +- 8.2.17 +- 8.3.4 ### buster @@ -1116,6 +1118,8 @@ - 8.2.9 - 8.2.14 - 8.2.16 +- 8.2.17 +- 8.3.4 ### focal-scm 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 abaeb08ca..c750cf6b1 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.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="" +ENV PHP_VERSION 8.2.17 +ENV PHP_URL="https://www.php.net/get/php-8.2.17.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-8.2.17.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="1cc4ef733ba58f6557db648012471f1916e5bac316303aa165535bedab08ee35" 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 fedbd2546..303838466 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.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="" +ENV PHP_VERSION 8.2.17 +ENV PHP_URL="https://www.php.net/get/php-8.2.17.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-8.2.17.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="1cc4ef733ba58f6557db648012471f1916e5bac316303aa165535bedab08ee35" 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 b19da8ad2..534fdb420 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.16 +ENV PHP_VERSION 8.2.17 # 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 diff --git a/images/runtime/php/8.2/8.2.bullseye.Dockerfile b/images/runtime/php/8.2/8.2.bullseye.Dockerfile index 69997959d..735c2cc1b 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.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="" +ENV PHP_VERSION 8.2.17 +ENV PHP_URL="https://www.php.net/get/php-8.2.17.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-8.2.17.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="1cc4ef733ba58f6557db648012471f1916e5bac316303aa165535bedab08ee35" 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 2add12734..2e492af1b 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.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="" +ENV PHP_VERSION 8.2.17 +ENV PHP_URL="https://www.php.net/get/php-8.2.17.tar.xz/from/this/mirror" PHP_ASC_URL="https://www.php.net/get/php-8.2.17.tar.xz.asc/from/this/mirror" +ENV PHP_SHA256="1cc4ef733ba58f6557db648012471f1916e5bac316303aa165535bedab08ee35" PHP_MD5="" RUN set -eux; \ \ diff --git a/platforms/php/versions/bookworm/versionsToBuild.txt b/platforms/php/versions/bookworm/versionsToBuild.txt index 342510c74..2a669ab54 100644 --- a/platforms/php/versions/bookworm/versionsToBuild.txt +++ b/platforms/php/versions/bookworm/versionsToBuild.txt @@ -5,4 +5,4 @@ 8.2.16, 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, -8.3.4, 39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA, \ No newline at end of file +8.3.4, 39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA, diff --git a/platforms/php/versions/bullseye/versionsToBuild.txt b/platforms/php/versions/bullseye/versionsToBuild.txt index 32c4fe2bd..09afdddef 100644 --- a/platforms/php/versions/bullseye/versionsToBuild.txt +++ b/platforms/php/versions/bullseye/versionsToBuild.txt @@ -43,4 +43,6 @@ 8.2.9, 1e6cb77f997613864ab3127fbfc6a8c7fdaa89a95e8ed6167617b913b4de4765, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, 8.2.14, 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, 8.2.16, 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, +8.2.17, 1cc4ef733ba58f6557db648012471f1916e5bac316303aa165535bedab08ee35, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, + 8.3.4, 39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA, diff --git a/platforms/php/versions/buster/versionsToBuild.txt b/platforms/php/versions/buster/versionsToBuild.txt index bb7e80db1..c9f0ed74a 100644 --- a/platforms/php/versions/buster/versionsToBuild.txt +++ b/platforms/php/versions/buster/versionsToBuild.txt @@ -57,4 +57,6 @@ 8.2.9, 1e6cb77f997613864ab3127fbfc6a8c7fdaa89a95e8ed6167617b913b4de4765, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, 8.2.14, 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, 8.2.16, 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, +8.2.17, 1cc4ef733ba58f6557db648012471f1916e5bac316303aa165535bedab08ee35, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544, + 8.3.4, 39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA, diff --git a/src/BuildScriptGenerator/PhpVersions.cs b/src/BuildScriptGenerator/PhpVersions.cs index a08f52fe8..ffb3b7da2 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 = "20240318.5"; - public const string PhpFpmRuntimeBaseTag = "20240318.4"; + public const string PhpRuntimeBaseTag = "20240319.1"; + public const string PhpFpmRuntimeBaseTag = "20240319.1"; public const string ComposerDefaultVersion = "2.6.2"; public const string ComposerSetupSha384 = "e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02"; public const string Composer19Version = "1.9.3"; @@ -21,9 +21,9 @@ namespace Microsoft.Oryx.BuildScriptGenerator.Common public const string Php83Version = "8.3.4"; public const string Php83Keys = "1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA"; public const string Php83TarSha256 = "39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63"; - public const string Php82Version = "8.2.16"; + public const string Php82Version = "8.2.17"; public const string Php82Keys = "1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544"; - public const string Php82TarSha256 = "28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593"; + public const string Php82TarSha256 = "1cc4ef733ba58f6557db648012471f1916e5bac316303aa165535bedab08ee35"; public const string Php81Version = "8.1.27"; public const string Php81Keys = "528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544"; public const string Php81TarSha256 = "479e65c3f05714d4aace1370e617d78e49e996ec7a7579a5be47535be61f0658";