Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

all images now include curl and nano #266

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/docker/Dockerfile-AasxServerAspNetCore
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
6 changes: 4 additions & 2 deletions src/docker/Dockerfile-AasxServerAspNetCore-arm32
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

5 changes: 3 additions & 2 deletions src/docker/Dockerfile-AasxServerAspNetCore-arm64
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 3 additions & 1 deletion src/docker/Dockerfile-AasxServerBlazor
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
7 changes: 4 additions & 3 deletions src/docker/Dockerfile-AasxServerBlazor-arm32
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
6 changes: 4 additions & 2 deletions src/docker/Dockerfile-AasxServerBlazor-arm64
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Loading