From f790f3869655331f1040f9918ae5389ef4481e98 Mon Sep 17 00:00:00 2001 From: motahhari Date: Wed, 3 Jun 2026 23:41:55 +0330 Subject: [PATCH] fix deploy config --- backend/Dockerfile | 8 +++++--- backend/backend.csproj | 2 +- backend/nuget.config | 8 ++++++++ docker-compose.yml | 39 ++++++--------------------------------- 4 files changed, 20 insertions(+), 37 deletions(-) create mode 100644 backend/nuget.config diff --git a/backend/Dockerfile b/backend/Dockerfile index be7de59..372c9f9 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -7,9 +7,11 @@ COPY ClientApp/ . RUN npm run build # Stage 2: Build the backend -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS backend-build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS backend-build WORKDIR /src -COPY ["backend.csproj", "."] +COPY nuget.config ./ +COPY backend.csproj ./ +RUN dotnet nuget list source RUN dotnet restore COPY . . # Copy the frontend build output from the previous stage @@ -17,7 +19,7 @@ COPY --from=frontend-build /app/dist ./ClientApp/dist RUN dotnet publish -c Release -o /app/publish # Stage 3: Runtime -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime WORKDIR /app EXPOSE 8080 ENV ASPNETCORE_URLS=http://+:8080 diff --git a/backend/backend.csproj b/backend/backend.csproj index c6d494e..8e895a7 100644 --- a/backend/backend.csproj +++ b/backend/backend.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable ClientApp\ diff --git a/backend/nuget.config b/backend/nuget.config new file mode 100644 index 0000000..1b55218 --- /dev/null +++ b/backend/nuget.config @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/docker-compose.yml b/docker-compose.yml index 1c2b11c..95954ef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,27 +1,7 @@ version: "3.8" services: - sqlserver: - image: mcr.microsoft.com/mssql/server:2022-latest - container_name: ghadir-db - environment: - - ACCEPT_EULA=Y - - SA_PASSWORD=Ghadir@1403 - - MSSQL_PID=Express - ports: - - "1433:1433" - volumes: - - sqlserver-data:/var/opt/mssql - networks: - - ghadir-network - healthcheck: - test: /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P "Ghadir@1403" -C -Q "SELECT 1" || exit 1 - interval: 10s - timeout: 5s - retries: 10 - start_period: 30s - - backend: + ghadir_back: build: context: ./backend dockerfile: Dockerfile @@ -29,19 +9,12 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://+:8080 - - ConnectionStrings__DefaultConnection=Server=sqlserver;Database=GhadirContestDB;User Id=sa;Password=Ghadir@1403;TrustServerCertificate=True - ports: - - "5000:8080" - depends_on: - sqlserver: - condition: service_healthy + - ConnectionStrings__DefaultConnection=Server=sqlserver,1433;TrustServerCertificate=True;Database=GhadirDb;User Id=sa;Password=qwER12#$110; networks: - - ghadir-network + - services restart: unless-stopped -networks: - ghadir-network: - driver: bridge -volumes: - sqlserver-data: +networks: + services: + external: true