diff --git a/.dockerignore b/.dockerignore index 62da793..606a323 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,3 +6,4 @@ Dockerfile .dockerignore docker-build.sh .vs/ +.idea/ diff --git a/Dockerfile b/Dockerfile index 305b3d8..9e29bc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,11 @@ FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-preview AS build ARG TARGETARCH WORKDIR /build COPY Pal.Common/Pal.Common.csproj Pal.Common/ -COPY Pal.Server/Pal.Server.csproj Pal.Server/ -RUN dotnet restore Pal.Server/Pal.Server.csproj -a $TARGETARCH +COPY Server/Server/Pal.Server.csproj Pal.Server/ +RUN dotnet restore Server/Server/Pal.Server.csproj -a $TARGETARCH COPY . ./ -RUN dotnet publish Pal.Server/Pal.Server.csproj -a $TARGETARCH --no-restore -o /dist +RUN dotnet publish Server/Server/Pal.Server.csproj -a $TARGETARCH --no-restore -o /dist FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview @@ -27,4 +27,4 @@ WORKDIR /app COPY --from=build-env /dist . USER pal -ENTRYPOINT ["dotnet", "Pal.Server.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "Pal.Server.dll"] diff --git a/docker-build.sh b/docker-build.sh index e87a397..caf1cce 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -1,3 +1,4 @@ git fetch origin master git reset --hard origin/master +git submodule update --checkout docker buildx build -t palacepal-server --platform linux/amd64,linux/arm64 .