Skip to content

Commit 626c9f8

Browse files
philasmarphilasmar
committed
Merge branch 'master' into dev
2 parents 8d43ff9 + bc56594 commit 626c9f8

File tree

12 files changed

+237
-49
lines changed

12 files changed

+237
-49
lines changed

‎.github/workflows/update-Dockerfiles.yml

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,20 @@ on:
3232
description: ".NET 7 Next Version"
3333
type: string
3434
required: true
35+
NET_8_AMD64:
36+
description: ".NET 8 AMD64"
37+
type: boolean
38+
required: true
39+
default: "true"
40+
NET_8_ARM64:
41+
description: ".NET 8 ARM64"
42+
type: boolean
43+
required: true
44+
default: "true"
45+
NET_8_NEXT_VERSION:
46+
description: ".NET 8 Next Version"
47+
type: string
48+
required: true
3549

3650
jobs:
3751
build:
@@ -41,6 +55,8 @@ jobs:
4155
NET_6_ARM64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net6/arm64/Dockerfile"
4256
NET_7_AMD64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net7/amd64/Dockerfile"
4357
NET_7_ARM64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net7/arm64/Dockerfile"
58+
NET_8_AMD64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net8/amd64/Dockerfile"
59+
NET_8_ARM64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net8/arm64/Dockerfile"
4460

4561
# Steps represent a sequence of tasks that will be executed as part of the job
4662
steps:
@@ -75,6 +91,20 @@ jobs:
7591
.\LambdaRuntimeDockerfiles/update-dockerfile.ps1 -DockerfilePath ${{ env.NET_7_ARM64_Dockerfile }} -NextVersion ${{ github.event.inputs.NET_7_NEXT_VERSION }}
7692
if: ${{ github.event.inputs.NET_7_ARM64 == 'true' }}
7793

94+
- name: Update .NET 8 AMD64
95+
id: update-net8-amd64
96+
shell: pwsh
97+
run: |
98+
.\LambdaRuntimeDockerfiles/update-dockerfile.ps1 -DockerfilePath ${{ env.NET_8_AMD64_Dockerfile }} -NextVersion ${{ github.event.inputs.NET_8_NEXT_VERSION }}
99+
if: ${{ github.event.inputs.NET_8_AMD64 == 'true' }}
100+
101+
- name: Update .NET 8 ARM64
102+
id: update-net8-arm64
103+
shell: pwsh
104+
run: |
105+
.\LambdaRuntimeDockerfiles/update-dockerfile.ps1 -DockerfilePath ${{ env.NET_8_ARM64_Dockerfile }} -NextVersion ${{ github.event.inputs.NET_8_NEXT_VERSION }}
106+
if: ${{ github.event.inputs.NET_8_ARM64 == 'true' }}
107+
78108
# Update Dockerfiles if newer version of ASP.NET Core is available
79109
- name: Commit and Push
80110
id: commit-push
@@ -105,11 +135,13 @@ jobs:
105135
\n\n*Description of changes:*
106136
\n${{ format
107137
(
108-
'{0}\n{1}\n{2}\n{3}',
138+
'{0}\n{1}\n{2}\n{3}\n{4}\n{5}',
109139
join(steps.update-net6-amd64.outputs.*, '\n'),
110140
join(steps.update-net6-arm64.outputs.*, '\n'),
111141
join(steps.update-net7-amd64.outputs.*, '\n'),
112-
join(steps.update-net7-arm64.outputs.*, '\n')
142+
join(steps.update-net7-arm64.outputs.*, '\n'),
143+
join(steps.update-net8-amd64.outputs.*, '\n'),
144+
join(steps.update-net8-arm64.outputs.*, '\n')
113145
)
114146
}}"
115147
github_token: ${{ secrets.GITHUB_TOKEN }}

