diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index 69c986e..52c4cae 100644 --- a/.gitea/workflows/docker.yml +++ b/.gitea/workflows/docker.yml @@ -50,7 +50,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - dockerfile: src/Dockerfile + file: src/Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/src/Dockerfile b/src/Dockerfile index c3679c9..ed2a5ef 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -7,17 +7,17 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src -COPY ["fengling-console/src/Fengling.Console.csproj", "fengling-console/"] -COPY ["fengling-gateway/src/YarpGateway.csproj", "fengling-gateway/"] -COPY ["fengling-platform/Fengling.Platform.Infrastructure/Fengling.Platform.Infrastructure.csproj", "fengling-platform/Fengling.Platform.Infrastructure/"] -COPY ["fengling-platform/Fengling.Platform.Domain/Fengling.Platform.Domain.csproj", "fengling-platform/Fengling.Platform.Domain/"] -COPY ["fengling-service-discovery/Fengling.ServiceDiscovery.Core/Fengling.ServiceDiscovery.Core.csproj", "fengling-service-discovery/Fengling.ServiceDiscovery.Core/"] -COPY ["fengling-service-discovery/Fengling.ServiceDiscovery.Kubernetes/Fengling.ServiceDiscovery.Kubernetes.csproj", "fengling-service-discovery/Fengling.ServiceDiscovery.Kubernetes/"] -COPY ["fengling-service-discovery/Fengling.ServiceDiscovery.Static/Fengling.ServiceDiscovery.Static.csproj", "fengling-service-discovery/Fengling.ServiceDiscovery.Static/"] +# Copy Directory.Build.props and Directory.Packages.props for central package management +COPY ["Directory.Build.props", "./"] +COPY ["Directory.Packages.props", "./"] -RUN dotnet restore "fengling-console/Fengling.Console.csproj" +# Copy project file and restore dependencies +COPY ["src/Fengling.Console.csproj", "src/"] +RUN dotnet restore "src/Fengling.Console.csproj" + +# Copy source code and build COPY . . -WORKDIR "/src/fengling-console" +WORKDIR "/src/src" RUN dotnet build "./Fengling.Console.csproj" -c $BUILD_CONFIGURATION -o /app/build FROM build AS publish @@ -26,4 +26,4 @@ RUN dotnet publish "./Fengling.Console.csproj" -c $BUILD_CONFIGURATION -o /app/p FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "Fengling.Console.dll"] +ENTRYPOINT ["dotnet", "Fengling.Console.dll"] \ No newline at end of file