Skip to content

Commit 5edf3f7

Browse files
Merge pull request #197 from StefanScherer/update-dotnet-3-1
Update dotnet 3.1 (needed to support Apple Silicon M1)
2 parents e433be5 + 89e063d commit 5edf3f7

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

result/dotnet/Dockerfile.1809

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as builder
1+
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder
22

33
WORKDIR /Result
44
COPY Result/Result.csproj .
@@ -8,7 +8,7 @@ COPY /Result .
88
RUN dotnet publish -c Release -o /out Result.csproj
99

1010
# app image
11-
FROM mcr.microsoft.com/dotnet/core/aspnet:2.1
11+
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1
1212

1313
WORKDIR /app
1414
ENTRYPOINT ["dotnet", "Result.dll"]

result/dotnet/Result/Result.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

vote/dotnet/Dockerfile.1809

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as builder
1+
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder
22

33
WORKDIR /Vote
44
COPY Vote/Vote.csproj .
@@ -8,7 +8,7 @@ COPY /Vote .
88
RUN dotnet publish -c Release -o /out Vote.csproj
99

1010
# app image
11-
FROM mcr.microsoft.com/dotnet/core/aspnet:2.1
11+
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1
1212

1313
WORKDIR /app
1414
ENTRYPOINT ["dotnet", "Vote.dll"]

vote/dotnet/Vote/Vote.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

worker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as builder
1+
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder
22

33
WORKDIR /Worker
44
COPY src/Worker/Worker.csproj .
@@ -8,7 +8,7 @@ COPY src/Worker/ .
88
RUN dotnet publish -c Release -o /out Worker.csproj
99

1010
# app image
11-
FROM mcr.microsoft.com/dotnet/core/runtime:2.1
11+
FROM mcr.microsoft.com/dotnet/core/runtime:3.1
1212

1313
WORKDIR /app
1414
ENTRYPOINT ["dotnet", "Worker.dll"]

worker/dotnet/Dockerfile.1809

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as builder
1+
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder
22

33
WORKDIR /Worker
44
COPY Worker/Worker.csproj .
@@ -8,7 +8,7 @@ COPY /Worker .
88
RUN dotnet publish -c Release -o /out Worker.csproj
99

1010
# app image
11-
FROM mcr.microsoft.com/dotnet/core/runtime:2.1
11+
FROM mcr.microsoft.com/dotnet/core/runtime:3.1
1212

1313
WORKDIR /app
1414
ENTRYPOINT ["dotnet", "Worker.dll"]

worker/dotnet/Worker/Worker.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

worker/src/Worker/Worker.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

0 commit comments

Comments
 (0)