From 50477873e9677d7a91b81778b111dd9e74c54e4d Mon Sep 17 00:00:00 2001 From: martaf Date: Fri, 7 Jun 2024 12:57:32 +0200 Subject: [PATCH] all images now include curl and nano --- src/docker/Dockerfile-AasxServerAspNetCore | 5 ++++- src/docker/Dockerfile-AasxServerAspNetCore-arm32 | 6 ++++-- src/docker/Dockerfile-AasxServerAspNetCore-arm64 | 5 +++-- src/docker/Dockerfile-AasxServerBlazor | 4 +++- src/docker/Dockerfile-AasxServerBlazor-arm32 | 7 ++++--- src/docker/Dockerfile-AasxServerBlazor-arm64 | 6 ++++-- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/docker/Dockerfile-AasxServerAspNetCore b/src/docker/Dockerfile-AasxServerAspNetCore index 848d41cc2..f81f7858d 100644 --- a/src/docker/Dockerfile-AasxServerAspNetCore +++ b/src/docker/Dockerfile-AasxServerAspNetCore @@ -5,9 +5,12 @@ WORKDIR /repo/src # Copy the source code and build COPY ./src/ /repo/src/ COPY ./LICENSE.TXT /repo/LICENSE.txt + RUN dotnet publish -c Release -o /out/AasxServerAspNetCore AasxServerAspNetCore -FROM mcr.microsoft.com/dotnet/aspnet:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:6.0 as base +RUN apt update && apt upgrade --yes +RUN apt install -y curl nano libgdiplus EXPOSE 5001 COPY --from=build-env /out/AasxServerAspNetCore/ /AasxServerAspNetCore/ COPY ./content-for-demo/ /AasxServerAspNetCore/ diff --git a/src/docker/Dockerfile-AasxServerAspNetCore-arm32 b/src/docker/Dockerfile-AasxServerAspNetCore-arm32 index b166aa1c6..2302b086c 100644 --- a/src/docker/Dockerfile-AasxServerAspNetCore-arm32 +++ b/src/docker/Dockerfile-AasxServerAspNetCore-arm32 @@ -2,18 +2,20 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env WORKDIR /repo/src -# Copy everything else and build +# Copy the source code and build COPY ./src/ /repo/src/ COPY ./LICENSE.TXT /repo/LICENSE.txt #RUN dotnet restore -r linux-arm - RUN dotnet publish -c Release -o /out/AasxServerAspNetCore AasxServerAspNetCore -r linux-arm --self-contained false FROM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim-arm32v7 +RUN apt update && apt upgrade --yes +RUN apt install -y curl nano libgdiplus EXPOSE 5001 COPY --from=build-env /out/AasxServerAspNetCore/ /AasxServerAspNetCore/ COPY ./content-for-demo/ /AasxServerAspNetCore/ WORKDIR /AasxServerAspNetCore + ENTRYPOINT ["/bin/bash", "-c", "dotnet AasxServerAspNetCore.dll --no-security --data-path ./aasxs --host 0.0.0.0"] diff --git a/src/docker/Dockerfile-AasxServerAspNetCore-arm64 b/src/docker/Dockerfile-AasxServerAspNetCore-arm64 index be65a3635..ee5bfd122 100644 --- a/src/docker/Dockerfile-AasxServerAspNetCore-arm64 +++ b/src/docker/Dockerfile-AasxServerAspNetCore-arm64 @@ -2,15 +2,16 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env WORKDIR /repo/src -# Copy everything else and build +# Copy the source code and build COPY ./src/ /repo/src/ COPY ./LICENSE.TXT /repo/LICENSE.txt #RUN dotnet restore -r linux-arm64 - RUN dotnet publish -c Release -o /out/AasxServerAspNetCore AasxServerAspNetCore -r linux-arm64 --self-contained false FROM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim-arm64v8 +RUN apt update && apt upgrade --yes +RUN apt install -y curl nano libgdiplus EXPOSE 5001 COPY --from=build-env /out/AasxServerAspNetCore/ /AasxServerAspNetCore/ COPY ./content-for-demo/ /AasxServerAspNetCore/ diff --git a/src/docker/Dockerfile-AasxServerBlazor b/src/docker/Dockerfile-AasxServerBlazor index a24ba7faa..084fde96d 100644 --- a/src/docker/Dockerfile-AasxServerBlazor +++ b/src/docker/Dockerfile-AasxServerBlazor @@ -2,9 +2,10 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env WORKDIR /repo/src -# Copy everything else and build +# Copy the source code and build COPY ./src/ /repo/src/ COPY ./LICENSE.TXT /repo/LICENSE.txt + RUN dotnet publish -c Release -o /out/AasxServerBlazor AasxServerBlazor FROM mcr.microsoft.com/dotnet/aspnet:6.0 as base @@ -14,4 +15,5 @@ EXPOSE 5001 COPY --from=build-env /out/AasxServerBlazor/ /AasxServerBlazor/ COPY ./content-for-demo/ /AasxServerBlazor/ WORKDIR /AasxServerBlazor +RUN chmod +x ./startForDemo.sh ENTRYPOINT ["/bin/bash", "-c", "./startForDemo.sh"] diff --git a/src/docker/Dockerfile-AasxServerBlazor-arm32 b/src/docker/Dockerfile-AasxServerBlazor-arm32 index 8b35c7ccd..41898a647 100644 --- a/src/docker/Dockerfile-AasxServerBlazor-arm32 +++ b/src/docker/Dockerfile-AasxServerBlazor-arm32 @@ -2,18 +2,19 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env WORKDIR /repo/src -# Copy everything else and build +# Copy the source code and build COPY ./src/ /repo/src/ COPY ./LICENSE.TXT /repo/LICENSE.txt 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:6.0-bullseye-slim-arm32v7 as base -# RUN apt-get update && apt-get install -y libgdiplus +RUN apt update && apt upgrade --yes +RUN apt install -y curl nano libgdiplus EXPOSE 5001 COPY --from=build-env /out/AasxServerBlazor/ /AasxServerBlazor/ COPY ./content-for-demo/ /AasxServerBlazor/ WORKDIR /AasxServerBlazor +RUN chmod +x ./startForDemo.sh ENTRYPOINT ["/bin/bash", "-c", "./startForDemo.sh"] diff --git a/src/docker/Dockerfile-AasxServerBlazor-arm64 b/src/docker/Dockerfile-AasxServerBlazor-arm64 index 107484120..bcf70ed40 100644 --- a/src/docker/Dockerfile-AasxServerBlazor-arm64 +++ b/src/docker/Dockerfile-AasxServerBlazor-arm64 @@ -2,17 +2,19 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env WORKDIR /repo/src -# Copy everything else and build +# Copy the source code and build COPY ./src/ /repo/src/ COPY ./LICENSE.TXT /repo/LICENSE.txt 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/aspnet:6.0-bullseye-slim-arm64v8 +RUN apt update && apt upgrade --yes +RUN apt install -y curl nano libgdiplus EXPOSE 5001 COPY --from=build-env /out/AasxServerBlazor/ /AasxServerBlazor/ COPY ./content-for-demo/ /AasxServerBlazor/ WORKDIR /AasxServerBlazor +RUN chmod +x ./startForDemo.sh ENTRYPOINT ["/bin/bash", "-c", "./startForDemo.sh"]