‎LambdaRuntimeDockerfiles/Images/net8/amd64/Dockerfile

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
2+
3+
ARG ASPNET_VERSION=8.0.0-preview.6.23329.11
4+
ARG ASPNET_SHA512=767ee4f67777d53edd322c771baa70d592e9fec99dce66e66a67fdd3c377b3f791f0f89b7dd5bbce932f499266f52f21449728849def706d976b55dafe2e6551
5+
6+
ARG LAMBDA_RUNTIME_NAME=dotnet8
7+
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2
8+
9+
FROM $AMAZON_LINUX AS base
10+
11+
FROM base AS builder-net8
12+
ARG ASPNET_VERSION
13+
ARG ASPNET_SHA512
14+
15+
WORKDIR /dotnet
16+
17+
# Install tar and gzip for unarchiving downloaded tar.gz
18+
RUN yum install tar gzip --assumeyes
19+
20+
# Install the ASP.NET Core shared framework
21+
RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-x64.tar.gz \
22+
&& aspnetcore_sha512=$ASPNET_SHA512 \
23+
&& echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \
24+
&& tar -ozxf aspnetcore.tar.gz -C /dotnet \
25+
&& rm aspnetcore.tar.gz
26+
27+
28+
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview-bookworm-slim AS builder
29+
WORKDIR /src
30+
COPY ["Libraries/src/Amazon.Lambda.RuntimeSupport", "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport/"]
31+
COPY ["Libraries/src/Amazon.Lambda.Core", "Repo/Libraries/src/Amazon.Lambda.Core/"]
32+
COPY ["buildtools/", "Repo/buildtools/"]
33+
RUN dotnet restore "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj" /p:TargetFrameworks=net8.0
34+
WORKDIR "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport"
35+
RUN dotnet build "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net8.0 --runtime linux-x64 -c Release -o /app/build
36+
37+
38+
FROM builder AS publish
39+
RUN dotnet publish "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net8.0 -f net8.0 --runtime linux-x64 --self-contained false -p:PublishReadyToRun=true -c Release -o /app/publish
40+
RUN apt-get update && apt-get install -y dos2unix
41+
RUN dos2unix /app/publish/bootstrap.sh && \
42+
mv /app/publish/bootstrap.sh /app/publish/bootstrap && \
43+
chmod +x /app/publish/bootstrap
44+
45+
46+
FROM base
47+
48+
ARG ASPNET_VERSION
49+
ARG LAMBDA_RUNTIME_NAME
50+
51+
ENV \
52+
# Export .NET version as environment variable
53+
DOTNET_VERSION=$ASPNET_VERSION \
54+
# Enable detection of running in a container
55+
DOTNET_RUNNING_IN_CONTAINER=true \
56+
# Lambda is opinionated about installing tooling under /var
57+
DOTNET_ROOT=/var/lang/bin \
58+
# Don't display welcome message on first run
59+
DOTNET_NOLOGO=true \
60+
# Disable Microsoft's telemetry collection
61+
DOTNET_CLI_TELEMETRY_OPTOUT=true
62+
63+
COPY --from=builder-net8 /dotnet ${DOTNET_ROOT}
64+
COPY --from=publish /app/publish ${LAMBDA_RUNTIME_DIR}
65+
66+
# Generate runtime-release file
67+
RUN export BUILD_TIMESTAMP=$(printf '%x' $(date +%s)) && \
68+
export LOGGING_PROTOCOL="LOGGING=amzn-stdout-tlv" && \
69+
export LAMBDA_RUNTIME_NAME="LAMBDA_RUNTIME_NAME=${LAMBDA_RUNTIME_NAME}" && \
70+
echo -e "NAME=dotnet\nVERSION=${ASPNET_VERSION}-${BUILD_TIMESTAMP}\n${LOGGING_PROTOCOL}\n${LAMBDA_RUNTIME_NAME}\n" > ${LAMBDA_RUNTIME_DIR}/runtime-release
71+
72+
# Entrypoint is inherited from public.ecr.aws/lambda/provided

