Merge branch 'master' of https://github.com/admin-shell-io/aasx-server

eclipse-aaspe · May 1, 2021 · 6e5e4ca · 6e5e4ca
2 parents 5cbd6e6 + 7c5af93
commit 6e5e4ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/docker/Dockerfile-AasxServerBlazor b/src/docker/Dockerfile-AasxServerBlazor
@@ -7,7 +7,8 @@ COPY ./src/ /repo/src/
 COPY ./LICENSE.txt /repo/
 RUN dotnet publish -c Release -o /out/AasxServerBlazor AasxServerBlazor
 
-FROM mcr.microsoft.com/dotnet/aspnet:3.1
+FROM mcr.microsoft.com/dotnet/aspnet:3.1 as base
+RUN apt-get update && apt-get install -y libgdiplus
 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
@@ -10,7 +10,8 @@ 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/aspnet:3.1-buster-slim-arm32v7
+FROM mcr.microsoft.com/dotnet/aspnet:3.1-buster-slim-arm32v7 as base
+# RUN apt-get update && apt-get install -y libgdiplus
 EXPOSE 51210
 EXPOSE 51310
 COPY --from=build-env /out/AasxServerBlazor/ /AasxServerBlazor/