From 3fbb5c6ee1d23e5ca19c0e41debf28bb32bf7819 Mon Sep 17 00:00:00 2001 From: masoud Date: Sat, 6 Dec 2025 15:06:18 +0000 Subject: [PATCH] Move Dockerfile & NuGet.config to WebApi directory, update workflow --- .gitea/workflows/kub-deploy.yml | 1 + Dockerfile | 26 ------------- src/BackOffice.BFF.WebApi/Dockerfile | 37 +++++++++++++++++++ .../BackOffice.BFF.WebApi/NuGet.config | 0 4 files changed, 38 insertions(+), 26 deletions(-) delete mode 100644 Dockerfile create mode 100644 src/BackOffice.BFF.WebApi/Dockerfile rename NuGet.config => src/BackOffice.BFF.WebApi/NuGet.config (100%) diff --git a/.gitea/workflows/kub-deploy.yml b/.gitea/workflows/kub-deploy.yml index 20fdd33..5900d67 100644 --- a/.gitea/workflows/kub-deploy.yml +++ b/.gitea/workflows/kub-deploy.yml @@ -55,6 +55,7 @@ jobs: - name: Build Docker Image run: | + cd src/BackOffice.BFF.WebApi docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \ -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \ --build-arg HTTP_PROXY=http://proxyuser:87zH26nbqT2@46.249.98.211:3128 \ diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index a532dd0..0000000 --- a/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build - -ARG HTTP_PROXY -ARG HTTPS_PROXY - -ENV HTTP_PROXY=${HTTP_PROXY} -ENV HTTPS_PROXY=${HTTPS_PROXY} -ENV http_proxy=${HTTP_PROXY} -ENV https_proxy=${HTTPS_PROXY} - -WORKDIR /src - -COPY src/ ./ -COPY NuGet.config ./ - -RUN dotnet restore "BackOffice.BFF.WebApi/BackOffice.BFF.WebApi.csproj" -RUN dotnet publish "BackOffice.BFF.WebApi/BackOffice.BFF.WebApi.csproj" -c Release -o /app/publish --no-restore - -FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime -WORKDIR /app -COPY --from=build /app/publish . - -ENV ASPNETCORE_URLS=http://+:8080 -EXPOSE 8080 - -ENTRYPOINT ["dotnet", "BackOffice.BFF.WebApi.dll"] diff --git a/src/BackOffice.BFF.WebApi/Dockerfile b/src/BackOffice.BFF.WebApi/Dockerfile new file mode 100644 index 0000000..b40a035 --- /dev/null +++ b/src/BackOffice.BFF.WebApi/Dockerfile @@ -0,0 +1,37 @@ +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build +WORKDIR /src + +# Copy NuGet config +COPY NuGet.config ./ + +# Copy solution file +COPY ../BackOffice.BFF.sln ./ + +# Copy all project files +COPY BackOffice.BFF.WebApi.csproj ./BackOffice.BFF.WebApi/ +COPY ../BackOffice.BFF.Application/*.csproj ./BackOffice.BFF.Application/ +COPY ../BackOffice.BFF.Infrastructure/*.csproj ./BackOffice.BFF.Infrastructure/ +COPY ../BackOffice.BFF.Domain/*.csproj ./BackOffice.BFF.Domain/ +COPY ../Protobufs/*/*.csproj ./Protobufs/ + +# Restore with NuGet.config +RUN dotnet restore "BackOffice.BFF.WebApi/BackOffice.BFF.WebApi.csproj" --configfile NuGet.config + +# Copy all source code +COPY . ./BackOffice.BFF.WebApi/ +COPY ../BackOffice.BFF.Application/ ./BackOffice.BFF.Application/ +COPY ../BackOffice.BFF.Infrastructure/ ./BackOffice.BFF.Infrastructure/ +COPY ../BackOffice.BFF.Domain/ ./BackOffice.BFF.Domain/ +COPY ../Protobufs/ ./Protobufs/ + +# Build and publish +RUN dotnet publish "BackOffice.BFF.WebApi/BackOffice.BFF.WebApi.csproj" -c Release -o /app/publish --no-restore + +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime +WORKDIR /app +COPY --from=build /app/publish . + +ENV ASPNETCORE_URLS=http://+:8080 +EXPOSE 8080 + +ENTRYPOINT ["dotnet", "BackOffice.BFF.WebApi.dll"] diff --git a/NuGet.config b/src/BackOffice.BFF.WebApi/NuGet.config similarity index 100% rename from NuGet.config rename to src/BackOffice.BFF.WebApi/NuGet.config