‎LambdaRuntimeDockerfiles/Images/net8/arm64/Dockerfile

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
2+
3+
ARG ASPNET_VERSION=8.0.0-preview.6.23329.11
4+
ARG ASPNET_SHA512=61387e06d59e4a5a7d22c4b8dae6d984ddd62e4743824136c371a72ceaa5ec607af2bbae269df2d707bb80623d9ead6eac0765eed62531e1dafba80418ba83bc
5+
6+
ARG ICU_VERSION=68.1
7+
ARG ICU_MD5=6a99b541ea01f271257b121a4433c7c0
8+
9+
ARG LAMBDA_RUNTIME_NAME=dotnet8
10+
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2
11+
12+
FROM $AMAZON_LINUX AS base
13+
14+
FROM base AS builder-libicu
15+
WORKDIR /
16+
17+
# Install depedencies to extract and build ICU library
18+
RUN yum install -d1 -y \
19+
tar \
20+
gzip \
21+
make \
22+
gcc-c++
23+
24+
# Download, validate and extract ICU library
25+
# https://github.com/unicode-org/icu/releases/tag/release-68-1
26+
ARG ICU_VERSION
27+
ARG ICU_MD5
28+
RUN curl -SL https://github.com/unicode-org/icu/releases/download/release-${ICU_VERSION//./-}/icu4c-${ICU_VERSION//./_}-src.tgz -o icu-src.tgz \
29+
&& echo "$ICU_MD5 icu-src.tgz" | md5sum -c - \
30+
&& tar -xzf icu-src.tgz \
31+
&& rm icu-src.tgz
32+
33+
# Build ICU library
34+
RUN mkdir /libicu
35+
WORKDIR /icu/source/
36+
RUN ./configure --prefix=/libicu \
37+
&& make \
38+
&& make install
39+
40+
41+
FROM base AS builder-net8
42+
ARG ASPNET_VERSION
43+
ARG ASPNET_SHA512
44+
45+
WORKDIR /dotnet
46+
47+
# Install tar and gzip for unarchiving downloaded tar.gz
48+
RUN yum install tar gzip --assumeyes
49+
50+
# Install the ASP.NET Core shared framework
51+
RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-arm64.tar.gz \
52+
&& aspnetcore_sha512=$ASPNET_SHA512 \
53+
&& echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \
54+
&& tar -ozxf aspnetcore.tar.gz -C /dotnet \
55+
&& rm aspnetcore.tar.gz
56+
57+
58+
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview-bookworm-slim AS builder
59+
WORKDIR /src
60+
COPY ["Libraries/src/Amazon.Lambda.RuntimeSupport", "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport/"]
61+
COPY ["Libraries/src/Amazon.Lambda.Core", "Repo/Libraries/src/Amazon.Lambda.Core/"]
62+
COPY ["buildtools/", "Repo/buildtools/"]
63+
RUN dotnet restore "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj" /p:TargetFrameworks=net8.0
64+
WORKDIR "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport"
65+
RUN dotnet build "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net8.0 --runtime linux-arm64 -c Release -o /app/build
66+
67+
68+
FROM builder AS publish
69+
RUN dotnet publish "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net8.0 -f net8.0 --runtime linux-arm64 --self-contained false -p:PublishReadyToRun=true -c Release -o /app/publish
70+
RUN apt-get update && apt-get install -y dos2unix
71+
RUN dos2unix /app/publish/bootstrap.sh && \
72+
mv /app/publish/bootstrap.sh /app/publish/bootstrap && \
73+
chmod +x /app/publish/bootstrap
74+
75+
# Copy native dependencies
76+
COPY --from=builder-libicu /libicu /app/publish
77+
78+
79+
FROM base
80+
81+
ARG ASPNET_VERSION
82+
ARG LAMBDA_RUNTIME_NAME
83+
84+
ENV \
85+
# Export .NET version as environment variable
86+
DOTNET_VERSION=$ASPNET_VERSION \
87+
# Enable detection of running in a container
88+
DOTNET_RUNNING_IN_CONTAINER=true \
89+
# Lambda is opinionated about installing tooling under /var
90+
DOTNET_ROOT=/var/lang/bin \
91+
# Don't display welcome message on first run
92+
DOTNET_NOLOGO=true \
93+
# Disable Microsoft's telemetry collection
94+
DOTNET_CLI_TELEMETRY_OPTOUT=true
95+
96+
COPY --from=builder-net8 /dotnet ${DOTNET_ROOT}
97+
COPY --from=publish /app/publish ${LAMBDA_RUNTIME_DIR}
98+
99+
# Generate runtime-release file
100+
RUN export BUILD_TIMESTAMP=$(printf '%x' $(date +%s)) && \
101+
export LOGGING_PROTOCOL="LOGGING=amzn-stdout-tlv" && \
102+
export LAMBDA_RUNTIME_NAME="LAMBDA_RUNTIME_NAME=${LAMBDA_RUNTIME_NAME}" && \
103+
echo -e "NAME=dotnet\nVERSION=${ASPNET_VERSION}-${BUILD_TIMESTAMP}\n${LOGGING_PROTOCOL}\n${LAMBDA_RUNTIME_NAME}\n" > ${LAMBDA_RUNTIME_DIR}/runtime-release
104+
105+
# Entrypoint is inherited from public.ecr.aws/lambda/provided

