change deploy-dev.yml

complete docker v1
Refactor FaceEmbeddingService to use configuration for API base URL and update CORS policy to read origins from configuration
2026-02-10 16:37:48 +03:30 · 2026-02-10 15:20:36 +03:30 · 2026-02-07 17:13:36 +03:30
8 changed files with 81 additions and 183 deletions
--- a/.gitea/workflows/dad-mehr-gitea-deploy.yml
+++ b/.gitea/workflows/dad-mehr-gitea-deploy.yml
@@ -1,91 +0,0 @@
-name: Build and Deploy (.NET)
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-env:
-  IMAGE_NAME: my-project
-  DEPLOY_PATH: /home/${{ secrets.SSH_USERNAME }}/deployments/my-project
-
-jobs:
-  build-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Login to Private Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ secrets.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and Push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ gitea.ref_name }}
-            ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-
-  deploy:
-    needs: build-push
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      # فقط فایل docker-compose.yml را آپدیت می‌کنیم (فایل .env روی سرور دست نمی‌خورد)
-      - name: Copy docker-compose to Server
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USERNAME }}
-          key: ${{ secrets.SSH_KEY }}
-          port: 22
-          source: "docker-compose.yml"
-          target: ${{ env.DEPLOY_PATH }}
-
-      # اجرا روی سرور
-      - name: Remote SSH Commands
-        uses: appleboy/ssh-action@v1.0.3
-        env:
-          # تعریف متغیرهایی که می‌خواهیم به سرور پاس دهیم
-          DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          APP_VERSION: ${{ gitea.ref_name }} # ورژن تگ شده
-          APP_PORT: ${{ secrets.APP_PORT }}
-          IMAGE_NAME: ${{ env.IMAGE_NAME }}
-        with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USERNAME }}
-          key: ${{ secrets.SSH_KEY }}
-          port: 22
-          # لیست متغیرهایی که باید به نشست SSH منتقل شوند
-          envs: DOCKER_REGISTRY,DOCKER_USERNAME,DOCKER_PASSWORD,APP_VERSION,APP_PORT,IMAGE_NAME
-          script: |
-            cd ${{ env.DEPLOY_PATH }}
-
-            # لاگین داکر
-            echo "$DOCKER_PASSWORD" | docker login $DOCKER_REGISTRY -u $DOCKER_USERNAME --password-stdin
-
-            # نکته مهم:
-            # الان متغیرهای APP_VERSION و ... در حافظه این Session موجود هستند.
-            # وقتی دستور docker compose اجرا شود، مقادیر ${APP_VERSION} در فایل yml
-            # را با مقادیر موجود در حافظه جایگزین می‌کند.
-            # و فایل .env موجود روی دیسک را هم برای سایر متغیرها می‌خواند.
-
-            echo "Deploying version: $APP_VERSION"
-
-            # پول کردن با استفاده از متغیرهای حافظه
-            docker compose pull
-
-            # اجرای کانتینر
-            docker compose up -d --remove-orphans
-
-            docker image prune -f
--- a/.gitea/workflows/deploy-dev.yml
+++ b/.gitea/workflows/deploy-dev.yml
@@ -0,0 +1,64 @@
+name: Deploy Dev (Branch Trigger)
+
+on:
+  push:
+    branches:
+      - Feature/general/docker
+
+env:
+  IMAGE_NAME: gozareshgir-api
+  # مسیری که فایل docker-compose.yml مخصوص تست در سرور قرار دارد
+  SERVER_PATH: ~/apps/test-dev/backend-api
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # 1. لاگین به داکر هاب/رجیستری شخصی
+      - name: Login to Docker Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ secrets.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      # 2. بیلد و پوش کردن ایمیج با تگ :dev
+      - name: Build and Push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:dev
+
+      # 3. اتصال به سرور و آپدیت سرویس
+      - name: Update Service on Test Server
+        uses: appleboy/ssh-action@v1.0.3
+        env:
+          DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          APP_VERSION: dev   # ورژن تست همیشه dev است
+        with:
+          host: ${{ secrets.SSH_HOST_TEST }}
+          username: ${{ secrets.SSH_USERNAME_TEST }}
+          key: ${{ secrets.SSH_KEY_TEST }}
+          port: 22
+          envs: DOCKER_REGISTRY,DOCKER_USERNAME,DOCKER_PASSWORD,APP_VERSION
+          script: |
+            cd ${{ env.SERVER_PATH }}
+            
+            # لاگین مجدد در سرور برای اطمینان
+            echo "$DOCKER_PASSWORD" | docker login $DOCKER_REGISTRY -u $DOCKER_USERNAME --password-stdin
+            
+            # اکسپورت کردن ورژن برای اینکه فایل داکر-کمپوز سرور آن را بشناسد
+            export APP_VERSION=$APP_VERSION
+            
+            # دانلود ایمیج جدید و آپدیت کانتینر
+            docker compose pull
+            docker compose up -d --remove-orphans
+            
+            # پاک کردن ایمیج‌های قدیمی برای پر نشدن فضای سرور
+            docker image prune -f
--- a/0_Framework/InfraStructure/FaceEmbeddingService.cs
+++ b/0_Framework/InfraStructure/FaceEmbeddingService.cs
@@ -9,6 +9,7 @@ using _0_Framework.Application;
 using _0_Framework.Application.FaceEmbedding;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Http;
