Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User/vchintalapat/stack updates dec #2553

Merged
merged 49 commits into from
Jan 16, 2025
Merged

User/vchintalapat/stack updates dec #2553

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
3fb701e
stack updates for php and python
Saipriya-1144 Dec 18, 2024
fdd4ab5
added tests for python 3.13 and php 8.4
Saipriya-1144 Dec 19, 2024
5ddca9c
modified dockerfile names and bullseye.dockerfile
Saipriya-1144 Dec 19, 2024
9ffc516
updated php versions
Saipriya-1144 Dec 22, 2024
b1b1527
updated php 8.4 dockerfiles
Saipriya-1144 Dec 22, 2024
5d20600
removed php 8.4 dockerfiles
Saipriya-1144 Dec 22, 2024
dc5e0b6
added php 8.4 dockerfiles
Saipriya-1144 Dec 22, 2024
39e3f1e
updated php 8.4 tests
Saipriya-1144 Dec 22, 2024
13a134b
updated php 8.4 gpg keys
Saipriya-1144 Dec 22, 2024
5d5c0e4
fixed syntax error in php 8.4 dockerfile
Saipriya-1144 Dec 23, 2024
50fbb1c
added print statements for debugging
Saipriya-1144 Dec 23, 2024
91b67dc
installed imap from pecl
Saipriya-1144 Dec 23, 2024
b84c2af
removed imap installation
Saipriya-1144 Dec 23, 2024
e970c69
updated php 8.4 bullseye and bookworm dockerfiles
Saipriya-1144 Dec 23, 2024
4732593
added new tests for python and php
Saipriya-1144 Dec 23, 2024
32e6277
updated php 8.4 bullseye and bookworm dockerfiles
Saipriya-1144 Dec 23, 2024
a4a9718
updated php test
Saipriya-1144 Dec 24, 2024
ebc76f5
updated php 8.4 dockerfiles
Saipriya-1144 Dec 25, 2024
8160053
updated php 8.4 dockerfiles
Saipriya-1144 Dec 25, 2024
d760ec0
removing imagick as it's failing to install
Saipriya-1144 Dec 25, 2024
de5bc11
added php 8.4 to list of available runtime versions
Saipriya-1144 Dec 26, 2024
905d68b
removed lxml for php 8.4
Saipriya-1144 Dec 26, 2024
484107c
Merge branch 'main' of https://github.com/microsoft/Oryx into user/vc…
Saipriya-1144 Dec 31, 2024
2aff82f
updated php versions
Saipriya-1144 Jan 9, 2025
389e78c
updated node versions
Saipriya-1144 Jan 9, 2025
5d15b62
updated python versions
Saipriya-1144 Jan 9, 2025
74b73b3
Merge branch 'main' of https://github.com/microsoft/Oryx into user/vc…
Saipriya-1144 Jan 9, 2025
bf95636
updated debian flavors for python
Saipriya-1144 Jan 9, 2025
6125e98
updated debian flavors for python
Saipriya-1144 Jan 9, 2025
582586d
updated python tests
Saipriya-1144 Jan 9, 2025
08f7036
reverted DotNetConstants
Saipriya-1144 Jan 10, 2025
30d6da0
updated npm version and added python tests
Saipriya-1144 Jan 13, 2025
a981a3c
removed tests for php-composer 2.8.x and 2.7.x
Saipriya-1144 Jan 13, 2025
828ef4d
reverted DotNetConstants.cs
Saipriya-1144 Jan 13, 2025
3c0646d
building php composer 2.7.x and 2.8.x versions
Saipriya-1144 Jan 13, 2025
cbc5c1a
building php composer
Saipriya-1144 Jan 13, 2025
ef0e8a5
updated php version for building php composer
Saipriya-1144 Jan 14, 2025
3b7884c
Added new php-composer version
Saipriya-1144 Jan 14, 2025
25e7d5b
updated php dockerfiles
Saipriya-1144 Jan 14, 2025
48f75c0
updated php dockerfile
Saipriya-1144 Jan 15, 2025
9cccf31
updated npm version
Saipriya-1144 Jan 15, 2025
01550ef
added versions to build files
Saipriya-1144 Jan 15, 2025
3b9af70
added versions to build files for php-composer
Saipriya-1144 Jan 15, 2025
7c88d34
cleanedup dockerfiles
Saipriya-1144 Jan 15, 2025
b7411ab
reverted DotNetConstants.cs
Saipriya-1144 Jan 15, 2025
338d505
updated dotnet 8,9
Saipriya-1144 Jan 15, 2025
caaf68c
updated php version to build php-composer
Saipriya-1144 Jan 15, 2025
4c000f6
Installed libsodium-dev to php sdk
Saipriya-1144 Jan 16, 2025
e9a6fad
Reverted DotNetConstants.cs
Saipriya-1144 Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions images/constants.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ variables:
node22DebianFlavors: bullseye,bookworm
python38DebianFlavors: bullseye,buster
python39DebianFlavors: bullseye,buster
python310DebianFlavors: bullseye,buster
python310DebianFlavors: bullseye
python311DebianFlavors: bullseye,bookworm
python312DebianFlavors: bullseye,bookworm
python313DebianFlavors: bookworm
python313DebianFlavors: bullseye,bookworm
dotnet60DebianFlavors: bullseye
dotnet80DebianFlavors: bullseye,bookworm
dotnet90DebianFlavors: bookworm
php81DebianFlavors: bullseye
php82DebianFlavors: bullseye
php83DebianFlavors: bullseye,bookworm
php84DebianFlavors: bullseye,bookworm
debianFlavors: buster,bullseye,bookworm
dotnetDebianFlavors: bookworm,bullseye
nodejsDebianFlavors: bookworm,bullseye
Expand All @@ -36,9 +37,10 @@ variables:
GitHubActions_BaseImage_Buster: mcr.microsoft.com/mirror/docker/library/buildpack-deps@sha256:be7137ba47bdf421d3950abe1200322631e8db11b468cd6f0ebf3d687e556c90
GitHubActions_BaseImage_Bullseye: mcr.microsoft.com/mirror/docker/library/buildpack-deps@sha256:25c86292946cce832340fe808ac47e5a845b68c488f177a47ff44fd59040397d
GitHubActions_BaseImage_Bookworm: mcr.microsoft.com/mirror/docker/library/buildpack-deps@sha256:ff838f535d6e3bace9ab7eefa360d648ba529f9aa57fdd709335f8ef0516cdde
php81_GPG_keys: 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544
php82_GPG_keys: 1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544
php83_GPG_keys: 1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA
php81_GPG_keys: "528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544"
php82_GPG_keys: "1198C0117593497A5EC5C199286AF1F9897469DC 39B641343D8C104B2B146DC3F9C39DC0B9698544"
php83_GPG_keys: "1198C0117593497A5EC5C199286AF1F9897469DC AFD8691FDAEDF03BDF6E460563F15A9B715376CA"
php84_GPG_keys: "AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6"
python310_GPG_keys: A035C8C19219BA821ECEA86B64E628F8D684696D
python311_GPG_keys: A035C8C19219BA821ECEA86B64E628F8D684696D
python312_GPG_keys: 7169605F62C751356D054A26A821E680E5FA6305
Expand All @@ -57,18 +59,20 @@ variables:
NET_CORE_APP_80_SHA: 7fb813677720d125c2337fedc6131b230daf1c1d79d5912a1ca6b5e08bf7802b412de3248d645b6483ab23f3fae837ed02a0e520e33020cfef2c888c54f474ac
NET_CORE_APP_90: 9.0.0
NET_CORE_APP_90_SHA: 5176bd68637646cd36fce7a88f83effe1065fb075e6d4a46b8be3c33d5a8394740577f0ed4f8b4fb13fa69fe83b229eb55ab7f45caac90849bf0392a670ed5af
node18Version: 18.20.4
node20Version: 20.18.0
node22Version: 22.9.0
php81Version: 8.1.30
php81Version_SHA: f24a6007f0b25a53cb7fbaee69c85017e0345b62089c2425a0afb7e177192ed1
php82Version: 8.2.24
php82Version_SHA: 80a5225746a9eb484475b312d4c626c63a88a037d8e56d214f30205e1ba1411a
php83Version: 8.3.14
php83Version_SHA: 58b4cb9019bf70c0cbcdb814c7df79b9065059d14cf7dbf48d971f8e56ae9be7
python310Version: 3.10.15
python311Version: 3.11.10
python312Version: 3.12.6
node18Version: 18.20.5
node20Version: 20.18.1
node22Version: 22.13.0
php81Version: 8.1.31
php81Version_SHA: c4f244d46ba51c72f7d13d4f66ce6a9e9a8d6b669c51be35e01765ba58e7afca
php82Version: 8.2.27
php82Version_SHA: 3eec91294d8c09b3df80b39ec36d574ed9b05de4c8afcb25fa215d48f9ecbc6b
php83Version: 8.3.15
php83Version_SHA: 3df5d45637283f759eef8fc3ce03de829ded3e200c3da278936a684955d2f94f
php84Version: 8.4.2
php84Version_SHA: 92636453210f7f2174d6ee6df17a5811368f556a6c2c2cbcf019321e36456e01
python310Version: 3.10.16
python311Version: 3.11.11
python312Version: 3.12.8
python38Version: 3.8.20
python313Version: 3.13.0
python39Version: 3.9.20
python313Version: 3.13.1
python39Version: 3.9.21
25 changes: 9 additions & 16 deletions images/runtime/build_runtime_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,11 @@ case $stack_name in
docker build -f ./images/runtime/node/20/$debian_flavor.Dockerfile -t node20_$debian_flavor --build-arg NODE20_VERSION=$node20Version --build-arg BASE_IMAGE="docker.io/library/oryx_node_run_base_$debian_flavor" --build-arg NPM_VERSION=$NPM_VERSION --build-arg PM2_VERSION=$PM2_VERSION --build-arg NODE_APP_INSIGHTS_SDK_VERSION=$NODE_APP_INSIGHTS_SDK_VERSION --build-arg USER_DOTNET_AI_VERSION=$USER_DOTNET_AI_VERSION --build-arg AI_CONNECTION_STRING=$AI_CONNECTION_STRING .
rm -f ./nodejs-$debian_flavor-$node20Version.tar.gz
;;
esac
;;