‎LambdaRuntimeDockerfiles/Infrastructure/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ Infrastructure project allows to create pipeline to build and push .NET Lambda R
2626
-StageEcr "AccountId.dkr.ecr.us-west-2.amazonaws.com" `
2727
-BetaEcrs "AccountId.dkr.ecr.us-west-2.amazonaws.com;AccountId.dkr.ecr.us-west-2.amazonaws.com" `
2828
-ProdEcrs "AccountId.dkr.ecr.us-west-2.amazonaws.com;AccountId.dkr.ecr.us-west-2.amazonaws.com" `
29-
-EcrRepositoryName "awslambda/dotnet5.0-runtime;awslambda/dotnet6.0-runtime" `
30-
-TargetFramework "net5;net6" `
31-
-DotnetChannel "5.0;6.0"
29+
-EcrRepositoryName "awslambda/dotnet6.0-runtime;awslambda/dotnet7-runtime;awslambda/dotnet8-runtime" `
30+
-TargetFramework "net6;net7;net8" `
31+
-DotnetChannel "6.0;7.0;8.0"
3232
```
3333

3434
#### Notes

‎LambdaRuntimeDockerfiles/Infrastructure/src/Infrastructure/Configuration.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ internal class Configuration
2929
public readonly string[] EcrRepositoryNames = Environment.GetEnvironmentVariable("AWS_LAMBDA_ECR_REPOSITORY_NAME")?.Split(";");
3030
public const string ProjectRoot = "LambdaRuntimeDockerfiles/Infrastructure/src/Infrastructure";
3131
public const string ProjectName = "aws-lambda-container-images";
32-
public readonly string[] DockerARM64Images = new string[] { "net6", "net7" };
32+
public readonly string[] DockerARM64Images = new string[] { "net6", "net7", "net8" };
3333
// DotnetSdkVersions is used to specify a specific version of the .NET SDK to be installed on the CodeBuild image
3434
// The default behavior is to specify a channel and that installs the latest version in that channel
3535
// By specifying a specific .NET SDK version, you override the default channel behavior
3636
public readonly Dictionary<string, string> DotnetSdkVersions = new Dictionary<string, string> { };
37-
public readonly Dictionary<string, string> DockerBuildImages = new Dictionary<string, string> { {"net5", "5.0-buster-slim"}, {"net6", "6.0-bullseye-slim"}, {"net7", "7.0-bullseye-slim"} };
38-
public readonly Dictionary<string, string> BaseImageAMD64Tags = new Dictionary<string, string> { { "net5", "base-image-x86_64" }, { "net6", "contributed-base-image-x86_64" }, { "net7", "contributed-base-image-x86_64" } };
39-
public readonly Dictionary<string, string> BaseImageARM64Tags = new Dictionary<string, string> { { "net5", "base-image-arm64" }, { "net6", "contributed-base-image-arm64" }, { "net7", "contributed-base-image-arm64" } };
37+
public readonly Dictionary<string, string> DockerBuildImages = new Dictionary<string, string> { {"net6", "6.0-bullseye-slim"}, {"net7", "7.0-bullseye-slim"}, {"net8", "8.0-preview-bookworm-slim"} };
38+
public readonly Dictionary<string, string> BaseImageAMD64Tags = new Dictionary<string, string> { { "net6", "contributed-base-image-x86_64" }, { "net7", "contributed-base-image-x86_64" }, { "net8", "contributed-base-image-x86_64" } };
39+
public readonly Dictionary<string, string> BaseImageARM64Tags = new Dictionary<string, string> { { "net6", "contributed-base-image-arm64" }, { "net7", "contributed-base-image-arm64" }, { "net8", "contributed-base-image-arm64" } };
4040
public readonly string[] Frameworks = Environment.GetEnvironmentVariable("AWS_LAMBDA_DOTNET_FRAMEWORK_VERSION")?.Split(";");
4141
public readonly string[] Channels = Environment.GetEnvironmentVariable("AWS_LAMBDA_DOTNET_FRAMEWORK_CHANNEL")?.Split(";");
4242
}

‎LambdaRuntimeDockerfiles/SmokeTests/test/ImageFunction.SmokeTests/ImageFunction.SmokeTests.Net7.csproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎LambdaRuntimeDockerfiles/SmokeTests/test/ImageFunction.SmokeTests/ImageFunction.SmokeTests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66

