Skip to content

Commit 3c68321

Browse files
philasmarphilasmar
authored
Merge pull request #2088 from aws/dev
Sync dev and master
2 parents 41b21bb + 0d5ec2e commit 3c68321

File tree

28 files changed

+402
-300
lines changed

28 files changed

+402
-300
lines changed

‎.github/workflows/semgrep-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
p/owasp-top-ten
3636
3737
- name: Upload SARIF file for GitHub Advanced Security Dashboard
38-
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f #v3.28.18
38+
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e #v3.28.19
3939
with:
4040
sarif_file: semgrep.sarif
4141
if: always()

‎.github/workflows/update-Dockerfiles.yml

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

3650
jobs:
3751
build:
@@ -41,6 +55,8 @@ jobs:
4155
NET_8_ARM64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net8/arm64/Dockerfile"
4256
NET_9_AMD64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net9/amd64/Dockerfile"
4357
NET_9_ARM64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net9/arm64/Dockerfile"
58+
NET_10_AMD64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net10/amd64/Dockerfile"
59+
NET_10_ARM64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net10/arm64/Dockerfile"
4460

4561
# Steps represent a sequence of tasks that will be executed as part of the job
4662
steps:
@@ -89,6 +105,26 @@ jobs:
89105
.\LambdaRuntimeDockerfiles\update-dockerfile.ps1 -DockerfilePath "${{ env.DOCKERFILE_PATH }}" -NextVersion "${{ env.NEXT_VERSION }}"
90106
if: ${{ github.event.inputs.NET_9_ARM64 == 'true' }}
91107

108+
- name: Update .NET 10 AMD64
109+
id: update-net10-amd64
110+
shell: pwsh
111+
env:
112+
DOCKERFILE_PATH: ${{ env.NET_10_AMD64_Dockerfile }}
113+
NEXT_VERSION: ${{ github.event.inputs.NET_10_NEXT_VERSION }}
114+
run: |
115+
.\LambdaRuntimeDockerfiles\update-dockerfile.ps1 -DockerfilePath "${{ env.DOCKERFILE_PATH }}" -NextVersion "${{ env.NEXT_VERSION }}"
116+
if: ${{ github.event.inputs.NET_10_AMD64 == 'true' }}
117+
118+
- name: Update .NET 10 ARM64
119+
id: update-net10-arm64
120+
shell: pwsh
121+
env:
122+
DOCKERFILE_PATH: ${{ env.NET_10_ARM64_Dockerfile }}
123+
NEXT_VERSION: ${{ github.event.inputs.NET_10_NEXT_VERSION }}
124+
run: |
125+
.\LambdaRuntimeDockerfiles\update-dockerfile.ps1 -DockerfilePath "${{ env.DOCKERFILE_PATH }}" -NextVersion "${{ env.NEXT_VERSION }}"
126+
if: ${{ github.event.inputs.NET_10_ARM64 == 'true' }}
127+
92128
# Update Dockerfiles if newer version of ASP.NET Core is available
93129
- name: Commit and Push
94130
id: commit-push
@@ -119,11 +155,13 @@ jobs:
119155
\n\n*Description of changes:*
120156
\n${{ format
121157
(
122-
'{0}\n{1}\n{2}\n{3}',
158+
'{0}\n{1}\n{2}\n{3}\n{4}\n{5}',
123159
join(steps.update-net8-amd64.outputs.MESSAGE, '\n'),
124160
join(steps.update-net8-arm64.outputs.MESSAGE, '\n'),
125161
join(steps.update-net9-amd64.outputs.MESSAGE, '\n'),
126-
join(steps.update-net9-arm64.outputs.MESSAGE, '\n')
162+
join(steps.update-net9-arm64.outputs.MESSAGE, '\n'),
163+
join(steps.update-net10-amd64.outputs.MESSAGE, '\n'),
164+
join(steps.update-net10-arm64.outputs.MESSAGE, '\n')
127165
)
128166
}}"
129167
github_token: ${{ secrets.GITHUB_TOKEN }}