"php")
docker build -f ./images/runtime/commonbase/phpRuntimeBase.Dockerfile -t oryx_php_run_base_$debian_flavor --build-arg BASE_IMAGE="docker.io/library/oryx_run_base_$debian_flavor" .
case $stack_version in
"8.1")
docker build -f ./images/runtime/php/8.1/$debian_flavor.Dockerfile -t php81_image_$debian_flavor --build-arg BASE_IMAGE="docker.io/library/oryx_php_run_base_$debian_flavor" --build-arg PHP_VERSION=$php81Version --build-arg PHP_SHA256=$php81Version_SHA --build-arg USER_DOTNET_AI_VERSION=$USER_DOTNET_AI_VERSION --build-arg AI_CONNECTION_STRING=$AI_CONNECTION_STRING .
;;

"8.2")
docker build -f ./images/runtime/php/8.2/$debian_flavor.Dockerfile -t php82_image_$debian_flavor --build-arg BASE_IMAGE="docker.io/library/oryx_php_run_base_$debian_flavor" --build-arg PHP_VERSION=$php82Version --build-arg PHP_SHA256=$php82Version_SHA --build-arg USER_DOTNET_AI_VERSION=$USER_DOTNET_AI_VERSION --build-arg AI_CONNECTION_STRING=$AI_CONNECTION_STRING .
;;

