diff --git a/build/__dotNetCoreRunTimeVersions.sh b/build/__dotNetCoreRunTimeVersions.sh index d0290a23f0..6b682a70d5 100644 --- a/build/__dotNetCoreRunTimeVersions.sh +++ b/build/__dotNetCoreRunTimeVersions.sh @@ -1,6 +1,6 @@ # This file was auto-generated from 'constants.yaml'. Changes may be overridden. -DOT_NET_CORE_RUNTIME_BASE_TAG='20230930.2' +DOT_NET_CORE_RUNTIME_BASE_TAG='20231008.2' NET_CORE_APP_10='1.0.16' NET_CORE_APP_11='1.1.13' NET_CORE_APP_20='2.0.9' @@ -22,15 +22,15 @@ NET_CORE_APP_50='5.0.17' NET_CORE_APP_50_SHA='a9c4784930a977abbc42aff1337dda06ec588c1ec4769a59f9fcab4d5df4fc9efe65f8e61e5433db078f67a94ea2dfe870c32c482a50d4c16283ffacacff4261' ASPNET_CORE_APP_50='5.0.17' ASPNET_CORE_APP_50_SHA='d8e87804e9e86273c6512785bd5a6f0e834ff3f4bbebc11c4fcdf16ab4fdfabd0d981a756955267c1aa9bbeec596de3728ce9b2e6415d2d80daef0d999a5df6d' -NET_CORE_APP_60='6.0.20' -NET_CORE_APP_60_SHA='3688d7170a59015c36d6a5532db67bc22eff66b3eb0a7fc28e1f425791e27a5f467bc7dc593d7f455d72d08c7d27bfcc92b3c8bd30ec3c7c583a8aa82b5afbac' -ASPNET_CORE_APP_60='6.0.20' -ASPNET_CORE_APP_60_SHA='891bad6a52a7bcd5afa2a784fe68044d282f6d53fedab4bde6dff8d7d2138a484e947f7a6be156094324b37e9d7e07e87a67622bcf2ea197c2924389edd1d185' -NET_CORE_APP_70='7.0.9' -NET_CORE_APP_70_SHA='09552e5ae6ac014dadf17545ff0a30ab32921075a31fb33e7be148c13078e30d097f592ffa1b8d306563aaa3f6302e40c5c0ba815c1473bbd5d72e3bef55d91e' -ASPNET_CORE_APP_70='7.0.9' -ASPNET_CORE_APP_70_SHA='aabf4fa5ca726dc52774e5d644800ef7477815b22a982b7a2752dec6569186aabca93d5386e195e7ead377144601a786ae6a5d76ff28435bdabfad495cfe554b' -NET_CORE_APP_80='8.0.0-rc.1.23419.4' -NET_CORE_APP_80_SHA='53938ec3aa4353cfb760d22faa850821b54a53fdd864c4969f48caa6b718ba207162b04a196e85543947acb7d3e719982edad1420b76198562051846f51b1b5c' -ASPNET_CORE_APP_80='8.0.0-rc.1.23421.29' -ASPNET_CORE_APP_80_SHA='d5f9e7bffbf2b48b26a317dd1d78bc866973b4a2cda448cd7a7ee64c0ffaf98fa3c4b8584d32528026674bdfd99f602f0fdac8242176815705e080df83825efa' +NET_CORE_APP_60='6.0.23' +NET_CORE_APP_60_SHA='8182a852bfcd387343a589b71b0e51197b6b658e42dfa35b2e65ccc23d67677d974b00e748183ce61e9a9123e28ff43c9252d8308236c80679bfed16b6dc65af' +ASPNET_CORE_APP_60='6.0.23' +ASPNET_CORE_APP_60_SHA='c2f0d82fd0dbfdd56c889d435af20f3b1d55850605df892251b4679830dc5b3466c7734912b7073bfca803e5a75a59e929fb36cdc7d4978d7eb0a563da83d08d' +NET_CORE_APP_70='7.0.12' +NET_CORE_APP_70_SHA='74bea25e88bd917a733a6899a3b3c9ac40c85a64f82dc0f36840714669621716afbb8fec6c3c398b1ffb522c0ed11958862cff5a4be0bf6268188cdb276bc109' +ASPNET_CORE_APP_70='7.0.12' +ASPNET_CORE_APP_70_SHA='4d5ece3f1c0c74f872f42a98ebd7e448ae2ed09e9fec5f29a5ae2781ff16dc8486064eb43a3aa6e3da5cf2c52745f93319c55cf3de883f82cf8adfcd6a9746d3' +NET_CORE_APP_80='8.0.0-rc.2.23479.6' +NET_CORE_APP_80_SHA='f1565aa5a5a98b3ab2cd92376b0b1bcf4420b6377047bdf2324a7dd86b82f5b4776a2795395bb777a3f7d6f6f9b8dc89721c2fcf93b4c7532b42b263f9fdc828' +ASPNET_CORE_APP_80='8.0.0-rc.2.23480.2' +ASPNET_CORE_APP_80_SHA='5d8d50498be52ee4c8ae83e9ca82ab947b187f27b56047cc8a09f6ca2ba6bb7532fdd30bc035d518ce636965371f2ed16c9f97398f04d836f4f67b11b5ce50a9' diff --git a/build/__dotNetCoreSdkVersions.sh b/build/__dotNetCoreSdkVersions.sh index 82a4cfc808..2e94391b00 100644 --- a/build/__dotNetCoreSdkVersions.sh +++ b/build/__dotNetCoreSdkVersions.sh @@ -7,7 +7,7 @@ DOT_NET_CORE_30_SDK_VERSION='3.0.103' DOT_NET_CORE_31_SDK_VERSION='3.1.426' DOT_NET_CORE_50_SDK_VERSION='5.0.302' DOT_NET_50_SDK_VERSION='5.0.408' -DOT_NET_60_SDK_VERSION='6.0.412' +DOT_NET_60_SDK_VERSION='6.0.415' DOT_NET_60_RTM_SDK_VERSION='6-0-100-rtm-21527-11' -DOT_NET_70_SDK_VERSION='7.0.306' -DOT_NET_80_SDK_VERSION='8.0.100-rc.1.23463.5' +DOT_NET_70_SDK_VERSION='7.0.402' +DOT_NET_80_SDK_VERSION='8.0.100-rc.2.23502.2' diff --git a/build/__sdkStorageConstants.sh b/build/__sdkStorageConstants.sh index 48a76bdab1..ca1ad8fb04 100755 --- a/build/__sdkStorageConstants.sh +++ b/build/__sdkStorageConstants.sh @@ -9,7 +9,6 @@ STAGING_STORAGE_SAS_TOKEN_KEYVAULT_SECRET_NAME='ORYX-SDK-STAGING-PRIVATE-SAS-TOK PRIVATE_STAGING_SDK_STORAGE_BASE_URL='https://oryxsdksstaging.blob.core.windows.net' DEV_SDK_STORAGE_BASE_URL='https://oryxsdksdev.blob.core.windows.net' SANDBOX_SDK_STORAGE_BASE_URL='https://oryxsdkssandbox.blob.core.windows.net' -PRIVATE_SDK_STORAGE_BASE_URL='https://oryxsdksprivate.blob.core.windows.net' PROD_SDK_STORAGE_BASE_URL='https://oryxsdksprod.blob.core.windows.net' PROD_BACKUP_SDK_STORAGE_BASE_URL='https://oryxsdksprodbackup.blob.core.windows.net' PROD_SDK_CDN_STORAGE_BASE_URL='https://oryx-cdn.microsoft.io' diff --git a/build/__stagingRuntimeConstants.sh b/build/__stagingRuntimeConstants.sh index 6d20cc82e3..35a57e93c7 100644 --- a/build/__stagingRuntimeConstants.sh +++ b/build/__stagingRuntimeConstants.sh @@ -1,6 +1,6 @@ # This file was auto-generated from 'constants.yaml'. Changes may be overridden. -DOTNETCORE_STAGING_RUNTIME_VERSIONS=("") +DOTNETCORE_STAGING_RUNTIME_VERSIONS=("6.0" "7.0" "8.0") PYTHON_STAGING_RUNTIME_VERSIONS=("") NODE_STAGING_RUNTIME_VERSIONS=("") JAVA_STAGING_RUNTIME_VERSIONS=("") diff --git a/build/constants.yaml b/build/constants.yaml index 88225c7b26..662a2aa7d1 100644 --- a/build/constants.yaml +++ b/build/constants.yaml @@ -44,10 +44,10 @@ dot-net-core-31-sdk-version: 3.1.426 dot-net-core-50-sdk-version: 5.0.302 dot-net-50-sdk-version: 5.0.408 - dot-net-60-sdk-version: 6.0.412 + dot-net-60-sdk-version: 6.0.415 dot-net-60-rtm-sdk-version: 6-0-100-rtm-21527-11 - dot-net-70-sdk-version: 7.0.306 - dot-net-80-sdk-version: 8.0.100-rc.1.23463.5 + dot-net-70-sdk-version: 7.0.402 + dot-net-80-sdk-version: 8.0.100-rc.2.23502.2 runtime-versions: - 3.0-debian-buster - 3.1-debian-bullseye @@ -68,7 +68,7 @@ file-name-prefix: __ - name: dot-net-core-run-time-versions constants: - dot-net-core-runtime-base-tag: 20230930.2 + dot-net-core-runtime-base-tag: 20231008.2 net-core-app-10: 1.0.16 net-core-app-11: 1.1.13 net-core-app-20: 2.0.9 @@ -90,18 +90,18 @@ net-core-app-50-sha: a9c4784930a977abbc42aff1337dda06ec588c1ec4769a59f9fcab4d5df4fc9efe65f8e61e5433db078f67a94ea2dfe870c32c482a50d4c16283ffacacff4261 aspnet-core-app-50: 5.0.17 aspnet-core-app-50-sha: d8e87804e9e86273c6512785bd5a6f0e834ff3f4bbebc11c4fcdf16ab4fdfabd0d981a756955267c1aa9bbeec596de3728ce9b2e6415d2d80daef0d999a5df6d - net-core-app-60: 6.0.20 - net-core-app-60-sha: 3688d7170a59015c36d6a5532db67bc22eff66b3eb0a7fc28e1f425791e27a5f467bc7dc593d7f455d72d08c7d27bfcc92b3c8bd30ec3c7c583a8aa82b5afbac - aspnet-core-app-60: 6.0.20 - aspnet-core-app-60-sha: 891bad6a52a7bcd5afa2a784fe68044d282f6d53fedab4bde6dff8d7d2138a484e947f7a6be156094324b37e9d7e07e87a67622bcf2ea197c2924389edd1d185 - net-core-app-70: 7.0.9 - net-core-app-70-sha: 09552e5ae6ac014dadf17545ff0a30ab32921075a31fb33e7be148c13078e30d097f592ffa1b8d306563aaa3f6302e40c5c0ba815c1473bbd5d72e3bef55d91e - aspnet-core-app-70: 7.0.9 - aspnet-core-app-70-sha: aabf4fa5ca726dc52774e5d644800ef7477815b22a982b7a2752dec6569186aabca93d5386e195e7ead377144601a786ae6a5d76ff28435bdabfad495cfe554b - net-core-app-80: 8.0.0-rc.1.23419.4 - net-core-app-80-sha: 53938ec3aa4353cfb760d22faa850821b54a53fdd864c4969f48caa6b718ba207162b04a196e85543947acb7d3e719982edad1420b76198562051846f51b1b5c - aspnet-core-app-80: 8.0.0-rc.1.23421.29 - aspnet-core-app-80-sha: d5f9e7bffbf2b48b26a317dd1d78bc866973b4a2cda448cd7a7ee64c0ffaf98fa3c4b8584d32528026674bdfd99f602f0fdac8242176815705e080df83825efa + net-core-app-60: 6.0.23 + net-core-app-60-sha: 8182a852bfcd387343a589b71b0e51197b6b658e42dfa35b2e65ccc23d67677d974b00e748183ce61e9a9123e28ff43c9252d8308236c80679bfed16b6dc65af + aspnet-core-app-60: 6.0.23 + aspnet-core-app-60-sha: c2f0d82fd0dbfdd56c889d435af20f3b1d55850605df892251b4679830dc5b3466c7734912b7073bfca803e5a75a59e929fb36cdc7d4978d7eb0a563da83d08d + net-core-app-70: 7.0.12 + net-core-app-70-sha: 74bea25e88bd917a733a6899a3b3c9ac40c85a64f82dc0f36840714669621716afbb8fec6c3c398b1ffb522c0ed11958862cff5a4be0bf6268188cdb276bc109 + aspnet-core-app-70: 7.0.12 + aspnet-core-app-70-sha: 4d5ece3f1c0c74f872f42a98ebd7e448ae2ed09e9fec5f29a5ae2781ff16dc8486064eb43a3aa6e3da5cf2c52745f93319c55cf3de883f82cf8adfcd6a9746d3 + net-core-app-80: 8.0.0-rc.2.23479.6 + net-core-app-80-sha: f1565aa5a5a98b3ab2cd92376b0b1bcf4420b6377047bdf2324a7dd86b82f5b4776a2795395bb777a3f7d6f6f9b8dc89721c2fcf93b4c7532b42b263f9fdc828 + aspnet-core-app-80: 8.0.0-rc.2.23480.2 + aspnet-core-app-80-sha: 5d8d50498be52ee4c8ae83e9ca82ab947b187f27b56047cc8a09f6ca2ba6bb7532fdd30bc035d518ce636965371f2ed16c9f97398f04d836f4f67b11b5ce50a9 outputs: - type: csharp directory: src/BuildScriptGenerator/DotNetCore @@ -341,7 +341,6 @@ private-staging-sdk-storage-base-url: https://oryxsdksstaging.blob.core.windows.net dev-sdk-storage-base-url: https://oryxsdksdev.blob.core.windows.net sandbox-sdk-storage-base-url: https://oryxsdkssandbox.blob.core.windows.net - private-sdk-storage-base-url: https://oryxsdksprivate.blob.core.windows.net prod-sdk-storage-base-url: https://oryxsdksprod.blob.core.windows.net prod-backup-sdk-storage-base-url: https://oryxsdksprodbackup.blob.core.windows.net prod-sdk-cdn-storage-base-url: https://oryx-cdn.microsoft.io @@ -473,7 +472,9 @@ - name: staging-runtime-constants constants: dotnetcore-staging-runtime-versions: - - + - 6.0 + - 7.0 + - 8.0 python-staging-runtime-versions: - node-staging-runtime-versions: diff --git a/doc/supportedPlatformVersions.md b/doc/supportedPlatformVersions.md index 6b31cd809e..96e0d58b37 100644 --- a/doc/supportedPlatformVersions.md +++ b/doc/supportedPlatformVersions.md @@ -7,6 +7,7 @@ - 8.0.100-preview.6.23330.14 - 8.0.100-preview.7.23376.3 - 8.0.100-rc.1.23463.5 +- 8.0.100-rc.2.23502.2 ### bullseye @@ -50,6 +51,7 @@ - 6.0.410 - 6.0.411 - 6.0.412 +- 6.0.415 - 7.0.100-preview.1.22110.4 - 7.0.100-preview.5.22307.18 - 7.0.100-preview.6.22352.1 @@ -66,7 +68,9 @@ - 7.0.304 - 7.0.305 - 7.0.306 +- 7.0.402 - 8.0.100-rc.1.23463.5 +- 8.0.100-rc.2.23502.2 ### buster @@ -128,6 +132,7 @@ - 6.0.410 - 6.0.411 - 6.0.412 +- 6.0.415 - 7.0.100-preview.1.22110.4 - 7.0.100-preview.5.22307.18 - 7.0.100-preview.6.22352.1 @@ -144,7 +149,9 @@ - 7.0.304 - 7.0.305 - 7.0.306 +- 7.0.402 - 8.0.100-rc.1.23463.5 +- 8.0.100-rc.2.23502.2 ### focal-scm @@ -206,6 +213,7 @@ - 6.0.410 - 6.0.411 - 6.0.412 +- 6.0.415 - 7.0.100-preview.1.22110.4 - 7.0.100-preview.5.22307.18 - 7.0.100-preview.6.22352.1 @@ -222,7 +230,9 @@ - 7.0.304 - 7.0.305 - 7.0.306 +- 7.0.402 - 8.0.100-rc.1.23463.5 +- 8.0.100-rc.2.23502.2 ### stretch diff --git a/images/__sdkStorageConstants.sh b/images/__sdkStorageConstants.sh index 48a76bdab1..ca1ad8fb04 100644 --- a/images/__sdkStorageConstants.sh +++ b/images/__sdkStorageConstants.sh @@ -9,7 +9,6 @@ STAGING_STORAGE_SAS_TOKEN_KEYVAULT_SECRET_NAME='ORYX-SDK-STAGING-PRIVATE-SAS-TOK PRIVATE_STAGING_SDK_STORAGE_BASE_URL='https://oryxsdksstaging.blob.core.windows.net' DEV_SDK_STORAGE_BASE_URL='https://oryxsdksdev.blob.core.windows.net' SANDBOX_SDK_STORAGE_BASE_URL='https://oryxsdkssandbox.blob.core.windows.net' -PRIVATE_SDK_STORAGE_BASE_URL='https://oryxsdksprivate.blob.core.windows.net' PROD_SDK_STORAGE_BASE_URL='https://oryxsdksprod.blob.core.windows.net' PROD_BACKUP_SDK_STORAGE_BASE_URL='https://oryxsdksprodbackup.blob.core.windows.net' PROD_SDK_CDN_STORAGE_BASE_URL='https://oryx-cdn.microsoft.io' diff --git a/images/runtime/dotnetcore/6.0/base.bullseye.staging.Dockerfile b/images/runtime/dotnetcore/6.0/base.bullseye.staging.Dockerfile new file mode 100644 index 0000000000..e58f49db5f --- /dev/null +++ b/images/runtime/dotnetcore/6.0/base.bullseye.staging.Dockerfile @@ -0,0 +1,64 @@ +# syntax=docker/dockerfile:1.3 +# the above line allows this dockerfile to use the secrets fucntionality + +# dotnet tools are currently available as part of SDK so we need to create them in an sdk image +# and copy them to our final runtime image +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS tools-install +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-sos +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-trace +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-dump +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-counters +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 7.* + +FROM mcr.microsoft.com/mirror/docker/library/debian:bullseye-slim +ARG BUILD_DIR=/tmp/oryx/build +ADD build ${BUILD_DIR} + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET Core dependencies + libc6 \ + libgcc1 \ + libgssapi-krb5-2 \ + libicu67 \ + libssl1.1 \ + libstdc++6 \ + zlib1g \ + lldb \ + curl \ + file \ + libgdiplus \ + && apt-get upgrade --assume-yes \ + && rm -rf /var/lib/apt/lists/* + +# Configure web servers to bind to port 80 when present +ENV ASPNETCORE_URLS=http://+:80 \ + # Enable detection of running in a container + DOTNET_RUNNING_IN_CONTAINER=true \ + PATH="/opt/dotnetcore-tools:${PATH}" + +COPY --from=tools-install /dotnetcore-tools /opt/dotnetcore-tools + +# Install .NET Core +# mount the secret sas token to pull the binaries, and make sure we do not print to docker build logs +RUN --mount=type=secret,id=dotnet_storage_account_token_id \ + set -e \ + && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ + && curl -SL --output dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/$NET_CORE_APP_60/dotnet-runtime-$NET_CORE_APP_60-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ + && echo "$NET_CORE_APP_60_SHA dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz \ + && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ + # Install ASP.NET Core + && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ + && curl -SL --output aspnetcore.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/$ASPNET_CORE_APP_60/aspnetcore-runtime-$ASPNET_CORE_APP_60-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ + && echo "$ASPNET_CORE_APP_60_SHA aspnetcore.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz \ + && dotnet-sos install \ + && rm -rf ${BUILD_DIR} diff --git a/images/runtime/dotnetcore/6.0/base.buster.staging.Dockerfile b/images/runtime/dotnetcore/6.0/base.buster.staging.Dockerfile new file mode 100644 index 0000000000..9abb0958f6 --- /dev/null +++ b/images/runtime/dotnetcore/6.0/base.buster.staging.Dockerfile @@ -0,0 +1,67 @@ +# syntax=docker/dockerfile:1.3 +# the above line allows this dockerfile to use the secrets fucntionality + +# dotnet tools are currently available as part of SDK so we need to create them in an sdk image +# and copy them to our final runtime image +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS tools-install +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-sos +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-trace +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-dump +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-counters +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 7.* + +FROM mcr.microsoft.com/mirror/docker/library/debian:buster-slim +ARG BUILD_DIR=/tmp/oryx/build +ADD build ${BUILD_DIR} + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + # .NET Core dependencies + libc6 \ + libgcc1 \ + libgssapi-krb5-2 \ + libicu63 \ + libssl1.1 \ + libstdc++6 \ + zlib1g \ + lldb \ + curl \ + file \ + libgdiplus \ + && apt-get upgrade --assume-yes \ + && rm -rf /var/lib/apt/lists/* + +# Configure web servers to bind to port 80 when present +ENV ASPNETCORE_URLS=http://+:80 \ + # Enable detection of running in a container + DOTNET_RUNNING_IN_CONTAINER=true \ + PATH="/opt/dotnetcore-tools:${PATH}" + +COPY --from=tools-install /dotnetcore-tools /opt/dotnetcore-tools + +# Install .NET Core +# mount the secret sas token to pull the binaries, and make sure we do not print to docker build logs +RUN --mount=type=secret,id=dotnet_storage_account_token_id \ + set -e \ + # based on resolution on https://github.com/NuGet/Announcements/issues/49#issue-795386700 + && apt-get remove ca-certificates -y \ + && apt-get purge ca-certificates -y \ + && apt-get update \ + && apt-get install -f ca-certificates=20200601~deb10u2 -y --no-install-recommends \ + && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ + && curl -SL --output dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/$NET_CORE_APP_60/dotnet-runtime-$NET_CORE_APP_60-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ + && echo "$NET_CORE_APP_60_SHA dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz \ + && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ + # Install ASP.NET Core + && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ + && curl -SL --output aspnetcore.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/$ASPNET_CORE_APP_60/aspnetcore-runtime-$ASPNET_CORE_APP_60-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ + && echo "$ASPNET_CORE_APP_60_SHA aspnetcore.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz \ + && dotnet-sos install \ + && rm -rf ${BUILD_DIR} diff --git a/images/runtime/dotnetcore/7.0/base.bullseye.staging.Dockerfile b/images/runtime/dotnetcore/7.0/base.bullseye.staging.Dockerfile new file mode 100644 index 0000000000..91b65bd44a --- /dev/null +++ b/images/runtime/dotnetcore/7.0/base.bullseye.staging.Dockerfile @@ -0,0 +1,64 @@ +# syntax=docker/dockerfile:1.3 +# the above line allows this dockerfile to use the secrets fucntionality + +# dotnet tools are currently available as part of SDK so we need to create them in an sdk image +# and copy them to our final runtime image +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS tools-install +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-sos +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-trace +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-dump +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-counters +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 7.* + +FROM mcr.microsoft.com/mirror/docker/library/debian:bullseye-slim +ARG BUILD_DIR=/tmp/oryx/build +ADD build ${BUILD_DIR} + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET Core dependencies + libc6 \ + libgcc1 \ + libgssapi-krb5-2 \ + libicu67 \ + libssl1.1 \ + libstdc++6 \ + zlib1g \ + lldb \ + curl \ + file \ + libgdiplus \ + && apt-get upgrade --assume-yes \ + && rm -rf /var/lib/apt/lists/* + +# Configure web servers to bind to port 80 when present +ENV ASPNETCORE_URLS=http://+:80 \ + # Enable detection of running in a container + DOTNET_RUNNING_IN_CONTAINER=true \ + PATH="/opt/dotnetcore-tools:${PATH}" + +COPY --from=tools-install /dotnetcore-tools /opt/dotnetcore-tools + +# Install .NET Core +# mount the secret sas token to pull the binaries, and make sure we do not print to docker build logs +RUN --mount=type=secret,id=dotnet_storage_account_token_id \ + set -e \ + && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ + && curl -SL --output dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/$NET_CORE_APP_70/dotnet-runtime-$NET_CORE_APP_70-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ + && echo "$NET_CORE_APP_70_SHA dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz \ + && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ + # Install ASP.NET Core + && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ + && curl -SL --output aspnetcore.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/$ASPNET_CORE_APP_70/aspnetcore-runtime-$ASPNET_CORE_APP_70-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ + && echo "$ASPNET_CORE_APP_70_SHA aspnetcore.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz \ + && dotnet-sos install \ + && rm -rf ${BUILD_DIR} diff --git a/images/runtime/dotnetcore/7.0/base.buster.staging.Dockerfile b/images/runtime/dotnetcore/7.0/base.buster.staging.Dockerfile new file mode 100644 index 0000000000..27ccf609f3 --- /dev/null +++ b/images/runtime/dotnetcore/7.0/base.buster.staging.Dockerfile @@ -0,0 +1,67 @@ +# syntax=docker/dockerfile:1.3 +# the above line allows this dockerfile to use the secrets fucntionality + +# dotnet tools are currently available as part of SDK so we need to create them in an sdk image +# and copy them to our final runtime image +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS tools-install +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-sos +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-trace +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-dump +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-counters +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 7.* + +FROM mcr.microsoft.com/mirror/docker/library/debian:buster-slim +ARG BUILD_DIR=/tmp/oryx/build +ADD build ${BUILD_DIR} + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + # .NET Core dependencies + libc6 \ + libgcc1 \ + libgssapi-krb5-2 \ + libicu63 \ + libssl1.1 \ + libstdc++6 \ + zlib1g \ + lldb \ + curl \ + file \ + libgdiplus \ + && apt-get upgrade --assume-yes \ + && rm -rf /var/lib/apt/lists/* + +# Configure web servers to bind to port 80 when present +ENV ASPNETCORE_URLS=http://+:80 \ + # Enable detection of running in a container + DOTNET_RUNNING_IN_CONTAINER=true \ + PATH="/opt/dotnetcore-tools:${PATH}" + +COPY --from=tools-install /dotnetcore-tools /opt/dotnetcore-tools + +# Install .NET Core +# mount the secret sas token to pull the binaries, and make sure we do not print to docker build logs +RUN --mount=type=secret,id=dotnet_storage_account_token_id \ + set -e \ + # based on resolution on https://github.com/NuGet/Announcements/issues/49#issue-795386700 + && apt-get remove ca-certificates -y \ + && apt-get purge ca-certificates -y \ + && apt-get update \ + && apt-get install -f ca-certificates=20200601~deb10u2 -y --no-install-recommends \ + && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ + && curl -SL --output dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/$NET_CORE_APP_70/dotnet-runtime-$NET_CORE_APP_70-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ + && echo "$NET_CORE_APP_70_SHA dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz \ + && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ + # Install ASP.NET Core + && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ + && curl -SL --output aspnetcore.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/$ASPNET_CORE_APP_70/aspnetcore-runtime-$ASPNET_CORE_APP_70-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ + && echo "$ASPNET_CORE_APP_70_SHA aspnetcore.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz \ + && dotnet-sos install \ + && rm -rf ${BUILD_DIR} diff --git a/images/runtime/dotnetcore/8.0/base.bookworm.staging.Dockerfile b/images/runtime/dotnetcore/8.0/base.bookworm.staging.Dockerfile new file mode 100644 index 0000000000..c4470c7087 --- /dev/null +++ b/images/runtime/dotnetcore/8.0/base.bookworm.staging.Dockerfile @@ -0,0 +1,69 @@ +# syntax=docker/dockerfile:1.3 +# the above line allows this dockerfile to use the secrets fucntionality + +# dotnet tools are currently available as part of SDK so we need to create them in an sdk image +# and copy them to our final runtime image +FROM mcr.microsoft.com/dotnet/sdk:8.0-preview AS tools-install +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-sos +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-trace +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-dump +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-counters +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-gcdump +# Update dotnet-monitor after .NET is out of preview to: +# dotnet-monitor --version 8.* +RUN dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 8.0.0-preview.7.23402 + +FROM mcr.microsoft.com/mirror/docker/library/debian:bookworm-slim +ARG BUILD_DIR=/tmp/oryx/build +ADD build ${BUILD_DIR} + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + # .NET Core dependencies + libc6 \ + libgcc1 \ + libgssapi-krb5-2 \ + libicu72 \ + libssl3 \ + libstdc++6 \ + zlib1g \ + lldb \ + curl \ + file \ + libgdiplus \ + && apt-get upgrade --assume-yes \ + && rm -rf /var/lib/apt/lists/* + +# Configure web servers to bind to port 80 when present +ENV ASPNETCORE_URLS=http://+:80 \ + # Enable detection of running in a container + DOTNET_RUNNING_IN_CONTAINER=true \ + PATH="/opt/dotnetcore-tools:${PATH}" + +COPY --from=tools-install /dotnetcore-tools /opt/dotnetcore-tools + +# Install .NET Core +# mount the secret sas token to pull the binaries, and make sure we do not print to docker build logs +RUN --mount=type=secret,id=dotnet_storage_account_token_id \ + set -e \ + # based on resolution on https://github.com/NuGet/Announcements/issues/49#issue-795386700 + && apt-get remove ca-certificates -y \ + && apt-get purge ca-certificates -y \ + && apt-get update \ + && apt-get install -f ca-certificates -y --no-install-recommends \ + && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ + && curl -SL --output dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/8.0.100-rc.2.23502.2/dotnet-runtime-$NET_CORE_APP_80-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ + && echo "$NET_CORE_APP_80_SHA dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz \ + && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ + # Install ASP.NET Core + && . ${BUILD_DIR}/__dotNetCoreRunTimeVersions.sh \ + && curl -SL --output aspnetcore.tar.gz https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/8.0.100-rc.2.23502.2/aspnetcore-runtime-$ASPNET_CORE_APP_80-linux-x64.tar.gz$(cat /run/secrets/dotnet_storage_account_token_id) \ + && echo "$ASPNET_CORE_APP_80_SHA aspnetcore.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz \ + && dotnet-sos install \ + && rm -rf ${BUILD_DIR} diff --git a/platforms/dotnet/versions/bookworm/versionsToBuild.txt b/platforms/dotnet/versions/bookworm/versionsToBuild.txt index 7eafd32428..b619196cee 100644 --- a/platforms/dotnet/versions/bookworm/versionsToBuild.txt +++ b/platforms/dotnet/versions/bookworm/versionsToBuild.txt @@ -3,3 +3,4 @@ 8.0.100-preview.6.23330.14, ef568a1ecf6140237249544673a52dc496cff682d1a078e9309d195d78e632b3870b7fb23eb38cae7b0638c564f6aa340ca2e209c4ae4fbcddb84073138e8a08, 8.0.100-preview.7.23376.3, 8bc71a586382f0e264024707f2f3af9a2f675dd5d4fbdd4bced7ab207141fb74d7c6492dfd94373505962b8597ae379259d152e4ace93a65dad0f89600afecd8, 8.0.100-rc.1.23463.5, ac941fd16fd7c328f7cc44b132b4253ddb2b6a6c152af5f43c71c6cd0d468c89b7276ebf6c08895dcb6e5e25f7cae83b6fbacb91cfcc4a61d49b5657a834a901, +8.0.100-rc.2.23502.2, 45f09e7b031f4cf5b4dcead240fe47e2e3731d97d22aa96d3a02a087322658606cc22792053c3784c44f15d7c9bad0ac9dbda90def7b4e197f2955dca9a5bb6c, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/8.0.100-rc.2.23502.2/dotnet-sdk-8.0.100-rc.2.23502.2-linux-x64.tar.gz, diff --git a/platforms/dotnet/versions/bullseye/versionsToBuild.txt b/platforms/dotnet/versions/bullseye/versionsToBuild.txt index ae5d3e7661..20664f613d 100644 --- a/platforms/dotnet/versions/bullseye/versionsToBuild.txt +++ b/platforms/dotnet/versions/bullseye/versionsToBuild.txt @@ -41,6 +41,7 @@ 6.0.410, 8c85f5b10eb786c8cf31bf268131a2345a295d88d318310dc8457d831f0a587ec1600e43beb7f55aec2248483b9a95e905a468b592f0c910443b4aaa9baeb2e3, 6.0.411, dc8aa1f84ad97cf25a979bfc243c200b7a8e73b930b68d5eed782743d88aad823c32c267c83d7a19d3c4f910a8fae7f12d07ea5a35a1d3a97e13a8674d29037b, 6.0.412, ee97aa5258e05aecadc66e844fa8eef97d51e5035492999b974cc8272e4db1a862a1f88a925f38be9e95c71d2e961b56459dcd614475895df608945c8057c311, +6.0.415, b1a3f84b50faf5840f5151bc8e41550f4c5828ea6a8df472e802fae8a00dca1a141ae620e2c20eec90935c322bc1fb082b38dee90a625766df1ec66b0f640d02, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/6.0.23/dotnet-sdk-6.0.415-linux-x64.tar.gz, 7.0.100-preview.1.22110.4, 54488a911172f059e3823d6bf52e1fa87305eb09e84d97f81a40e0815fc8a73a480b149023283f557a672ef0341f022b8ca16ebec92264ee16a56fac8f35e2e2, 7.0.100-preview.5.22307.18, 691c0d8917bc9848a08707b7fa22da05228dad0ba6335ff06c6d80f9a95349307572ff45c0b088d9fc199c40a1784ff314e1a8735d0366bd3aa06eb8dfa2b7d5, 7.0.100-preview.6.22352.1, e49a2119021e4069f1193898536cc59628336e656f2f7e49d454a593a330d8e437acf2f4efb70925bc16a9c900c2e49f4a6c2fb5f69e696b09a91ebccd2c9307, @@ -57,4 +58,6 @@ 7.0.304, f4b7d0cde432bd37f445363b3937ad483e5006794886941e43124de051475925b3cd11313b73d2cae481ee9b8f131394df0873451f6088ffdbe73f150b1ed727, 7.0.305, c63e6baf3760a9949089d78920531a1140f4f31fffe13069b2011c61c3d583d585f5ec8cca973b414fa35d48ccbfea9c1ec1c88222b53afd2af5974be3b5cb1b, 7.0.306, 62df9bca9492b3273830e098e787ec3664243989ac03550534599fc331693553660d3cf8bca655f2d1326070dbb7b20b04743eaba77fa9cc69f6f0fddfdebd06, +7.0.402, 0c4d654bc7d440f49d14e6e3ea71e636bb37c92c1e835ec87879350f5b00d68465a05c3a2dc078252329c3953a131bc4c2bca6b1d2303ca5af14d3d88a192245, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/7.0.12/dotnet-sdk-7.0.402-linux-x64.tar.gz, 8.0.100-rc.1.23463.5, ac941fd16fd7c328f7cc44b132b4253ddb2b6a6c152af5f43c71c6cd0d468c89b7276ebf6c08895dcb6e5e25f7cae83b6fbacb91cfcc4a61d49b5657a834a901, +8.0.100-rc.2.23502.2, 45f09e7b031f4cf5b4dcead240fe47e2e3731d97d22aa96d3a02a087322658606cc22792053c3784c44f15d7c9bad0ac9dbda90def7b4e197f2955dca9a5bb6c, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/8.0.100-rc.2.23502.2/dotnet-sdk-8.0.100-rc.2.23502.2-linux-x64.tar.gz, diff --git a/platforms/dotnet/versions/buster/versionsToBuild.txt b/platforms/dotnet/versions/buster/versionsToBuild.txt index 83b7b4dc92..ca76e98a80 100644 --- a/platforms/dotnet/versions/buster/versionsToBuild.txt +++ b/platforms/dotnet/versions/buster/versionsToBuild.txt @@ -59,6 +59,7 @@ 6.0.410, 8c85f5b10eb786c8cf31bf268131a2345a295d88d318310dc8457d831f0a587ec1600e43beb7f55aec2248483b9a95e905a468b592f0c910443b4aaa9baeb2e3, 6.0.411, dc8aa1f84ad97cf25a979bfc243c200b7a8e73b930b68d5eed782743d88aad823c32c267c83d7a19d3c4f910a8fae7f12d07ea5a35a1d3a97e13a8674d29037b, 6.0.412, ee97aa5258e05aecadc66e844fa8eef97d51e5035492999b974cc8272e4db1a862a1f88a925f38be9e95c71d2e961b56459dcd614475895df608945c8057c311, +6.0.415, b1a3f84b50faf5840f5151bc8e41550f4c5828ea6a8df472e802fae8a00dca1a141ae620e2c20eec90935c322bc1fb082b38dee90a625766df1ec66b0f640d02, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/6.0.23/dotnet-sdk-6.0.415-linux-x64.tar.gz, 7.0.100-preview.1.22110.4, 54488a911172f059e3823d6bf52e1fa87305eb09e84d97f81a40e0815fc8a73a480b149023283f557a672ef0341f022b8ca16ebec92264ee16a56fac8f35e2e2, 7.0.100-preview.5.22307.18, 691c0d8917bc9848a08707b7fa22da05228dad0ba6335ff06c6d80f9a95349307572ff45c0b088d9fc199c40a1784ff314e1a8735d0366bd3aa06eb8dfa2b7d5, 7.0.100-preview.6.22352.1, e49a2119021e4069f1193898536cc59628336e656f2f7e49d454a593a330d8e437acf2f4efb70925bc16a9c900c2e49f4a6c2fb5f69e696b09a91ebccd2c9307, @@ -75,4 +76,6 @@ 7.0.304, f4b7d0cde432bd37f445363b3937ad483e5006794886941e43124de051475925b3cd11313b73d2cae481ee9b8f131394df0873451f6088ffdbe73f150b1ed727, 7.0.305, c63e6baf3760a9949089d78920531a1140f4f31fffe13069b2011c61c3d583d585f5ec8cca973b414fa35d48ccbfea9c1ec1c88222b53afd2af5974be3b5cb1b, 7.0.306, 62df9bca9492b3273830e098e787ec3664243989ac03550534599fc331693553660d3cf8bca655f2d1326070dbb7b20b04743eaba77fa9cc69f6f0fddfdebd06, +7.0.402, 0c4d654bc7d440f49d14e6e3ea71e636bb37c92c1e835ec87879350f5b00d68465a05c3a2dc078252329c3953a131bc4c2bca6b1d2303ca5af14d3d88a192245, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/7.0.12/dotnet-sdk-7.0.402-linux-x64.tar.gz, 8.0.100-rc.1.23463.5, ac941fd16fd7c328f7cc44b132b4253ddb2b6a6c152af5f43c71c6cd0d468c89b7276ebf6c08895dcb6e5e25f7cae83b6fbacb91cfcc4a61d49b5657a834a901, +8.0.100-rc.2.23502.2, 45f09e7b031f4cf5b4dcead240fe47e2e3731d97d22aa96d3a02a087322658606cc22792053c3784c44f15d7c9bad0ac9dbda90def7b4e197f2955dca9a5bb6c, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/8.0.100-rc.2.23502.2/dotnet-sdk-8.0.100-rc.2.23502.2-linux-x64.tar.gz, diff --git a/platforms/dotnet/versions/focal-scm/versionsToBuild.txt b/platforms/dotnet/versions/focal-scm/versionsToBuild.txt index 83b7b4dc92..ca76e98a80 100644 --- a/platforms/dotnet/versions/focal-scm/versionsToBuild.txt +++ b/platforms/dotnet/versions/focal-scm/versionsToBuild.txt @@ -59,6 +59,7 @@ 6.0.410, 8c85f5b10eb786c8cf31bf268131a2345a295d88d318310dc8457d831f0a587ec1600e43beb7f55aec2248483b9a95e905a468b592f0c910443b4aaa9baeb2e3, 6.0.411, dc8aa1f84ad97cf25a979bfc243c200b7a8e73b930b68d5eed782743d88aad823c32c267c83d7a19d3c4f910a8fae7f12d07ea5a35a1d3a97e13a8674d29037b, 6.0.412, ee97aa5258e05aecadc66e844fa8eef97d51e5035492999b974cc8272e4db1a862a1f88a925f38be9e95c71d2e961b56459dcd614475895df608945c8057c311, +6.0.415, b1a3f84b50faf5840f5151bc8e41550f4c5828ea6a8df472e802fae8a00dca1a141ae620e2c20eec90935c322bc1fb082b38dee90a625766df1ec66b0f640d02, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/6.0.23/dotnet-sdk-6.0.415-linux-x64.tar.gz, 7.0.100-preview.1.22110.4, 54488a911172f059e3823d6bf52e1fa87305eb09e84d97f81a40e0815fc8a73a480b149023283f557a672ef0341f022b8ca16ebec92264ee16a56fac8f35e2e2, 7.0.100-preview.5.22307.18, 691c0d8917bc9848a08707b7fa22da05228dad0ba6335ff06c6d80f9a95349307572ff45c0b088d9fc199c40a1784ff314e1a8735d0366bd3aa06eb8dfa2b7d5, 7.0.100-preview.6.22352.1, e49a2119021e4069f1193898536cc59628336e656f2f7e49d454a593a330d8e437acf2f4efb70925bc16a9c900c2e49f4a6c2fb5f69e696b09a91ebccd2c9307, @@ -75,4 +76,6 @@ 7.0.304, f4b7d0cde432bd37f445363b3937ad483e5006794886941e43124de051475925b3cd11313b73d2cae481ee9b8f131394df0873451f6088ffdbe73f150b1ed727, 7.0.305, c63e6baf3760a9949089d78920531a1140f4f31fffe13069b2011c61c3d583d585f5ec8cca973b414fa35d48ccbfea9c1ec1c88222b53afd2af5974be3b5cb1b, 7.0.306, 62df9bca9492b3273830e098e787ec3664243989ac03550534599fc331693553660d3cf8bca655f2d1326070dbb7b20b04743eaba77fa9cc69f6f0fddfdebd06, +7.0.402, 0c4d654bc7d440f49d14e6e3ea71e636bb37c92c1e835ec87879350f5b00d68465a05c3a2dc078252329c3953a131bc4c2bca6b1d2303ca5af14d3d88a192245, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/7.0.12/dotnet-sdk-7.0.402-linux-x64.tar.gz, 8.0.100-rc.1.23463.5, ac941fd16fd7c328f7cc44b132b4253ddb2b6a6c152af5f43c71c6cd0d468c89b7276ebf6c08895dcb6e5e25f7cae83b6fbacb91cfcc4a61d49b5657a834a901, +8.0.100-rc.2.23502.2, 45f09e7b031f4cf5b4dcead240fe47e2e3731d97d22aa96d3a02a087322658606cc22792053c3784c44f15d7c9bad0ac9dbda90def7b4e197f2955dca9a5bb6c, https://dotnetcli.blob.core.windows.net/dotnet-private/Internal/8.0.100-rc.2.23502.2/dotnet-sdk-8.0.100-rc.2.23502.2-linux-x64.tar.gz, diff --git a/src/BuildScriptGenerator.Common/SdkStorageConstants.cs b/src/BuildScriptGenerator.Common/SdkStorageConstants.cs index 234c3ea4af..5e71a8ae70 100644 --- a/src/BuildScriptGenerator.Common/SdkStorageConstants.cs +++ b/src/BuildScriptGenerator.Common/SdkStorageConstants.cs @@ -13,7 +13,6 @@ public static class SdkStorageConstants public const string PrivateStagingSdkStorageBaseUrl = "https://oryxsdksstaging.blob.core.windows.net"; public const string DevSdkStorageBaseUrl = "https://oryxsdksdev.blob.core.windows.net"; public const string SandboxSdkStorageBaseUrl = "https://oryxsdkssandbox.blob.core.windows.net"; - public const string PrivateSdkStorageBaseUrl = "https://oryxsdksprivate.blob.core.windows.net"; public const string ProdSdkStorageBaseUrl = "https://oryxsdksprod.blob.core.windows.net"; public const string ProdBackupSdkStorageBaseUrl = "https://oryxsdksprodbackup.blob.core.windows.net"; public const string ProdSdkCdnStorageBaseUrl = "https://oryx-cdn.microsoft.io"; diff --git a/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs b/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs index ed544db521..27bedeb4fd 100644 --- a/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs +++ b/src/BuildScriptGenerator/DotNetCore/DotNetCoreRunTimeVersions.cs @@ -4,7 +4,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.DotNetCore { public static class DotNetCoreRunTimeVersions { - public const string DotNetCoreRuntimeBaseTag = "20230930.2"; + public const string DotNetCoreRuntimeBaseTag = "20231008.2"; public const string NetCoreApp10 = "1.0.16"; public const string NetCoreApp11 = "1.1.13"; public const string NetCoreApp20 = "2.0.9"; @@ -26,17 +26,17 @@ public static class DotNetCoreRunTimeVersions public const string NetCoreApp50Sha = "a9c4784930a977abbc42aff1337dda06ec588c1ec4769a59f9fcab4d5df4fc9efe65f8e61e5433db078f67a94ea2dfe870c32c482a50d4c16283ffacacff4261"; public const string AspnetCoreApp50 = "5.0.17"; public const string AspnetCoreApp50Sha = "d8e87804e9e86273c6512785bd5a6f0e834ff3f4bbebc11c4fcdf16ab4fdfabd0d981a756955267c1aa9bbeec596de3728ce9b2e6415d2d80daef0d999a5df6d"; - public const string NetCoreApp60 = "6.0.20"; - public const string NetCoreApp60Sha = "3688d7170a59015c36d6a5532db67bc22eff66b3eb0a7fc28e1f425791e27a5f467bc7dc593d7f455d72d08c7d27bfcc92b3c8bd30ec3c7c583a8aa82b5afbac"; - public const string AspnetCoreApp60 = "6.0.20"; - public const string AspnetCoreApp60Sha = "891bad6a52a7bcd5afa2a784fe68044d282f6d53fedab4bde6dff8d7d2138a484e947f7a6be156094324b37e9d7e07e87a67622bcf2ea197c2924389edd1d185"; - public const string NetCoreApp70 = "7.0.9"; - public const string NetCoreApp70Sha = "09552e5ae6ac014dadf17545ff0a30ab32921075a31fb33e7be148c13078e30d097f592ffa1b8d306563aaa3f6302e40c5c0ba815c1473bbd5d72e3bef55d91e"; - public const string AspnetCoreApp70 = "7.0.9"; - public const string AspnetCoreApp70Sha = "aabf4fa5ca726dc52774e5d644800ef7477815b22a982b7a2752dec6569186aabca93d5386e195e7ead377144601a786ae6a5d76ff28435bdabfad495cfe554b"; - public const string NetCoreApp80 = "8.0.0-rc.1.23419.4"; - public const string NetCoreApp80Sha = "53938ec3aa4353cfb760d22faa850821b54a53fdd864c4969f48caa6b718ba207162b04a196e85543947acb7d3e719982edad1420b76198562051846f51b1b5c"; - public const string AspnetCoreApp80 = "8.0.0-rc.1.23421.29"; - public const string AspnetCoreApp80Sha = "d5f9e7bffbf2b48b26a317dd1d78bc866973b4a2cda448cd7a7ee64c0ffaf98fa3c4b8584d32528026674bdfd99f602f0fdac8242176815705e080df83825efa"; + public const string NetCoreApp60 = "6.0.23"; + public const string NetCoreApp60Sha = "8182a852bfcd387343a589b71b0e51197b6b658e42dfa35b2e65ccc23d67677d974b00e748183ce61e9a9123e28ff43c9252d8308236c80679bfed16b6dc65af"; + public const string AspnetCoreApp60 = "6.0.23"; + public const string AspnetCoreApp60Sha = "c2f0d82fd0dbfdd56c889d435af20f3b1d55850605df892251b4679830dc5b3466c7734912b7073bfca803e5a75a59e929fb36cdc7d4978d7eb0a563da83d08d"; + public const string NetCoreApp70 = "7.0.12"; + public const string NetCoreApp70Sha = "74bea25e88bd917a733a6899a3b3c9ac40c85a64f82dc0f36840714669621716afbb8fec6c3c398b1ffb522c0ed11958862cff5a4be0bf6268188cdb276bc109"; + public const string AspnetCoreApp70 = "7.0.12"; + public const string AspnetCoreApp70Sha = "4d5ece3f1c0c74f872f42a98ebd7e448ae2ed09e9fec5f29a5ae2781ff16dc8486064eb43a3aa6e3da5cf2c52745f93319c55cf3de883f82cf8adfcd6a9746d3"; + public const string NetCoreApp80 = "8.0.0-rc.2.23479.6"; + public const string NetCoreApp80Sha = "f1565aa5a5a98b3ab2cd92376b0b1bcf4420b6377047bdf2324a7dd86b82f5b4776a2795395bb777a3f7d6f6f9b8dc89721c2fcf93b4c7532b42b263f9fdc828"; + public const string AspnetCoreApp80 = "8.0.0-rc.2.23480.2"; + public const string AspnetCoreApp80Sha = "5d8d50498be52ee4c8ae83e9ca82ab947b187f27b56047cc8a09f6ca2ba6bb7532fdd30bc035d518ce636965371f2ed16c9f97398f04d836f4f67b11b5ce50a9"; } } \ No newline at end of file diff --git a/src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs b/src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs index 9d17d9e32c..87cc62d539 100644 --- a/src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs +++ b/src/BuildScriptGenerator/DotNetCore/DotNetCoreSdkVersions.cs @@ -13,10 +13,10 @@ public static class DotNetCoreSdkVersions public const string DotNetCore31SdkVersion = "3.1.426"; public const string DotNetCore50SdkVersion = "5.0.302"; public const string DotNet50SdkVersion = "5.0.408"; - public const string DotNet60SdkVersion = "6.0.412"; + public const string DotNet60SdkVersion = "6.0.415"; public const string DotNet60RtmSdkVersion = "6-0-100-rtm-21527-11"; - public const string DotNet70SdkVersion = "7.0.306"; - public const string DotNet80SdkVersion = "8.0.100-rc.1.23463.5"; + public const string DotNet70SdkVersion = "7.0.402"; + public const string DotNet80SdkVersion = "8.0.100-rc.2.23502.2"; public static readonly List RuntimeVersions = new List { "3.0-debian-buster", "3.1-debian-bullseye", "3.1-debian-buster", "5.0-debian-buster", "6.0-debian-bullseye", "6.0-debian-buster", "7.0-debian-bullseye", "7.0-debian-buster", "8.0-debian-bookworm", "dynamic-debian-buster" }; } } \ No newline at end of file diff --git a/src/BuildScriptGenerator/StagingRuntimeConstants.cs b/src/BuildScriptGenerator/StagingRuntimeConstants.cs index b45899aae6..c020b60294 100644 --- a/src/BuildScriptGenerator/StagingRuntimeConstants.cs +++ b/src/BuildScriptGenerator/StagingRuntimeConstants.cs @@ -6,7 +6,7 @@ namespace Microsoft.Oryx.BuildScriptGenerator.Common { public static class StagingRuntimeConstants { - public static readonly List DotnetcoreStagingRuntimeVersions = new List { }; + public static readonly List DotnetcoreStagingRuntimeVersions = new List { "6.0", "7.0", "8.0" }; public static readonly List PythonStagingRuntimeVersions = new List { }; public static readonly List NodeStagingRuntimeVersions = new List { }; public static readonly List JavaStagingRuntimeVersions = new List { }; diff --git a/src/startupscriptgenerator/src/common/consts/sdk_storage_constants.go b/src/startupscriptgenerator/src/common/consts/sdk_storage_constants.go index a84ce36ca4..f80843836b 100644 --- a/src/startupscriptgenerator/src/common/consts/sdk_storage_constants.go +++ b/src/startupscriptgenerator/src/common/consts/sdk_storage_constants.go @@ -11,7 +11,6 @@ const StagingStorageSasTokenKeyvaultSecretName string = "ORYX-SDK-STAGING-PRIVAT const PrivateStagingSdkStorageBaseUrl string = "https://oryxsdksstaging.blob.core.windows.net" const DevSdkStorageBaseUrl string = "https://oryxsdksdev.blob.core.windows.net" const SandboxSdkStorageBaseUrl string = "https://oryxsdkssandbox.blob.core.windows.net" -const PrivateSdkStorageBaseUrl string = "https://oryxsdksprivate.blob.core.windows.net" const ProdSdkStorageBaseUrl string = "https://oryxsdksprod.blob.core.windows.net" const ProdBackupSdkStorageBaseUrl string = "https://oryxsdksprodbackup.blob.core.windows.net" const ProdSdkCdnStorageBaseUrl string = "https://oryx-cdn.microsoft.io" diff --git a/tests/Oryx.Tests.Common/ImageTestHelper.cs b/tests/Oryx.Tests.Common/ImageTestHelper.cs index 006d74cba9..46c244609b 100644 --- a/tests/Oryx.Tests.Common/ImageTestHelper.cs +++ b/tests/Oryx.Tests.Common/ImageTestHelper.cs @@ -166,7 +166,7 @@ public string GetRuntimeImage(string platformName, string platformVersion, strin case DotNetCoreConstants.RuntimePlatformName: if (StagingRuntimeConstants.DotnetcoreStagingRuntimeVersions.Contains(platformVersion)) { - runtimeRepoPrefix.Replace(_defaultRepoPrefix, _defaultStagingRepoPrefix); + runtimeRepoPrefix = runtimeRepoPrefix.Replace(_defaultRepoPrefix, _defaultStagingRepoPrefix); } break; } diff --git a/vsts/pipelines/templates/_platformBinariesReleaseTemplate.yml b/vsts/pipelines/templates/_platformBinariesReleaseTemplate.yml index df85c79267..5670eb78ec 100644 --- a/vsts/pipelines/templates/_platformBinariesReleaseTemplate.yml +++ b/vsts/pipelines/templates/_platformBinariesReleaseTemplate.yml @@ -23,7 +23,6 @@ steps: ORYX_SDK_STORAGE_ACCOUNT_ACCESS_TOKEN: $(ORYX-SDK-STAGING-PRIVATE-SAS-TOKEN) SANDBOX_STORAGE_SAS_TOKEN: $(SANDBOX-STORAGE-SAS-TOKEN) PERSONAL_STORAGE_SAS_TOKEN: $(${{ upper(parameters.destinationSdkStorageAccountName) }}-PERSONAL-STORAGE-SAS-TOKEN) - PRIVATE_STORAGE_SAS_TOKEN: $(ORYX-SDK-PRIVATE-SAS-TOKEN) inputs: scriptPath: ./vsts/scripts/publishFilesToAzureStorage.sh args: ${{ parameters.destinationSdkStorageAccountName }} diff --git a/vsts/scripts/publishFilesToAzureStorage.sh b/vsts/scripts/publishFilesToAzureStorage.sh index 9b9f6572d1..b6cb6e9eb4 100755 --- a/vsts/scripts/publishFilesToAzureStorage.sh +++ b/vsts/scripts/publishFilesToAzureStorage.sh @@ -84,8 +84,6 @@ elif [[ "$storageAccountUrl" == $DEV_SDK_STORAGE_BASE_URL ]]; then sasToken=$DEV_STORAGE_SAS_TOKEN elif [[ "$storageAccountUrl" == $PRIVATE_STAGING_SDK_STORAGE_BASE_URL ]]; then sasToken=$ORYX_SDK_STORAGE_ACCOUNT_ACCESS_TOKEN -elif [[ "$storageAccountUrl" == $PRIVATE_SDK_STORAGE_BASE_URL ]]; then - sasToken=$PRIVATE_STORAGE_SAS_TOKEN # check if the personal sas token has been found in the oryx key vault elif [[ "$PERSONAL_STORAGE_SAS_TOKEN" != "\$($storageAccountName-PERSONAL-STORAGE-SAS-TOKEN)" ]]; then sasToken=$PERSONAL_STORAGE_SAS_TOKEN