+using Microsoft.Extensions.Configuration;
 using System.Threading.Tasks;

 namespace _0_Framework.Infrastructure;
@@ -24,12 +25,12 @@ public class FaceEmbeddingService : IFaceEmbeddingService
    private readonly string _apiBaseUrl;

    public FaceEmbeddingService(IHttpClientFactory httpClientFactory, ILogger<FaceEmbeddingService> logger,
-        IFaceEmbeddingNotificationService notificationService = null)
+        IConfiguration configuration, IFaceEmbeddingNotificationService notificationService = null)
    {
        _httpClientFactory = httpClientFactory;
        _logger = logger;
        _notificationService = notificationService;
-        _apiBaseUrl = "http://localhost:8000";
+        _apiBaseUrl = configuration["FaceEmbeddingApi:BaseUrl"] ?? "http://localhost:8000";
    }

    public async Task<OperationResult> GenerateEmbeddingsAsync(long employeeId, long workshopId,
--- a/CompanyManagment.App.Contracts/CompanyManagment.App.Contracts.csproj
+++ b/CompanyManagment.App.Contracts/CompanyManagment.App.Contracts.csproj
@@ -2,7 +2,7 @@

 	<PropertyGroup>
 		<TargetFramework>net10.0</TargetFramework>
-		<GenerateDocumentationFile>false</GenerateDocumentationFile>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<NuGetAudit>false</NuGetAudit>
 	</PropertyGroup>
@@ -20,4 +20,10 @@
 		<ProjectReference Include="..\AccountManagement.Application.Contracts\AccountManagement.Application.Contracts.csproj" />
 		<ProjectReference Include="..\_0_Framework\_0_Framework_b.csproj" />
 	</ItemGroup>
+
+  <Target Name="CopyDocs" AfterTargets="Build">
+    <Copy SourceFiles="$(TargetDir)CompanyManagment.App.Contracts.xml"
+          DestinationFolder="../ServiceHost\bin\$(Configuration)\net10.0\"
+          Condition="Exists('$(TargetDir)CompanyManagment.App.Contracts.xml')" />
+  </Target>
 </Project>
--- a/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
+++ b/CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
@@ -79,13 +79,12 @@ public interface IInstitutionContractApplication
    /// <returns>لیست قراردادها برای چاپ</returns>
    List<InstitutionContractViewModel> PrintAll(List<long> id);

-
-    [Obsolete("استفاده نشود، از متد غیرهمزمان استفاده شود")]
    /// <summary>
    /// چاپ یک قرارداد
    /// </summary>
    /// <param name="id">شناسه قرارداد</param>
    /// <returns>اطلاعات قرارداد برای چاپ</returns>
+    [Obsolete("استفاده نشود، از متد غیرهمزمان استفاده شود")]
    InstitutionContractViewModel PrintOne(long id);

    /// <summary>
--- a/ServiceHost/Dockerfile
+++ b/ServiceHost/Dockerfile
@@ -1,78 +0,0 @@
-
-# Multi-stage build for ASP.NET Core 10
-FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
-
-WORKDIR /src.
-
-# Copy solution and project files
-COPY ["DadmehrGostar.sln", "DadmehrGostar.sln"]
-COPY ["ServiceHost/ServiceHost.csproj", "ServiceHost/"]
-COPY ["0_Framework/0_Framework.csproj", "0_Framework/"]
-COPY ["_0_Framework/_0_Framework_b.csproj", "_0_Framework/"]
-COPY ["AccountManagement.Application/AccountManagement.Application.csproj", "AccountManagement.Application/"]
-COPY ["AccountManagement.Application.Contracts/AccountManagement.Application.Contracts.csproj", "AccountManagement.Application.Contracts/"]
-COPY ["AccountManagement.Configuration/AccountManagement.Configuration.csproj", "AccountManagement.Configuration/"]
-COPY ["AccountManagement.Domain/AccountManagement.Domain.csproj", "AccountManagement.Domain/"]
-COPY ["AccountMangement.Infrastructure.EFCore/AccountMangement.Infrastructure.EFCore.csproj", "AccountMangement.Infrastructure.EFCore/"]
-COPY ["BackgroundInstitutionContract/BackgroundInstitutionContract.Task/BackgroundInstitutionContract.Task.csproj", "BackgroundInstitutionContract/BackgroundInstitutionContract.Task/"]
-COPY ["Company.Domain/Company.Domain.csproj", "Company.Domain/"]
-COPY ["CompanyManagement.Infrastructure.Excel/CompanyManagement.Infrastructure.Excel.csproj", "CompanyManagement.Infrastructure.Excel/"]
-COPY ["CompanyManagement.Infrastructure.Mongo/CompanyManagement.Infrastructure.Mongo.csproj", "CompanyManagement.Infrastructure.Mongo/"]
-COPY ["CompanyManagment.App.Contracts/CompanyManagment.App.Contracts.csproj", "CompanyManagment.App.Contracts/"]
-COPY ["CompanyManagment.Application/CompanyManagment.Application.csproj", "CompanyManagment.Application/"]
-COPY ["CompanyManagment.EFCore/CompanyManagment.EFCore.csproj", "CompanyManagment.EFCore/"]
-COPY ["PersonalContractingParty.Config/PersonalContractingParty.Config.csproj", "PersonalContractingParty.Config/"]
-COPY ["ProgramManager/src/Application/GozareshgirProgramManager.Application/GozareshgirProgramManager.Application.csproj", "ProgramManager/src/Application/GozareshgirProgramManager.Application/"]
-COPY ["ProgramManager/src/Domain/GozareshgirProgramManager.Domain/GozareshgirProgramManager.Domain.csproj", "ProgramManager/src/Domain/GozareshgirProgramManager.Domain/"]
-COPY ["ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/GozareshgirProgramManager.Infrastructure.csproj", "ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/"]
-COPY ["Query/Query.csproj", "Query/"]
-COPY ["Query.Bootstrapper/Query.Bootstrapper.csproj", "Query.Bootstrapper/"]
-COPY ["Shared.Contracts/Shared.Contracts.csproj", "Shared.Contracts/"]
-COPY ["WorkFlow/Application/WorkFlow.Application/WorkFlow.Application.csproj", "WorkFlow/Application/WorkFlow.Application/"]
-COPY ["WorkFlow/Application/WorkFlow.Application.Contracts/WorkFlow.Application.Contracts.csproj", "WorkFlow/Application/WorkFlow.Application.Contracts/"]
-COPY ["WorkFlow/Domain/WorkFlow.Domain/WorkFlow.Domain.csproj", "WorkFlow/Domain/WorkFlow.Domain/"]
-COPY ["WorkFlow/Infrastructure/WorkFlow.Infrastructure.ACL/WorkFlow.Infrastructure.ACL.csproj", "WorkFlow/Infrastructure/WorkFlow.Infrastructure.ACL/"]
-COPY ["WorkFlow/Infrastructure/WorkFlow.Infrastructure.Config/WorkFlow.Infrastructure.Config.csproj", "WorkFlow/Infrastructure/WorkFlow.Infrastructure.Config/"]
-COPY ["WorkFlow/Infrastructure/WorkFlow.Infrastructure.EfCore/WorkFlow.Infrastructure.EfCore.csproj", "WorkFlow/Infrastructure/WorkFlow.Infrastructure.EfCore/"]
-
-# Restore all projects
-RUN dotnet restore "DadmehrGostar.sln"
-
-# Copy source code
-COPY . .
-
-# Build the ServiceHost project
-WORKDIR /src/ServiceHost
-RUN dotnet build "ServiceHost.csproj" -c Release -o /app/build
-
-# Publish stage
-FROM build AS publish
-RUN dotnet publish "ServiceHost.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-# Runtime stage
-FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS final
-
-WORKDIR /app
-
-# Install curl for health checks
-#RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
-
-# Copy published app
-COPY --from=publish /app/publish .
-
-# Create directories for certificates, storage, faces, and logs
-# Note: Bind-mounted directories will override these, but we create them for consistency
-RUN mkdir -p /app/certs /app/Faces /app/Storage /app/Logs app/InsuranceList && \
-    chmod 777 /app/Faces /app/Storage /app/Logs app/InsuranceList && \
-    chmod 755 /app/certs
-
-# Expose ports
-EXPOSE 80 443
-
-# Health check - check both HTTP and HTTPS
-#HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
-#    CMD curl -f http://localhost:80/health || curl -f -k https://localhost:443/health || exit 1
-
-# Set entry point
-ENTRYPOINT ["dotnet", "ServiceHost.dll"]
-
--- a/ServiceHost/Program.cs
+++ b/ServiceHost/Program.cs
@@ -48,7 +48,7 @@ using Microsoft.OpenApi; // Corrected using for PhysicalFileProvider

 // Use Docker-compatible log path
 var logDirectory = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == Environments.Development
-    ? @"C:\Logs\Gozareshgir\"
+    ? @"C:\LogsGozareshgir\\"
    : "/app/Logs";

 if (!Directory.Exists(logDirectory))
@@ -230,15 +230,10 @@ try
    #region CORS
    builder.Services.AddCors(options =>
    {
+        var corsOrigins = builder.Configuration.GetSection("CorsOrigins").Get<string[]>() ?? Array.Empty<string>();
        options.AddPolicy("AllowSpecificOrigins", policy =>
        {
-            policy.WithOrigins(
-                    "http://localhost:3000", "http://localhost:4000", "http://localhost:4001",
-                    "http://localhost:4002", "http://localhost:3001", "https://gozareshgir.ir",
-                    "https://dad-mehr.ir", "https://admin.dad-mehr.ir", "https://client.dad-mehr.ir",
-                    "https://admin.gozareshgir.ir", "https://client.gozareshgir.ir",
-                    "https://admin.dadmehrg.ir", "https://client.dadmehrg.ir", "http://localhost:3300"
-                )
+            policy.WithOrigins(corsOrigins)
                .AllowAnyHeader()
                .AllowAnyMethod()
                .AllowCredentials();
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,9 @@ services:
    build:
      context: .
      dockerfile: Dockerfile
-    container_name: gozareshgir-servicehost
+      network: host
+    container_name: gozareshgir-api
+    image: gozareshgir-api
    # ✅ Run as root to ensure write permissions to bind mounts
    user: "0:0"
    # ✅ All environment variables are now in ServiceHost/.env
Author	SHA1	Message	Date
mahan	5a244ed35e	change deploy-dev.yml Some checks failed Deploy Dev (Branch Trigger) / build-and-deploy (push) Failing after 3m50s Details	2026-02-10 16:37:48 +03:30
mahan	42008d3c4d	complete docker v1	2026-02-10 15:20:36 +03:30
mahan	387682aedb	Refactor FaceEmbeddingService to use configuration for API base URL and update CORS policy to read origins from configuration	2026-02-07 17:13:36 +03:30