diff --git a/.dockerignore b/.dockerignore index fe1152bdb..c7b159318 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,7 @@ **/.classpath **/.dockerignore **/.env -**/.git +# **/.git **/.gitignore **/.project **/.settings diff --git a/Tools/GbxExplorer/Server/Dockerfile b/Tools/GbxExplorer/Server/Dockerfile index 4725b87ae..6f66e676e 100644 --- a/Tools/GbxExplorer/Server/Dockerfile +++ b/Tools/GbxExplorer/Server/Dockerfile @@ -10,6 +10,8 @@ COPY Tools/GbxExplorer/Component/*.csproj Tools/GbxExplorer/Component/ COPY Tools/GbxExplorer/Shared/*.csproj Tools/GbxExplorer/Shared/ COPY Src/GBX.NET/*.csproj Src/GBX.NET/ COPY Src/GBX.NET.LZO/*.csproj Src/GBX.NET.LZO/ +COPY Src/GBX.NET.Hashing/*.csproj Src/GBX.NET.Hashing/ +COPY Src/GBX.NET.ZLib/*.csproj Src/GBX.NET.ZLib/ COPY Src/GBX.NET.Lua/*.csproj Src/GBX.NET.Lua/ COPY Generators/GBX.NET.Generators/*.csproj Generators/GBX.NET.Generators/ RUN dotnet restore Tools/GbxExplorer/Server/GbxExplorer.Server.csproj -a $TARGETARCH @@ -21,6 +23,8 @@ COPY Tools/GbxExplorer/Component/ Tools/GbxExplorer/Component/ COPY Tools/GbxExplorer/Shared/ Tools/GbxExplorer/Shared/ COPY Src/GBX.NET/ Src/GBX.NET/ COPY Src/GBX.NET.LZO/ Src/GBX.NET.LZO/ +COPY Src/GBX.NET.Hashing/ Src/GBX.NET.Hashing/ +COPY Src/GBX.NET.ZLib/ Src/GBX.NET.ZLib/ COPY Src/GBX.NET.Lua/ Src/GBX.NET.Lua/ COPY Generators/GBX.NET.Generators/ Generators/GBX.NET.Generators/ COPY Resources/ Resources/ diff --git a/Tools/GbxExplorerOld/Server/Dockerfile b/Tools/GbxExplorerOld/Server/Dockerfile new file mode 100644 index 000000000..6ed7f7794 --- /dev/null +++ b/Tools/GbxExplorerOld/Server/Dockerfile @@ -0,0 +1,40 @@ +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build +ARG BUILD_CONFIGURATION=Release +ARG TARGETARCH=x64 +RUN apk add --no-cache git +WORKDIR /src + +COPY .git/ ./.git/ + +# RUN dotnet workload install wasm-tools + +# copy csproj and restore as distinct layers +COPY Tools/GbxExplorerOld/Server/*.csproj Tools/GbxExplorerOld/Server/ +COPY Tools/GbxExplorerOld/Client/*.csproj Tools/GbxExplorerOld/Client/ +COPY Src/GBX.NET/*.csproj Src/GBX.NET/ +COPY Src/GBX.NET.LZO/*.csproj Src/GBX.NET.LZO/ +COPY Src/GBX.NET.Hashing/*.csproj Src/GBX.NET.Hashing/ +COPY Src/GBX.NET.ZLib/*.csproj Src/GBX.NET.ZLib/ +COPY Generators/GBX.NET.Generators/*.csproj Generators/GBX.NET.Generators/ +RUN dotnet restore Tools/GbxExplorerOld/Server/GbxExplorerOld.Server.csproj -a $TARGETARCH + +# copy and publish app and libraries +COPY Tools/GbxExplorerOld/Server/ Tools/GbxExplorerOld/Server/ +COPY Tools/GbxExplorerOld/Client/ Tools/GbxExplorerOld/Client/ +COPY Src/GBX.NET/ Src/GBX.NET/ +COPY Src/GBX.NET.LZO/ Src/GBX.NET.LZO/ +COPY Src/GBX.NET.Hashing/ Src/GBX.NET.Hashing/ +COPY Src/GBX.NET.ZLib/ Src/GBX.NET.ZLib/ +COPY Generators/GBX.NET.Generators/ Generators/GBX.NET.Generators/ +COPY Resources/ Resources/ +RUN dotnet publish Tools/GbxExplorerOld/Server -c $BUILD_CONFIGURATION -a $TARGETARCH -o /app --no-restore + + +# final stage/image +FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine +EXPOSE 8080 +EXPOSE 8081 +WORKDIR /app +COPY --from=build /app . +USER $APP_UID +ENTRYPOINT ["./GbxExplorerOld.Server"] \ No newline at end of file diff --git a/Tools/GbxExplorerOld/Server/GbxExplorerOld.Server.csproj b/Tools/GbxExplorerOld/Server/GbxExplorerOld.Server.csproj index e8741fe96..9e5484587 100644 --- a/Tools/GbxExplorerOld/Server/GbxExplorerOld.Server.csproj +++ b/Tools/GbxExplorerOld/Server/GbxExplorerOld.Server.csproj @@ -7,8 +7,6 @@ 14bef366-38a3-418f-93d8-e19bd6a41e2a Linux ..\..\.. - true - true true