‎LambdaRuntimeDockerfiles/Images/net6/amd64/Dockerfile renamed to ‎LambdaRuntimeDockerfiles/Images/net10/amd64/Dockerfile

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
22

3-
ARG ASPNET_VERSION=6.0.36
4-
ARG ASPNET_SHA512=0e3d1dcc715bffbcb8ab8cb4fd72accbeed79ac40b7fd517961797a168f4301505044d2c1494a49b0e68103940bd6c178c8ae7bacf75f4b40ce82cc85624f6bd
3+
ARG ASPNET_VERSION=10.0.0-preview.5.25277.114
4+
ARG ASPNET_SHA512=6E69A85F7E18B8EEBB5F99A7E8099DB2FA5DA34BCF078BECBB123C0863D4BE7B4252C7CFC6B21B9585F4F800C058A12CAE55EF2A63B9BEA886CA3D1D8A0EC113
55

6-
ARG LAMBDA_RUNTIME_NAME=dotnet6
7-
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2
6+
ARG LAMBDA_RUNTIME_NAME=dotnet10
7+
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2023
88

99
FROM $AMAZON_LINUX AS base
1010

11-
FROM base AS builder-net6
11+
RUN dnf install libicu-67.1-7.amzn2023.0.3.x86_64 --assumeyes
12+
13+
FROM base AS builder-net10
1214
ARG ASPNET_VERSION
1315
ARG ASPNET_SHA512
1416

1517
WORKDIR /dotnet
1618

1719
# Install tar and gzip for unarchiving downloaded tar.gz
18-
RUN yum install tar gzip --assumeyes
20+
RUN dnf install tar gzip --assumeyes
1921

2022
# Install the ASP.NET Core shared framework
2123
RUN curl -SL --output aspnetcore.tar.gz https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-x64.tar.gz \
@@ -25,22 +27,24 @@ RUN curl -SL --output aspnetcore.tar.gz https://builds.dotnet.microsoft.com/dotn
2527
&& rm aspnetcore.tar.gz
2628

2729

28-
FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim AS builder
30+
FROM mcr.microsoft.com/dotnet/sdk:10.0-preview-trixie-slim AS builder
2931
WORKDIR /src
3032
COPY ["Libraries/src/Amazon.Lambda.RuntimeSupport", "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport/"]
33+
COPY ["Libraries/src/SnapshotRestore.Registry", "Repo/Libraries/src/SnapshotRestore.Registry/"]
3134
COPY ["Libraries/src/Amazon.Lambda.Core", "Repo/Libraries/src/Amazon.Lambda.Core/"]
3235
COPY ["buildtools/", "Repo/buildtools/"]
33-
RUN dotnet restore "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj" /p:TargetFrameworks=net6.0
36+
RUN dotnet restore "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj" /p:TargetFrameworks=net10.0
3437
WORKDIR "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport"
35-
RUN dotnet build "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net6.0 --runtime linux-x64 -c Release -o /app/build
38+
RUN dotnet build "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net10.0 --runtime linux-x64 -c Release -o /app/build
3639

3740

3841
FROM builder AS publish
39-
RUN dotnet publish "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net6.0 -f net6.0 --runtime linux-x64 --self-contained false -p:PublishReadyToRun=true -c Release -o /app/publish
42+
RUN dotnet publish "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net10.0 -f net10.0 --runtime linux-x64 --self-contained false -p:PublishReadyToRun=true -c Release -o /app/publish
4043
RUN apt-get update && apt-get install -y dos2unix
4144
RUN dos2unix /app/publish/bootstrap.sh && \
4245
mv /app/publish/bootstrap.sh /app/publish/bootstrap && \
4346
chmod +x /app/publish/bootstrap
47+
RUN touch /app/publish/empty-certificates.crt
4448

4549

4650
FROM base
@@ -60,7 +64,7 @@ ENV \
6064
# Disable Microsoft's telemetry collection
6165
DOTNET_CLI_TELEMETRY_OPTOUT=true
6266

