Update base docker images (#64)

Microsoft updated the docker images due to the release of .NET 5. See dotnet/dotnet-docker#2375
eclipse-aaspe · Mar 24, 2021 · 6b82019 · 6b82019
1 parent cb2d64d
commit 6b82019
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/docker/Dockerfile-AasxServerBlazor b/src/docker/Dockerfile-AasxServerBlazor
@@ -1,13 +1,13 @@
 # It is expected that this docker is executed in the context of repository root.
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build-env
 WORKDIR /repo/src
 
 # Copy everything else and build
 COPY ./src/ /repo/src/
 COPY ./LICENSE.txt /repo/
 RUN dotnet publish -c Release -o /out/AasxServerBlazor AasxServerBlazor
 
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1
+FROM mcr.microsoft.com/dotnet/runtime:3.1
 EXPOSE 51210
 EXPOSE 51310
 COPY --from=build-env /out/AasxServerBlazor/ /AasxServerBlazor/

diff --git a/src/docker/Dockerfile-AasxServerBlazor-arm32 b/src/docker/Dockerfile-AasxServerBlazor-arm32
@@ -1,5 +1,5 @@
 # Based on https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile.debian-arm32
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build-env
 WORKDIR /repo/src
 
 # Copy everything else and build
@@ -10,7 +10,7 @@ RUN dotnet restore -r linux-arm
 
 RUN dotnet publish -c Release -o /out/AasxServerBlazor AasxServerBlazor -r linux-arm --self-contained false --no-restore
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim-arm32v7
+FROM mcr.microsoft.com/dotnet/aspnet:3.1-buster-slim-arm32v7
 EXPOSE 51210
 EXPOSE 51310
 COPY --from=build-env /out/AasxServerBlazor/ /AasxServerBlazor/

diff --git a/src/docker/Dockerfile-AasxServerBlazor-arm64 b/src/docker/Dockerfile-AasxServerBlazor-arm64
@@ -1,5 +1,5 @@
 # Based on https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile.debian-arm32
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build-env
 WORKDIR /repo/src
 
 # Copy everything else and build
@@ -10,7 +10,7 @@ RUN dotnet restore -r linux-arm64
 
 RUN dotnet publish -c Release -o /out/AasxServerBlazor AasxServerBlazor -r linux-arm64 --self-contained false --no-restore
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim-arm64v8
+FROM mcr.microsoft.com/dotnet/aspnet:3.1-buster-slim-arm64v8
 EXPOSE 51210
 EXPOSE 51310
 COPY --from=build-env /out/AasxServerBlazor/ /AasxServerBlazor/

diff --git a/src/docker/Dockerfile-AasxServerCore b/src/docker/Dockerfile-AasxServerCore
@@ -1,13 +1,13 @@
 # It is expected that this docker is executed in the context of repository root.
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build-env
 WORKDIR /repo/src
 
 # Copy the source code and build
 COPY ./src/ /repo/src/
 COPY ./LICENSE.txt /repo/
 RUN dotnet publish -c Release -o /out/AasxServerCore AasxServerCore
 
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1
+FROM mcr.microsoft.com/dotnet/runtime:3.1
 EXPOSE 51210
 EXPOSE 51310
 COPY --from=build-env /out/AasxServerCore/ /AasxServerCore/

diff --git a/src/docker/Dockerfile-AasxServerCore-arm32 b/src/docker/Dockerfile-AasxServerCore-arm32
@@ -1,5 +1,5 @@
 # Based on https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile.debian-arm32
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build-env
 WORKDIR /repo/src
 
 # Copy everything else and build
@@ -10,7 +10,7 @@ RUN dotnet restore -r linux-arm
 
 RUN dotnet publish -c Release -o /out/AasxServerCore AasxServerCore -r linux-arm --self-contained false --no-restore
 
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim-arm32v7
+FROM mcr.microsoft.com/dotnet/runtime:3.1-buster-slim-arm32v7
 EXPOSE 51210
 EXPOSE 51310
 COPY --from=build-env /out/AasxServerCore/ /AasxServerCore/

diff --git a/src/docker/Dockerfile-AasxServerCore-arm64 b/src/docker/Dockerfile-AasxServerCore-arm64
@@ -1,5 +1,5 @@
 # Based on https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile.debian-arm32
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build-env
 WORKDIR /repo/src
 
 # Copy everything else and build
@@ -10,7 +10,7 @@ RUN dotnet restore -r linux-arm64
 
 RUN dotnet publish -c Release -o /out/AasxServerCore AasxServerCore -r linux-arm64 --self-contained false --no-restore
 
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim-arm64v8
+FROM mcr.microsoft.com/dotnet/runtime:3.1-buster-slim-arm64v8
 EXPOSE 51210
 EXPOSE 51310
 COPY --from=build-env /out/AasxServerCore/ /AasxServerCore/