7-
<PropertyGroup Condition=" '$(Framework)'=='net5.0' ">
8-
<TargetFramework>net5.0</TargetFramework>
9-
</PropertyGroup>
107
<PropertyGroup Condition=" '$(Framework)'=='net6.0' ">
118
<TargetFramework>net6.0</TargetFramework>
129
</PropertyGroup>
1310
<PropertyGroup Condition=" '$(Framework)'=='net7.0' ">
1411
<TargetFramework>net7.0</TargetFramework>
1512
</PropertyGroup>
13+
<PropertyGroup Condition=" '$(Framework)'=='net8.0' ">
14+
<TargetFramework>net8.0</TargetFramework>
15+
</PropertyGroup>
1616

1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />

‎LambdaRuntimeDockerfiles/SmokeTests/test/ImageFunction.SmokeTests/build.ps1

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,8 @@ $env:AWS_LAMBDA_IMAGE_URI = $DestinationUri
7474
try {
7575
Write-Host "Running Smoke Tests"
7676
Push-Location $PSScriptRoot
77-
if ($TargetFramework -eq "net7.0"){
78-
dotnet test .\ImageFunction.SmokeTests.Net7.csproj -v n
79-
}
80-
else{
81-
dotnet test .\ImageFunction.SmokeTests.csproj -v n /p:Framework=$TargetFramework
82-
}
77+
78+
dotnet test .\ImageFunction.SmokeTests.csproj -v n /p:Framework=$TargetFramework
8379

8480
if (!$?)
8581
{

‎LambdaRuntimeDockerfiles/SmokeTests/test/ImageFunction/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG BASE_IMAGE=aws-lambda-dotnet:local
2-
ARG BUILD_IMAGE=5.0-buster-slim
3-
ARG TARGET_FRAMEWORK=net5.0
2+
ARG BUILD_IMAGE=6.0-bullseye-slim
3+
ARG TARGET_FRAMEWORK=net6.0
44

55
FROM $BASE_IMAGE AS base
66
ARG TARGET_FRAMEWORK

‎LambdaRuntimeDockerfiles/SmokeTests/test/ImageFunction/ImageFunction.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<AWSProjectType>Lambda</AWSProjectType>
55
<LangVersion>latest</LangVersion>
66
</PropertyGroup>
7-
<PropertyGroup Condition=" '$(Framework)'=='net5.0' ">
8-
<TargetFramework>net5.0</TargetFramework>
9-
</PropertyGroup>
107
<PropertyGroup Condition=" '$(Framework)'=='net6.0' ">
118
<TargetFramework>net6.0</TargetFramework>
129
</PropertyGroup>
1310
<PropertyGroup Condition=" '$(Framework)'=='net7.0' ">
1411
<TargetFramework>net7.0</TargetFramework>
1512
</PropertyGroup>
13+
<PropertyGroup Condition=" '$(Framework)'=='net8.0' ">
14+
<TargetFramework>net8.0</TargetFramework>
15+
</PropertyGroup>
1616
<ItemGroup>
1717
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.1.0" />
1818
</ItemGroup>

‎LambdaRuntimeDockerfiles/build.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ param(
22
[ValidateSet('amd64','arm64')]
33
[string]$Architecture = "amd64",
44

5-
[ValidateSet('net5','net6','net7')]
6-
[string]$TargetFramework = "net5"
5+
[ValidateSet('net6','net7','net8')]
6+
[string]$TargetFramework = "net6"
77
)
88

99
function Write-Status($string)
@@ -25,18 +25,18 @@ try
2525

2626
if (Test-Path -Path (Join-Path $PWD -ChildPath '.\LambdaRuntimeDockerfiles\Images\' | Join-Path -ChildPath $TargetFramework | Join-Path -ChildPath $Architecture | Join-Path -ChildPath 'Dockerfile') -PathType Leaf)
2727
{
28-
if ($TargetFramework -eq "net7")
28+
if ($TargetFramework -eq "net8")
29+
{
30+
$Tag = "dotnet8-runtime:base-image-$Architecture"
31+
}
32+
elseif($TargetFramework -eq "net7")
2933
{
3034
$Tag = "dotnet7-runtime:base-image-$Architecture"
3135
}
3236
elseif($TargetFramework -eq "net6")
3337
{
3438
$Tag = "dotnet6-runtime:base-image-$Architecture"
3539
}
36-
elseif($TargetFramework -eq "net5")
37-
{
38-
$Tag = "dotnet5.0-runtime:base-image-$Architecture"
39-
}
4040
else
4141
{
4242
throw "Unable to determine tag for target framework $TargetFramework"

0 commit comments

Comments
 (0)