63-
COPY --from=builder-net6 /dotnet ${DOTNET_ROOT}
67+
COPY --from=builder-net10 /dotnet ${DOTNET_ROOT}
6468
COPY --from=publish /app/publish ${LAMBDA_RUNTIME_DIR}
6569

6670
# Generate runtime-release file

‎LambdaRuntimeDockerfiles/Images/net6/arm64/Dockerfile renamed to ‎LambdaRuntimeDockerfiles/Images/net10/arm64/Dockerfile

Lines changed: 15 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,23 @@
11
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
22

3-
ARG ASPNET_VERSION=6.0.36
4-
ARG ASPNET_SHA512=2a6a2dde7ba3aeee9145686ee32f1901a7aa6238ae8395ea3bad51770e227069272be83959b711d238210c377b66661e3cf039965f019b58cd44c08a982404a2
3+
ARG ASPNET_VERSION=10.0.0-preview.5.25277.114
4+
ARG ASPNET_SHA512=AC99EBEC4E7ABD660A27317D37DA56AE1FA8E9EBDBF4A88FE5F9BE58E1F4D7E8F05BEC32D5E902C0FDD1E9D9E250CDB49448266682010E4CF7F4640F9699B9F1
55

6-
ARG ICU_VERSION=68.1
7-
ARG ICU_MD5=6a99b541ea01f271257b121a4433c7c0
8-
9-
ARG LAMBDA_RUNTIME_NAME=dotnet6
10-
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2
6+
ARG LAMBDA_RUNTIME_NAME=dotnet10
7+
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2023
118

129
FROM $AMAZON_LINUX AS base
1310

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-net6
11+
RUN dnf install libicu-67.1-7.amzn2023.0.3.aarch64 --assumeyes
12+
13+
FROM base AS builder-net10
4214
ARG ASPNET_VERSION
4315
ARG ASPNET_SHA512
4416

4517
WORKDIR /dotnet
4618

4719
# Install tar and gzip for unarchiving downloaded tar.gz
48-
RUN yum install tar gzip --assumeyes
20+
RUN dnf install tar gzip --assumeyes
4921

5022
# Install the ASP.NET Core shared framework
5123
RUN curl -SL --output aspnetcore.tar.gz https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-arm64.tar.gz \
@@ -55,25 +27,24 @@ RUN curl -SL --output aspnetcore.tar.gz https://builds.dotnet.microsoft.com/dotn
5527
&& rm aspnetcore.tar.gz
5628

5729

58-
FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim AS builder
30+
FROM mcr.microsoft.com/dotnet/sdk:10.0-preview-trixie-slim AS builder
5931
WORKDIR /src
6032
COPY ["Libraries/src/Amazon.Lambda.RuntimeSupport", "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport/"]
33+
COPY ["Libraries/src/SnapshotRestore.Registry", "Repo/Libraries/src/SnapshotRestore.Registry/"]
6134
COPY ["Libraries/src/Amazon.Lambda.Core", "Repo/Libraries/src/Amazon.Lambda.Core/"]
6235
COPY ["buildtools/", "Repo/buildtools/"]
63-
RUN dotnet restore "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj" /p:TargetFrameworks=net6.0
36+
RUN dotnet restore "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport/Amazon.Lambda.RuntimeSupport.csproj" /p:TargetFrameworks=net10.0
6437
WORKDIR "Repo/Libraries/src/Amazon.Lambda.RuntimeSupport"
65-
RUN dotnet build "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net6.0 --runtime linux-arm64 -c Release -o /app/build
38+
RUN dotnet build "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net10.0 --runtime linux-arm64 -c Release -o /app/build
6639

6740

6841
FROM builder AS publish
69-
RUN dotnet publish "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net6.0 -f net6.0 --runtime linux-arm64 --self-contained false -p:PublishReadyToRun=true -c Release -o /app/publish
42+
RUN dotnet publish "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net10.0 -f net10.0 --runtime linux-arm64 --self-contained false -p:PublishReadyToRun=true -c Release -o /app/publish
7043
RUN apt-get update && apt-get install -y dos2unix
7144
RUN dos2unix /app/publish/bootstrap.sh && \
7245
mv /app/publish/bootstrap.sh /app/publish/bootstrap && \
7346
chmod +x /app/publish/bootstrap
74-
75-
# Copy native dependencies
76-
COPY --from=builder-libicu /libicu /app/publish
47+
RUN touch /app/publish/empty-certificates.crt
7748

