Skip to content

Commit

Permalink
Kumaraksh/php 8217 support (#2394)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
kumaraksh1 authored Mar 19, 2024
1 parent 4064dea commit 350bad7
Show file tree
Hide file tree
Showing 12 changed files with 40 additions and 26 deletions.
8 changes: 4 additions & 4 deletions build/__phpVersions.sh
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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'
Expand Down
14 changes: 10 additions & 4 deletions build/constants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions doc/supportedPlatformVersions.md
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,8 @@
- 8.2.9
- 8.2.14
- 8.2.16
- 8.2.17
- 8.3.4

### buster

Expand Down Expand Up @@ -1116,6 +1118,8 @@
- 8.2.9
- 8.2.14
- 8.2.16
- 8.2.17
- 8.3.4

### focal-scm

Expand Down
6 changes: 3 additions & 3 deletions images/runtime/php-fpm/8.2/8.2.bullseye.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
\
Expand Down
6 changes: 3 additions & 3 deletions images/runtime/php-fpm/8.2/8.2.buster.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
\
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/php-fpm/8.2/base.bullseye.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions images/runtime/php/8.2/8.2.bullseye.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
\
Expand Down
6 changes: 3 additions & 3 deletions images/runtime/php/8.2/8.2.buster.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
\
Expand Down
2 changes: 1 addition & 1 deletion platforms/php/versions/bookworm/versionsToBuild.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

8.2.16, 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593, 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544,

8.3.4, 39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA,
8.3.4, 39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63, 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA,
2 changes: 2 additions & 0 deletions platforms/php/versions/bullseye/versionsToBuild.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
2 changes: 2 additions & 0 deletions platforms/php/versions/buster/versionsToBuild.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
8 changes: 4 additions & 4 deletions src/BuildScriptGenerator/PhpVersions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -21,9 +21,9 @@ public static class PhpVersions
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";
Expand Down

0 comments on commit 350bad7

Please sign in to comment.