Merge main into production: PR #55 — Fix CV keyword extraction prompt

This reverts commit 06dd0140d6.

.gitea/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build and Push Docker Images Staging
 on:
   push:
     branches:
-      - staging
+      - production
 
 env:
   GIT_HOST: git.easysoft.ro
@@ -16,7 +16,7 @@ env:
   CV_CLEANUP_JOB_IMAGE: apps/myai-cv-cleanup-job
   CV_SEARCH_JOB_IMAGE: apps/myai-cv-search-job
   PAGE_FETCHER_API_IMAGE: apps/myai-page-fetcher-api
-  IMAGE_TAG: staging
+  IMAGE_TAG: production
 
 jobs:
   build:
@@ -97,10 +97,4 @@ jobs:
 
       - name: Push Page Fetcher API image
         run: |
-          docker push "${REGISTRY_HOST}/${PAGE_FETCHER_API_IMAGE}:${IMAGE_TAG}"
+          docker push "${REGISTRY_HOST}/${PAGE_FETCHER_API_IMAGE}:${IMAGE_TAG}"
-
-      - name: Reclaim disk space
-        if: always()
-        run: |
-          docker image prune -af
-          docker builder prune -af

Directory.Packages.props

@@ -23,7 +23,6 @@
     <PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
-    <PackageVersion Include="Serilog.Formatting.Compact" Version="3.0.0" />
     <PackageVersion Include="Serilog.Sinks.Email" Version="4.2.1" />
     <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
     <!-- Swagger -->

Helpers/startup-helpers/StartupExtensions.cs

@@ -39,10 +39,11 @@ public static class StartupExtensions
                 .ReadFrom.Configuration(context.Configuration)
                 .ReadFrom.Services(services)
                 .Enrich.FromLogContext()
-                .Enrich.WithProperty("Application", serviceName)
+                .Enrich.WithMachineName()
-                .Enrich.WithProperty("Environment", context.HostingEnvironment.EnvironmentName)
+                .Enrich.WithEnvironmentName()
+                .Enrich.WithProperty("Service", serviceName)
                 .Enrich.WithProperty("AppVersion", appVersion)
-                .WriteTo.Console(new Serilog.Formatting.Compact.CompactJsonFormatter());
+                .WriteTo.Console(new Serilog.Formatting.Json.JsonFormatter());
 
             AddEmailSinkIfConfigured(configuration, context.Configuration, serviceName);
         });
@@ -56,10 +57,11 @@ public static class StartupExtensions
                 .ReadFrom.Configuration(builder.Configuration)
                 .ReadFrom.Services(services)
                 .Enrich.FromLogContext()
-                .Enrich.WithProperty("Application", serviceName)
+                .Enrich.WithMachineName()
-                .Enrich.WithProperty("Environment", builder.Environment.EnvironmentName)
+                .Enrich.WithEnvironmentName()
+                .Enrich.WithProperty("Service", serviceName)
                 .Enrich.WithProperty("AppVersion", appVersion)
-                .WriteTo.Console(new Serilog.Formatting.Compact.CompactJsonFormatter());
+                .WriteTo.Console(new Serilog.Formatting.Json.JsonFormatter());
 
             AddEmailSinkIfConfigured(configuration, builder.Configuration, serviceName);
         });

Helpers/startup-helpers/startup-helpers.csproj

@@ -17,7 +17,6 @@
     <PackageReference Include="DotNetEnv" />
     <PackageReference Include="Serilog.AspNetCore" />
     <PackageReference Include="Serilog.Enrichers.Environment" />
-    <PackageReference Include="Serilog.Formatting.Compact" />
     <PackageReference Include="Serilog.Sinks.Email" />
     <PackageReference Include="Serilog.Sinks.File" />
     <PackageReference Include="Swashbuckle.AspNetCore" />