7849

7950
FROM base
@@ -93,7 +64,7 @@ ENV \
9364
# Disable Microsoft's telemetry collection
9465
DOTNET_CLI_TELEMETRY_OPTOUT=true
9566

96-
COPY --from=builder-net6 /dotnet ${DOTNET_ROOT}
67+
COPY --from=builder-net10 /dotnet ${DOTNET_ROOT}
9768
COPY --from=publish /app/publish ${LAMBDA_RUNTIME_DIR}
9869

9970
# Generate runtime-release file

‎LambdaRuntimeDockerfiles/Images/net8/amd64/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
22

3-
ARG ASPNET_VERSION=8.0.16
4-
ARG ASPNET_SHA512=0256cac4151acd6ffc82b0b7b6421f304817b6fdc2d9cb232018cf993e40da6b228d415397dd1b1b34859cffe1d8fc7bd7bb470df81128374e5c944a14c58360
3+
ARG ASPNET_VERSION=8.0.17
4+
ARG ASPNET_SHA512=b292dea52f70035bb7ccc82c1ed908fb084753eb08f662c7bb2e9206e22f396aa611db6573e827d5c5cff21590810b66eae0ead9b534bc3f8fc695f65f47f28f
55

66
ARG LAMBDA_RUNTIME_NAME=dotnet8
77
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2023
@@ -42,8 +42,8 @@ RUN dotnet build "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=t
4242
FROM builder AS publish
4343
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
4444
RUN apt-get update && apt-get install -y dos2unix
45-
RUN dos2unix /app/publish/bootstrap-al2023.sh && \
46-
mv /app/publish/bootstrap-al2023.sh /app/publish/bootstrap && \
45+
RUN dos2unix /app/publish/bootstrap.net8.sh && \
46+
mv /app/publish/bootstrap.net8.sh /app/publish/bootstrap && \
4747
chmod +x /app/publish/bootstrap
4848
RUN touch /app/publish/empty-certificates.crt
4949

‎LambdaRuntimeDockerfiles/Images/net8/arm64/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
22

3-
ARG ASPNET_VERSION=8.0.16
4-
ARG ASPNET_SHA512=a115e0e6253cea7e9a481ed82f57fc96413aa50ce7407932128cba153bdf4aec1bd8cdb9c04d290ff00f8544429feac86ba6e8d2b0f1674c255bd636c2c7e6de
3+
ARG ASPNET_VERSION=8.0.17
4+
ARG ASPNET_SHA512=4f1a441e400b60f814a161d2718c2599b4d492fffe5df5a5d8a494cec553ad3574c0988e9dc49abf8c928b9e9783a86f5506cbcbdf12d24e562090969aced3c5
55

66
ARG LAMBDA_RUNTIME_NAME=dotnet8
77
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2023
@@ -42,8 +42,8 @@ RUN dotnet build "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=t
4242
FROM builder AS publish
4343
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
4444
RUN apt-get update && apt-get install -y dos2unix
45-
RUN dos2unix /app/publish/bootstrap-al2023.sh && \
46-
mv /app/publish/bootstrap-al2023.sh /app/publish/bootstrap && \
45+
RUN dos2unix /app/publish/bootstrap.net8.sh && \
46+
mv /app/publish/bootstrap.net8.sh /app/publish/bootstrap && \
4747
chmod +x /app/publish/bootstrap
4848
RUN touch /app/publish/empty-certificates.crt
4949

‎LambdaRuntimeDockerfiles/Images/net9/amd64/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
22

