From f613c748a70b7131c97839cef4745a8a2f985ccc Mon Sep 17 00:00:00 2001 From: root Date: Thu, 22 Feb 2024 15:24:05 +0530 Subject: [PATCH 01/10] Add support for Python 3.12.2 and 3.11.8 --- build/__pythonVersions.sh | 4 ++-- build/constants.yaml | 4 ++-- doc/supportedPlatformVersions.md | 6 ++++++ platforms/python/versions/bookworm/versionsToBuild.txt | 2 ++ platforms/python/versions/bullseye/versionsToBuild.txt | 2 ++ platforms/python/versions/buster/versionsToBuild.txt | 2 ++ src/BuildScriptGenerator/PythonVersions.cs | 4 ++-- 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/build/__pythonVersions.sh b/build/__pythonVersions.sh index feeeeb0c46..b489dacf26 100755 --- a/build/__pythonVersions.sh +++ b/build/__pythonVersions.sh @@ -8,5 +8,5 @@ PYTHON37_VERSION='3.7.15' PYTHON38_VERSION='3.8.18' PYTHON39_VERSION='3.9.18' PYTHON310_VERSION='3.10.13' -PYTHON311_VERSION='3.11.7' -PYTHON312_VERSION='3.12.1' +PYTHON311_VERSION='3.11.8' +PYTHON312_VERSION='3.12.2' diff --git a/build/constants.yaml b/build/constants.yaml index 1acdfee202..4d1d956e3c 100644 --- a/build/constants.yaml +++ b/build/constants.yaml @@ -157,8 +157,8 @@ python38-version: 3.8.18 python39-version: 3.9.18 python310-version: 3.10.13 - python311-version: 3.11.7 - python312-version: 3.12.1 + python311-version: 3.11.8 + python312-version: 3.12.2 runtime-versions: - 3.7-debian-bullseye - 3.7-debian-buster diff --git a/doc/supportedPlatformVersions.md b/doc/supportedPlatformVersions.md index ea9538f8bb..6826059ab7 100644 --- a/doc/supportedPlatformVersions.md +++ b/doc/supportedPlatformVersions.md @@ -1246,7 +1246,9 @@ - 3.9.18 - 3.10.13 - 3.11.7 +- 3.11.8 - 3.12.1 +- 3.12.2 ### bullseye @@ -1272,8 +1274,10 @@ - 3.11.0 - 3.11.6 - 3.11.7 +- 3.11.8 - 3.12.0 - 3.12.1 +- 3.12.2 ### buster @@ -1299,7 +1303,9 @@ - 3.10.13 - 3.11.6 - 3.11.7 +- 3.11.8 - 3.12.1 +- 3.12.2 ### focal-scm diff --git a/platforms/python/versions/bookworm/versionsToBuild.txt b/platforms/python/versions/bookworm/versionsToBuild.txt index 0c07bdb65e..723c456f56 100644 --- a/platforms/python/versions/bookworm/versionsToBuild.txt +++ b/platforms/python/versions/bookworm/versionsToBuild.txt @@ -5,4 +5,6 @@ 3.9.18, E3FF2839C048B25C084DEBE9B26995E310250568, 3.10.13, A035C8C19219BA821ECEA86B64E628F8D684696D, 3.11.7, A035C8C19219BA821ECEA86B64E628F8D684696D, +3.11.8, A035C8C19219BA821ECEA86B64E628F8D684696D, 3.12.1, 7169605F62C751356D054A26A821E680E5FA6305, +3.12.2, 7169605F62C751356D054A26A821E680E5FA6305, diff --git a/platforms/python/versions/bullseye/versionsToBuild.txt b/platforms/python/versions/bullseye/versionsToBuild.txt index bda54ae88f..3af7150599 100644 --- a/platforms/python/versions/bullseye/versionsToBuild.txt +++ b/platforms/python/versions/bullseye/versionsToBuild.txt @@ -10,8 +10,10 @@ 3.11.0b1, A035C8C19219BA821ECEA86B64E628F8D684696D, 3.11.6, A035C8C19219BA821ECEA86B64E628F8D684696D, 3.11.7, A035C8C19219BA821ECEA86B64E628F8D684696D, +3.11.8, A035C8C19219BA821ECEA86B64E628F8D684696D, 3.12.0, 7169605F62C751356D054A26A821E680E5FA6305, 3.12.1, 7169605F62C751356D054A26A821E680E5FA6305, +3.12.2, 7169605F62C751356D054A26A821E680E5FA6305, 3.7.12, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D, 3.7.15, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D, 3.7.9, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D, diff --git a/platforms/python/versions/buster/versionsToBuild.txt b/platforms/python/versions/buster/versionsToBuild.txt index cd5c2b7e2d..3ca0550d72 100644 --- a/platforms/python/versions/buster/versionsToBuild.txt +++ b/platforms/python/versions/buster/versionsToBuild.txt @@ -8,7 +8,9 @@ 3.10.8, A035C8C19219BA821ECEA86B64E628F8D684696D, 3.11.6, A035C8C19219BA821ECEA86B64E628F8D684696D, 3.11.7, A035C8C19219BA821ECEA86B64E628F8D684696D, +3.11.8, A035C8C19219BA821ECEA86B64E628F8D684696D, 3.12.1, 7169605F62C751356D054A26A821E680E5FA6305, +3.12.2, 7169605F62C751356D054A26A821E680E5FA6305, 3.6.12, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D, 3.6.15, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D, 3.7.12, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D, diff --git a/src/BuildScriptGenerator/PythonVersions.cs b/src/BuildScriptGenerator/PythonVersions.cs index fbf101f240..cdd298517e 100644 --- a/src/BuildScriptGenerator/PythonVersions.cs +++ b/src/BuildScriptGenerator/PythonVersions.cs @@ -14,8 +14,8 @@ public static class PythonVersions public const string Python38Version = "3.8.18"; public const string Python39Version = "3.9.18"; public const string Python310Version = "3.10.13"; - public const string Python311Version = "3.11.7"; - public const string Python312Version = "3.12.1"; + public const string Python311Version = "3.11.8"; + public const string Python312Version = "3.12.2"; public static readonly List RuntimeVersions = new List { "3.7-debian-bullseye", "3.7-debian-buster", "3.8-debian-bookworm", "3.8-debian-bullseye", "3.8-debian-buster", "3.9-debian-bookworm", "3.9-debian-bullseye", "3.9-debian-buster", "3.10-debian-bookworm", "3.10-debian-bullseye", "3.10-debian-buster", "3.11-debian-bookworm", "3.11-debian-bullseye", "3.12-debian-bookworm", "3.12-debian-bullseye", "dynamic-debian-buster" }; } } \ No newline at end of file From 615b8f2804d32f2157a706366d3fb003c30a12e8 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 22 Feb 2024 18:54:27 +0530 Subject: [PATCH 02/10] add python|3.12.2 and 3.11.8 --- images/runtime/python/3.11/base.bookworm.Dockerfile | 4 ++-- images/runtime/python/3.11/base.bullseye.Dockerfile | 4 ++-- images/runtime/python/3.11/bullseye.Dockerfile | 4 ++-- images/runtime/python/3.12/base.bookworm.Dockerfile | 4 ++-- images/runtime/python/3.12/base.bullseye.Dockerfile | 4 ++-- images/runtime/python/3.12/bullseye.Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/images/runtime/python/3.11/base.bookworm.Dockerfile b/images/runtime/python/3.11/base.bookworm.Dockerfile index 757a86c42e..c9eacb44cb 100644 --- a/images/runtime/python/3.11/base.bookworm.Dockerfile +++ b/images/runtime/python/3.11/base.bookworm.Dockerfile @@ -29,7 +29,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.11.7 +ENV PYTHON_VERSION 3.11.8 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.11.7 3.11 \ + && ln -s 3.11.8 3.11 \ && ln -s 3.11 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.11/base.bullseye.Dockerfile b/images/runtime/python/3.11/base.bullseye.Dockerfile index 2bda50ea76..12b6be0c32 100644 --- a/images/runtime/python/3.11/base.bullseye.Dockerfile +++ b/images/runtime/python/3.11/base.bullseye.Dockerfile @@ -29,7 +29,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.11.0 +ENV PYTHON_VERSION 3.11.8 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.11.0 3.11 \ + && ln -s 3.11.8 3.11 \ && ln -s 3.11 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.11/bullseye.Dockerfile b/images/runtime/python/3.11/bullseye.Dockerfile index e285055751..7b8da4fb96 100644 --- a/images/runtime/python/3.11/bullseye.Dockerfile +++ b/images/runtime/python/3.11/bullseye.Dockerfile @@ -33,7 +33,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.11.0 +ENV PYTHON_VERSION 3.11.8 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -56,7 +56,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.11.0 3.11 \ + && ln -s 3.11.8 3.11 \ && ln -s 3.11 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.12/base.bookworm.Dockerfile b/images/runtime/python/3.12/base.bookworm.Dockerfile index 3ba1040821..89105f8d33 100644 --- a/images/runtime/python/3.12/base.bookworm.Dockerfile +++ b/images/runtime/python/3.12/base.bookworm.Dockerfile @@ -29,7 +29,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.12.1 +ENV PYTHON_VERSION 3.12.2 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.12.1 3.12 \ + && ln -s 3.12.2 3.12 \ && ln -s 3.12 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.12/base.bullseye.Dockerfile b/images/runtime/python/3.12/base.bullseye.Dockerfile index 15355cdfaa..0bb1e30f02 100644 --- a/images/runtime/python/3.12/base.bullseye.Dockerfile +++ b/images/runtime/python/3.12/base.bullseye.Dockerfile @@ -29,7 +29,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.12.0 +ENV PYTHON_VERSION 3.12.2 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.12.0 3.12 \ + && ln -s 3.12.2 3.12 \ && ln -s 3.12 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.12/bullseye.Dockerfile b/images/runtime/python/3.12/bullseye.Dockerfile index 86d9241a54..d0fcdc3611 100644 --- a/images/runtime/python/3.12/bullseye.Dockerfile +++ b/images/runtime/python/3.12/bullseye.Dockerfile @@ -35,7 +35,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.12.0 +ENV PYTHON_VERSION 3.12.2 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.12.0 3.12 \ + && ln -s 3.12.2 3.12 \ && ln -s 3.12 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ From b16ff36b475c89b147b9974fc43d7b0836c2336d Mon Sep 17 00:00:00 2001 From: root Date: Thu, 22 Feb 2024 20:10:18 +0530 Subject: [PATCH 03/10] update base tag for python|3.12.2 and python|3.11.8 --- build/__pythonVersions.sh | 2 +- build/constants.yaml | 2 +- src/BuildScriptGenerator/PythonVersions.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/__pythonVersions.sh b/build/__pythonVersions.sh index b489dacf26..f8f02c774b 100755 --- a/build/__pythonVersions.sh +++ b/build/__pythonVersions.sh @@ -1,6 +1,6 @@ # This file was auto-generated from 'constants.yaml'. Changes may be overridden. -PYTHON_RUNTIME_BASE_TAG='20240110.3' +PYTHON_RUNTIME_BASE_TAG='20240222.4' PIP_VERSION='21.2.4' PYTHON27_VERSION='2.7.18' PYTHON36_VERSION='3.6.15' diff --git a/build/constants.yaml b/build/constants.yaml index 4d1d956e3c..06fe3a179b 100644 --- a/build/constants.yaml +++ b/build/constants.yaml @@ -149,7 +149,7 @@ file-name-prefix: __ - name: python-versions constants: - python-runtime-base-tag: 20240110.3 + python-runtime-base-tag: 20240222.4 pip-version: 21.2.4 python27-version: 2.7.18 python36-version: 3.6.15 diff --git a/src/BuildScriptGenerator/PythonVersions.cs b/src/BuildScriptGenerator/PythonVersions.cs index cdd298517e..d5857525fe 100644 --- a/src/BuildScriptGenerator/PythonVersions.cs +++ b/src/BuildScriptGenerator/PythonVersions.cs @@ -6,7 +6,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.Common { public static class PythonVersions { - public const string PythonRuntimeBaseTag = "20240110.3"; + public const string PythonRuntimeBaseTag = "20240222.4"; public const string PipVersion = "21.2.4"; public const string Python27Version = "2.7.18"; public const string Python36Version = "3.6.15"; From 678af304b49a037653d5147c7f73af1afb410d2c Mon Sep 17 00:00:00 2001 From: root Date: Fri, 23 Feb 2024 17:05:09 +0530 Subject: [PATCH 04/10] refactor --- build/buildRunTimeImageBases.sh | 4 ++-- images/runtime/python/3.11/base.bookworm.Dockerfile | 4 ++-- images/runtime/python/3.11/base.bullseye.Dockerfile | 4 ++-- images/runtime/python/3.11/bullseye.Dockerfile | 4 ++-- images/runtime/python/3.12/base.bookworm.Dockerfile | 4 ++-- images/runtime/python/3.12/base.bullseye.Dockerfile | 4 ++-- images/runtime/python/3.12/bullseye.Dockerfile | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build/buildRunTimeImageBases.sh b/build/buildRunTimeImageBases.sh index fbcd50c311..918d5f80d5 100755 --- a/build/buildRunTimeImageBases.sh +++ b/build/buildRunTimeImageBases.sh @@ -77,8 +77,7 @@ labels="$labels --label com.microsoft.oryx.build-number=$BUILD_NUMBER" execAllGenerateDockerfiles "$runtimeImagesSourceDir" "generateDockerfiles.sh" "$runtimeImageDebianFlavor" -dockerFileName="base.$runtimeImageDebianFlavor.Dockerfile" -stagingDockerFileName="base.$runtimeImageDebianFlavor.staging.Dockerfile" +dockerFileName="bullseye.Dockerfile" dockerFiles=$(find $runtimeImagesSourceDir -type f \( -name $dockerFileName -o -name $stagingDockerFileName \)) nodeDockerfiles=() @@ -185,6 +184,7 @@ for dockerFile in $dockerFiles; do # Tag the image to follow a similar format to .../python:3.7-debian-bullseye-20191028.1 docker tag "$localImageTagName" "$uniqueImageName" + if [ $clearedOutput == "false" ] then # clear existing contents of the file, if any diff --git a/images/runtime/python/3.11/base.bookworm.Dockerfile b/images/runtime/python/3.11/base.bookworm.Dockerfile index c9eacb44cb..757a86c42e 100644 --- a/images/runtime/python/3.11/base.bookworm.Dockerfile +++ b/images/runtime/python/3.11/base.bookworm.Dockerfile @@ -29,7 +29,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.11.8 +ENV PYTHON_VERSION 3.11.7 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.11.8 3.11 \ + && ln -s 3.11.7 3.11 \ && ln -s 3.11 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.11/base.bullseye.Dockerfile b/images/runtime/python/3.11/base.bullseye.Dockerfile index 12b6be0c32..2bda50ea76 100644 --- a/images/runtime/python/3.11/base.bullseye.Dockerfile +++ b/images/runtime/python/3.11/base.bullseye.Dockerfile @@ -29,7 +29,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.11.8 +ENV PYTHON_VERSION 3.11.0 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.11.8 3.11 \ + && ln -s 3.11.0 3.11 \ && ln -s 3.11 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.11/bullseye.Dockerfile b/images/runtime/python/3.11/bullseye.Dockerfile index 7b8da4fb96..e285055751 100644 --- a/images/runtime/python/3.11/bullseye.Dockerfile +++ b/images/runtime/python/3.11/bullseye.Dockerfile @@ -33,7 +33,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.11.8 +ENV PYTHON_VERSION 3.11.0 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -56,7 +56,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.11.8 3.11 \ + && ln -s 3.11.0 3.11 \ && ln -s 3.11 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.12/base.bookworm.Dockerfile b/images/runtime/python/3.12/base.bookworm.Dockerfile index 89105f8d33..3ba1040821 100644 --- a/images/runtime/python/3.12/base.bookworm.Dockerfile +++ b/images/runtime/python/3.12/base.bookworm.Dockerfile @@ -29,7 +29,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.12.2 +ENV PYTHON_VERSION 3.12.1 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.12.2 3.12 \ + && ln -s 3.12.1 3.12 \ && ln -s 3.12 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.12/base.bullseye.Dockerfile b/images/runtime/python/3.12/base.bullseye.Dockerfile index 0bb1e30f02..15355cdfaa 100644 --- a/images/runtime/python/3.12/base.bullseye.Dockerfile +++ b/images/runtime/python/3.12/base.bullseye.Dockerfile @@ -29,7 +29,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.12.2 +ENV PYTHON_VERSION 3.12.0 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.12.2 3.12 \ + && ln -s 3.12.0 3.12 \ && ln -s 3.12 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.12/bullseye.Dockerfile b/images/runtime/python/3.12/bullseye.Dockerfile index d0fcdc3611..86d9241a54 100644 --- a/images/runtime/python/3.12/bullseye.Dockerfile +++ b/images/runtime/python/3.12/bullseye.Dockerfile @@ -35,7 +35,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.12.2 +ENV PYTHON_VERSION 3.12.0 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.12.2 3.12 \ + && ln -s 3.12.0 3.12 \ && ln -s 3.12 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ From 49d09c6560bf37f944fb374e7a1f223f0202d54e Mon Sep 17 00:00:00 2001 From: root Date: Fri, 23 Feb 2024 17:07:53 +0530 Subject: [PATCH 05/10] refactor --- build/buildRunTimeImageBases.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/buildRunTimeImageBases.sh b/build/buildRunTimeImageBases.sh index 918d5f80d5..fff91a7ae3 100755 --- a/build/buildRunTimeImageBases.sh +++ b/build/buildRunTimeImageBases.sh @@ -77,7 +77,8 @@ labels="$labels --label com.microsoft.oryx.build-number=$BUILD_NUMBER" execAllGenerateDockerfiles "$runtimeImagesSourceDir" "generateDockerfiles.sh" "$runtimeImageDebianFlavor" -dockerFileName="bullseye.Dockerfile" +dockerFileName="base.$runtimeImageDebianFlavor.Dockerfile" dockerFileName="bullseye.Dockerfile" +stagingDockerFileName="base.$runtimeImageDebianFlavor.staging.Dockerfile" dockerFiles=$(find $runtimeImagesSourceDir -type f \( -name $dockerFileName -o -name $stagingDockerFileName \)) nodeDockerfiles=() @@ -184,7 +185,6 @@ for dockerFile in $dockerFiles; do # Tag the image to follow a similar format to .../python:3.7-debian-bullseye-20191028.1 docker tag "$localImageTagName" "$uniqueImageName" - if [ $clearedOutput == "false" ] then # clear existing contents of the file, if any From 8fa49bdc22de07df9582efffd4a3c552c25ab95d Mon Sep 17 00:00:00 2001 From: root Date: Fri, 23 Feb 2024 17:10:08 +0530 Subject: [PATCH 06/10] refactor --- build/__pythonVersions.sh | 2 +- build/buildRunTimeImageBases.sh | 2 +- build/constants.yaml | 2 +- src/BuildScriptGenerator/PythonVersions.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/__pythonVersions.sh b/build/__pythonVersions.sh index f8f02c774b..b489dacf26 100755 --- a/build/__pythonVersions.sh +++ b/build/__pythonVersions.sh @@ -1,6 +1,6 @@ # This file was auto-generated from 'constants.yaml'. Changes may be overridden. -PYTHON_RUNTIME_BASE_TAG='20240222.4' +PYTHON_RUNTIME_BASE_TAG='20240110.3' PIP_VERSION='21.2.4' PYTHON27_VERSION='2.7.18' PYTHON36_VERSION='3.6.15' diff --git a/build/buildRunTimeImageBases.sh b/build/buildRunTimeImageBases.sh index fff91a7ae3..fbcd50c311 100755 --- a/build/buildRunTimeImageBases.sh +++ b/build/buildRunTimeImageBases.sh @@ -77,7 +77,7 @@ labels="$labels --label com.microsoft.oryx.build-number=$BUILD_NUMBER" execAllGenerateDockerfiles "$runtimeImagesSourceDir" "generateDockerfiles.sh" "$runtimeImageDebianFlavor" -dockerFileName="base.$runtimeImageDebianFlavor.Dockerfile" dockerFileName="bullseye.Dockerfile" +dockerFileName="base.$runtimeImageDebianFlavor.Dockerfile" stagingDockerFileName="base.$runtimeImageDebianFlavor.staging.Dockerfile" dockerFiles=$(find $runtimeImagesSourceDir -type f \( -name $dockerFileName -o -name $stagingDockerFileName \)) diff --git a/build/constants.yaml b/build/constants.yaml index 06fe3a179b..4d1d956e3c 100644 --- a/build/constants.yaml +++ b/build/constants.yaml @@ -149,7 +149,7 @@ file-name-prefix: __ - name: python-versions constants: - python-runtime-base-tag: 20240222.4 + python-runtime-base-tag: 20240110.3 pip-version: 21.2.4 python27-version: 2.7.18 python36-version: 3.6.15 diff --git a/src/BuildScriptGenerator/PythonVersions.cs b/src/BuildScriptGenerator/PythonVersions.cs index d5857525fe..cdd298517e 100644 --- a/src/BuildScriptGenerator/PythonVersions.cs +++ b/src/BuildScriptGenerator/PythonVersions.cs @@ -6,7 +6,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.Common { public static class PythonVersions { - public const string PythonRuntimeBaseTag = "20240222.4"; + public const string PythonRuntimeBaseTag = "20240110.3"; public const string PipVersion = "21.2.4"; public const string Python27Version = "2.7.18"; public const string Python36Version = "3.6.15"; From 17edb4d1d79e89cf49f1c523fab4da6086105f20 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 23 Feb 2024 17:14:27 +0530 Subject: [PATCH 07/10] update dockerfile path --- images/runtime/python/generateDockerfiles.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/runtime/python/generateDockerfiles.sh b/images/runtime/python/generateDockerfiles.sh index 3938717d2f..38690ff388 100755 --- a/images/runtime/python/generateDockerfiles.sh +++ b/images/runtime/python/generateDockerfiles.sh @@ -49,7 +49,7 @@ do MAJOR_MINOR_VERSION="${SPLIT_VERSION[0]}.${SPLIT_VERSION[1]}" mkdir -p "$DIR/$MAJOR_MINOR_VERSION/" - TARGET_DOCKERFILE="$DIR/$MAJOR_MINOR_VERSION/$ImageDebianFlavor.Dockerfile" + TARGET_DOCKERFILE="$DIR/$MAJOR_MINOR_VERSION/base.$ImageDebianFlavor.Dockerfile" cp "$DOCKERFILE_TEMPLATE" "$TARGET_DOCKERFILE" ORYX_PYTHON_IMAGE_BASE_TAG="oryx-run-base-$ImageDebianFlavor" From 3888c6331312a9bd0eff15c5b1f31fc88f1871ad Mon Sep 17 00:00:00 2001 From: root Date: Mon, 26 Feb 2024 22:23:11 +0530 Subject: [PATCH 08/10] test pipeline --- images/runtime/python/generateDockerfiles.sh | 2 +- vsts/pipelines/validation.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/runtime/python/generateDockerfiles.sh b/images/runtime/python/generateDockerfiles.sh index 38690ff388..3938717d2f 100755 --- a/images/runtime/python/generateDockerfiles.sh +++ b/images/runtime/python/generateDockerfiles.sh @@ -49,7 +49,7 @@ do MAJOR_MINOR_VERSION="${SPLIT_VERSION[0]}.${SPLIT_VERSION[1]}" mkdir -p "$DIR/$MAJOR_MINOR_VERSION/" - TARGET_DOCKERFILE="$DIR/$MAJOR_MINOR_VERSION/base.$ImageDebianFlavor.Dockerfile" + TARGET_DOCKERFILE="$DIR/$MAJOR_MINOR_VERSION/$ImageDebianFlavor.Dockerfile" cp "$DOCKERFILE_TEMPLATE" "$TARGET_DOCKERFILE" ORYX_PYTHON_IMAGE_BASE_TAG="oryx-run-base-$ImageDebianFlavor" diff --git a/vsts/pipelines/validation.yml b/vsts/pipelines/validation.yml index b319233c90..f616a4eb84 100644 --- a/vsts/pipelines/validation.yml +++ b/vsts/pipelines/validation.yml @@ -135,7 +135,7 @@ jobs: echo "##vso[task.setvariable variable=BuildRuntimeImages;]true" echo "##vso[task.setvariable variable=TestRuntimeImages;]true" echo "##vso[task.setvariable variable=PushBuildImages;]false" - echo "##vso[task.setvariable variable=PushRuntimeImages;]false" + echo "##vso[task.setvariable variable=PushRuntimeImages;]true" echo "##vso[task.setvariable variable=EmbedBuildContextInImages;]true" echo "##vso[task.setvariable variable=RELEASE_TAG_NAME;]$(Build.BuildNumber)" echo "##vso[task.setvariable variable=storageAccountUrl;]${{ parameters.storageAccountUrl }}" From e84d12386d54a08214c4096dce1e9fa997cb8301 Mon Sep 17 00:00:00 2001 From: Akshay Kumar Date: Wed, 28 Feb 2024 00:47:17 +0530 Subject: [PATCH 09/10] update python version in dockerfiles --- images/runtime/python/3.11/base.bookworm.Dockerfile | 4 ++-- images/runtime/python/3.11/base.bullseye.Dockerfile | 4 ++-- images/runtime/python/3.12/base.bookworm.Dockerfile | 4 ++-- images/runtime/python/3.12/base.bullseye.Dockerfile | 4 ++-- vsts/pipelines/validation.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/images/runtime/python/3.11/base.bookworm.Dockerfile b/images/runtime/python/3.11/base.bookworm.Dockerfile index 757a86c42e..c9eacb44cb 100644 --- a/images/runtime/python/3.11/base.bookworm.Dockerfile +++ b/images/runtime/python/3.11/base.bookworm.Dockerfile @@ -29,7 +29,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.11.7 +ENV PYTHON_VERSION 3.11.8 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.11.7 3.11 \ + && ln -s 3.11.8 3.11 \ && ln -s 3.11 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.11/base.bullseye.Dockerfile b/images/runtime/python/3.11/base.bullseye.Dockerfile index 2bda50ea76..12b6be0c32 100644 --- a/images/runtime/python/3.11/base.bullseye.Dockerfile +++ b/images/runtime/python/3.11/base.bullseye.Dockerfile @@ -29,7 +29,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.11.0 +ENV PYTHON_VERSION 3.11.8 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.11.0 3.11 \ + && ln -s 3.11.8 3.11 \ && ln -s 3.11 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.12/base.bookworm.Dockerfile b/images/runtime/python/3.12/base.bookworm.Dockerfile index 3ba1040821..89105f8d33 100644 --- a/images/runtime/python/3.12/base.bookworm.Dockerfile +++ b/images/runtime/python/3.12/base.bookworm.Dockerfile @@ -29,7 +29,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.12.1 +ENV PYTHON_VERSION 3.12.2 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.12.1 3.12 \ + && ln -s 3.12.2 3.12 \ && ln -s 3.12 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/images/runtime/python/3.12/base.bullseye.Dockerfile b/images/runtime/python/3.12/base.bullseye.Dockerfile index 15355cdfaa..0bb1e30f02 100644 --- a/images/runtime/python/3.12/base.bullseye.Dockerfile +++ b/images/runtime/python/3.12/base.bullseye.Dockerfile @@ -29,7 +29,7 @@ ADD build ${BUILD_DIR} RUN find ${IMAGES_DIR} -type f -iname "*.sh" -exec chmod +x {} \; RUN find ${BUILD_DIR} -type f -iname "*.sh" -exec chmod +x {} \; -ENV PYTHON_VERSION 3.12.0 +ENV PYTHON_VERSION 3.12.2 RUN true COPY build/__pythonVersions.sh ${BUILD_DIR} RUN true @@ -58,7 +58,7 @@ RUN --mount=type=secret,id=oryx_sdk_storage_account_access_token \ RUN set -ex \ && cd /opt/python/ \ - && ln -s 3.12.0 3.12 \ + && ln -s 3.12.2 3.12 \ && ln -s 3.12 3 \ && echo /opt/python/3/lib >> /etc/ld.so.conf.d/python.conf \ && ldconfig \ diff --git a/vsts/pipelines/validation.yml b/vsts/pipelines/validation.yml index f616a4eb84..b319233c90 100644 --- a/vsts/pipelines/validation.yml +++ b/vsts/pipelines/validation.yml @@ -135,7 +135,7 @@ jobs: echo "##vso[task.setvariable variable=BuildRuntimeImages;]true" echo "##vso[task.setvariable variable=TestRuntimeImages;]true" echo "##vso[task.setvariable variable=PushBuildImages;]false" - echo "##vso[task.setvariable variable=PushRuntimeImages;]true" + echo "##vso[task.setvariable variable=PushRuntimeImages;]false" echo "##vso[task.setvariable variable=EmbedBuildContextInImages;]true" echo "##vso[task.setvariable variable=RELEASE_TAG_NAME;]$(Build.BuildNumber)" echo "##vso[task.setvariable variable=storageAccountUrl;]${{ parameters.storageAccountUrl }}" From 624602d6cdbbfa6c5709e3d921c04b5f3cbd30df Mon Sep 17 00:00:00 2001 From: Akshay Kumar Date: Wed, 28 Feb 2024 01:44:47 +0530 Subject: [PATCH 10/10] Update base tag for runtime images --- build/__pythonVersions.sh | 2 +- build/constants.yaml | 2 +- src/BuildScriptGenerator/PythonVersions.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/__pythonVersions.sh b/build/__pythonVersions.sh index b489dacf26..c19581b1d8 100755 --- a/build/__pythonVersions.sh +++ b/build/__pythonVersions.sh @@ -1,6 +1,6 @@ # This file was auto-generated from 'constants.yaml'. Changes may be overridden. -PYTHON_RUNTIME_BASE_TAG='20240110.3' +PYTHON_RUNTIME_BASE_TAG='20240227.1' PIP_VERSION='21.2.4' PYTHON27_VERSION='2.7.18' PYTHON36_VERSION='3.6.15' diff --git a/build/constants.yaml b/build/constants.yaml index 4d1d956e3c..bd936e9283 100644 --- a/build/constants.yaml +++ b/build/constants.yaml @@ -149,7 +149,7 @@ file-name-prefix: __ - name: python-versions constants: - python-runtime-base-tag: 20240110.3 + python-runtime-base-tag: 20240227.1 pip-version: 21.2.4 python27-version: 2.7.18 python36-version: 3.6.15 diff --git a/src/BuildScriptGenerator/PythonVersions.cs b/src/BuildScriptGenerator/PythonVersions.cs index cdd298517e..b31d3d1ba9 100644 --- a/src/BuildScriptGenerator/PythonVersions.cs +++ b/src/BuildScriptGenerator/PythonVersions.cs @@ -6,7 +6,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.Common { public static class PythonVersions { - public const string PythonRuntimeBaseTag = "20240110.3"; + public const string PythonRuntimeBaseTag = "20240227.1"; public const string PipVersion = "21.2.4"; public const string Python27Version = "2.7.18"; public const string Python36Version = "3.6.15";