"8.3")
docker build -f ./images/runtime/php/8.3/$debian_flavor.Dockerfile -t php83_image_$debian_flavor --build-arg BASE_IMAGE="docker.io/library/oryx_php_run_base_$debian_flavor" --build-arg PHP_VERSION=$php83Version --build-arg PHP_SHA256=$php83Version_SHA --build-arg USER_DOTNET_AI_VERSION=$USER_DOTNET_AI_VERSION --build-arg AI_CONNECTION_STRING=$AI_CONNECTION_STRING .
"22")
curl -SL --output "nodejs-$debian_flavor-$node22Version.tar.gz" "https://oryxsdksdev.blob.core.windows.net/nodejs/nodejs-$debian_flavor-$node22Version.tar.gz"
docker build -f ./images/runtime/node/22/$debian_flavor.Dockerfile -t node22_$debian_flavor --build-arg NODE22_VERSION=$node22Version --build-arg BASE_IMAGE="docker.io/library/oryx_node_run_base_$debian_flavor" --build-arg NPM_VERSION=$NPM_VERSION --build-arg PM2_VERSION=$PM2_VERSION --build-arg NODE_APP_INSIGHTS_SDK_VERSION=$NODE_APP_INSIGHTS_SDK_VERSION --build-arg USER_DOTNET_AI_VERSION=$USER_DOTNET_AI_VERSION --build-arg AI_CONNECTION_STRING=$AI_CONNECTION_STRING .
rm -f ./nodejs-$debian_flavor-$node22Version.tar.gz
;;
esac
;;
Expand All @@ -108,7 +97,11 @@ case $stack_name in
;;

"8.3")
docker build -f ./images/runtime/php-fpm/8.3/$debian_flavor.Dockerfile -t phpfpm83_image_$debian_flavor --build-arg PHP_VERSION=$php83Version --build-arg PHP_SHA256=$php81Version_SHA --build-arg BASE_IMAGE="docker.io/library/oryx_php_fpm_run_base_$debian_flavor" --build-arg USER_DOTNET_AI_VERSION=$USER_DOTNET_AI_VERSION --build-arg AI_CONNECTION_STRING=$AI_CONNECTION_STRING .
docker build -f ./images/runtime/php-fpm/8.3/$debian_flavor.Dockerfile -t phpfpm83_image_$debian_flavor --build-arg PHP_VERSION=$php83Version --build-arg PHP_SHA256=$php83Version_SHA --build-arg BASE_IMAGE="docker.io/library/oryx_php_fpm_run_base_$debian_flavor" --build-arg USER_DOTNET_AI_VERSION=$USER_DOTNET_AI_VERSION --build-arg AI_CONNECTION_STRING=$AI_CONNECTION_STRING .
;;

"8.4")
docker build -f ./images/runtime/php-fpm/8.4/$debian_flavor.Dockerfile -t phpfpm84_image_$debian_flavor --build-arg PHP_VERSION=$php84Version --build-arg PHP_SHA256=$php84Version_SHA --build-arg BASE_IMAGE="docker.io/library/oryx_php_fpm_run_base_$debian_flavor" --build-arg USER_DOTNET_AI_VERSION=$USER_DOTNET_AI_VERSION --build-arg AI_CONNECTION_STRING=$AI_CONNECTION_STRING .
;;
esac
;;
Expand Down
Loading