Skip to content
This repository was archived by the owner on Jan 23, 2024. It is now read-only.

Commit d893bfe

Browse files
Update dockerfile for .NET test to use .NET6 (#1412) (#1418)
* Update Dockerfile Bump .NET version to .NET6 * Update Dockerfile (cherry picked from commit 5b2ed7a) Co-authored-by: Gergely Kalapos <[email protected]>
1 parent 7892549 commit d893bfe

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

docker/dotnet/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# if unset then it uses the build generated above. (TODO: to be done)
44
# DOTNET_AGENT_REPO and DOTNET_AGENT_BRANCH parameterise the DOTNET agent
55
# repo and branch (or commit) to use.
6-
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
6+
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
77
ENV DOTNET_ROOT=/usr/share/dotnet
88
ARG DOTNET_AGENT_REPO=elastic/apm-agent-dotnet
99
ARG DOTNET_AGENT_BRANCH=main
@@ -15,6 +15,9 @@ COPY . /src
1515
# install SDK version in global.json of elastic/apm-agent-dotnet
1616
# Needed when building branches that specify 3.1.100 SDK in global.json
1717
RUN curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --install-dir ${DOTNET_ROOT} -version 3.1.100
18+
19+
# SDK 5.x is also needed
20+
RUN curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --install-dir ${DOTNET_ROOT} -version 5.0.100
1821
RUN ./run.sh
1922

2023
# Stage 2: Run the TestAspNetCoreApp app

0 commit comments

Comments
 (0)