3-
ARG ASPNET_VERSION=9.0.5
4-
ARG ASPNET_SHA512=b60b8b5fa6b4538065166cd1266d075c64c464b281159d98bf03132bf363478ccc1185a9a51738cbe37d86752820f6be4add5208120a80dfb2bf4a8b58d22cc4
3+
ARG ASPNET_VERSION=9.0.6
4+
ARG ASPNET_SHA512=54c122c4c6127ce7e0f0ad0479a101db1455484c9e5bffa8fdc0dd72d2db028be86861f331f2c7c1cb2eaee9a92e741e4e5da567795533e46af27e4e481c0451
55

66
ARG LAMBDA_RUNTIME_NAME=dotnet9
77
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2023
@@ -41,8 +41,8 @@ RUN dotnet build "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=t
4141
FROM builder AS publish
4242
RUN dotnet publish "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net9.0 -f net9.0 --runtime linux-x64 --self-contained false -p:PublishReadyToRun=true -c Release -o /app/publish
4343
RUN apt-get update && apt-get install -y dos2unix
44-
RUN dos2unix /app/publish/bootstrap-al2023.sh && \
45-
mv /app/publish/bootstrap-al2023.sh /app/publish/bootstrap && \
44+
RUN dos2unix /app/publish/bootstrap.net8.sh && \
45+
mv /app/publish/bootstrap.net8.sh /app/publish/bootstrap && \
4646
chmod +x /app/publish/bootstrap
4747
RUN touch /app/publish/empty-certificates.crt
4848

‎LambdaRuntimeDockerfiles/Images/net9/arm64/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on Docker image from: https://github.com/dotnet/dotnet-docker/
22

3-
ARG ASPNET_VERSION=9.0.5
4-
ARG ASPNET_SHA512=bd1db145a29b2eef440eba0491c5b70bf29e6793ebaab453d2939bd3ac161f7c33e3e4b1e65a734dd4fd44151357b4c150a4cfcb5ade7249cbf2d03266d6b32b
3+
ARG ASPNET_VERSION=9.0.6
4+
ARG ASPNET_SHA512=8a7024bd144254f400c0758efd5c39854eba5d7e3187fbde2dc857cedd9012ae93aceeb1683bf6bf390cefba40c50f95cc3295a1a8eb83133a8e01b91289dfc5
55

66
ARG LAMBDA_RUNTIME_NAME=dotnet9
77
ARG AMAZON_LINUX=public.ecr.aws/lambda/provided:al2023
@@ -41,8 +41,8 @@ RUN dotnet build "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=t
4141
FROM builder AS publish
4242
RUN dotnet publish "Amazon.Lambda.RuntimeSupport.csproj" /p:ExecutableOutputType=true /p:GenerateDocumentationFile=false /p:TargetFrameworks=net9.0 -f net9.0 --runtime linux-arm64 --self-contained false -p:PublishReadyToRun=true -c Release -o /app/publish
4343
RUN apt-get update && apt-get install -y dos2unix
44-
RUN dos2unix /app/publish/bootstrap-al2023.sh && \
45-
mv /app/publish/bootstrap-al2023.sh /app/publish/bootstrap && \
44+
RUN dos2unix /app/publish/bootstrap.net8.sh && \
45+
mv /app/publish/bootstrap.net8.sh /app/publish/bootstrap && \
4646
chmod +x /app/publish/bootstrap
4747
RUN touch /app/publish/empty-certificates.crt
4848

‎LambdaRuntimeDockerfiles/Infrastructure/README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ Infrastructure project allows to create pipeline to build and push .NET Lambda R
2525
-GitHubRepoBranch "GitHubBranch" `
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" `
28-
-ProdEcrs "AccountId.dkr.ecr.us-west-2.amazonaws.com;AccountId.dkr.ecr.us-west-2.amazonaws.com" `
29-
-EcrRepositoryName "awslambda/dotnet6.0-runtime;awslambda/dotnet8-runtime;awslambda/dotnet9-runtime" `
30-
-TargetFramework "net6;net8;net9" `
31-
-DotnetChannel "6.0;8.0;9.0"
28+
-ProdEcrs "AccountId.dkr.ecr.us-west-2.amazonaws.com;AccountId.dkr.ecr.us-west-2.amazonaws.com"
3229
```
3330

3431
#### Notes

0 commit comments

Comments
 (0)