Update Docker, health checks, and service configurations

Updated solution to include Docker files and local env file. Replaced `application-docker-compose.yml` with `docker-compose.override.yml` and `docker-compose.yml`. Modified `appsettings.json` for new endpoints, Consul, Fabio, logging, metrics, MongoDB, RabbitMQ, and other services. Updated health check endpoints in `Extensions.cs`. Upgraded Dockerfiles to .NET 9.0. Removed versioning and service definitions for API gateway in Docker Compose files. Changed service ports in `docker-compose.yml`. Updated project files to reference new projects and packages. Configured Consul and Fabio in `Program.cs`. Extensively modified `appsettings.json` for orders and identity services. Updated `.dockerignore` to include various patterns.

Author: giovanninocco

genocs.sln

@@ -120,9 +120,11 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{B184733D-2415-4517-BC65-26ED22EEB2C2}"
 	ProjectSection(SolutionItems) = preProject
 		src\apps\apigateway.dockerfile = src\apps\apigateway.dockerfile
-		src\apps\application-docker-compose.yml = src\apps\application-docker-compose.yml
+		src\apps\docker-compose.override.yml = src\apps\docker-compose.override.yml
+		src\apps\docker-compose.yml = src\apps\docker-compose.yml
 		src\apps\identity-webapi.dockerfile = src\apps\identity-webapi.dockerfile
 		src\apps\order-webapi.dockerfile = src\apps\order-webapi.dockerfile
+		src\apps\local.env = src\apps\local.env
 		src\apps\product-webapi.dockerfile = src\apps\product-webapi.dockerfile
 		src\apps\signalr-webapi.dockerfile = src\apps\signalr-webapi.dockerfile
 	EndProjectSection

src/Genocs.Core.Demo.Worker/appsettings.json

@@ -46,7 +46,7 @@
     "address": "docker.for.mac.localhost",
     "port": "5070",
     "pingEnabled": true,
-    "pingEndpoint": "alive",
+    "pingEndpoint": "healthz",
     "pingInterval": 3,
     "removeAfterInterval": 3
   },

src/Genocs.Core/Builders/Extensions.cs

@@ -136,6 +136,15 @@ public static WebApplication MapDefaultEndpoints(this WebApplication app)
             return app;
         }
 
+        // All health checks must pass for app to be considered ready to accept traffic after starting
+        app.MapHealthChecks("/healthz");
+
+        // Only health checks tagged with the "live" tag must pass for app to be considered alive
+        app.MapHealthChecks("/alive", new HealthCheckOptions
+        {
+            Predicate = r => r.Tags.Contains("live")
+        });
+
         app.MapGet("/", async context =>
         {
             // Get the Entry Assembly Name and Version
@@ -146,16 +155,6 @@ public static WebApplication MapDefaultEndpoints(this WebApplication app)
 
             await context.Response.WriteAsync(context.RequestServices.GetService<AppOptions>()?.Name ?? message);
         });
-
-        // All health checks must pass for app to be considered ready to accept traffic after starting
-        app.MapHealthChecks("/health");
-
-        // Only health checks tagged with the "live" tag must pass for app to be considered alive
-        app.MapHealthChecks("/alive", new HealthCheckOptions
-        {
-            Predicate = r => r.Tags.Contains("live")
-        });
-
         return app;
     }
 
@@ -165,15 +164,6 @@ private static void Setup(IGenocsBuilder builder)
         AppOptions settings = builder.GetOptions<AppOptions>(AppOptions.Position);
         builder.Services.AddSingleton(settings);
 
-        // Add the health checks
-        builder.Services
-            .AddHealthChecks()
-            .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]); // Add a default liveness check to ensure app is responsive
-
-        builder.Services.AddMemoryCache();
-
-        builder.Services.AddSingleton<IServiceId, ServiceId>();
-
         if (!settings.DisplayBanner || string.IsNullOrWhiteSpace(settings.Name))
         {
             return;
@@ -185,5 +175,15 @@ private static void Setup(IGenocsBuilder builder)
         Console.ForegroundColor = ConsoleColor.Blue;
         Console.WriteLine("Runtime Version: {0}", Environment.Version.ToString());
         Console.ForegroundColor = current;
+
+        // Add the health checks
+        builder.Services
+            .AddHealthChecks();
+
+        //            .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]); // Add a default liveness check to ensure app is responsive
+
+        builder.Services.AddMemoryCache();
+
+        builder.Services.AddSingleton<IServiceId, ServiceId>();
     }
 }

src/apps/.dockerignore

@@ -0,0 +1,26 @@
+**/[Oo]bj
+**/[Bb]in
+**/[Ll]ogs
+TestResults/
+.nuget/
+_ReSharper.*/
+packages/
+artifacts/
+PublishProfiles/
+*.user
+*.suo
+*.cache
+*.docstates
+_ReSharper.*
+nuget.exe
+*net45.csproj
+*k10.csproj
+*.psess
+*.vsp
+*.pidb
+*.userprefs
+*DS_Store
+*.ncrunchsolution
+*.*sdf
+*.ipch
+.vs/

src/apps/apigateway.dockerfile

@@ -1,11 +1,11 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env
 WORKDIR /src
 
 COPY ["api-gateway/Genocs.APIGateway", "Genocs.APIGateway/"]

src/apps/docker-compose.override.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   api-gateway:
     build:

src/apps/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   api-gateway:
     image: genocs/apigateway:${IMAGE_VERSION}
@@ -22,7 +20,7 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Docker
     ports:
-      - 5501:80
+      - 5500:80
     networks:
       - genocs
     # network_mode: bridge
@@ -36,7 +34,7 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Docker
     ports:
-      - 5502:80
+      - 5510:80
     #ports:
     networks:
       - genocs
@@ -51,7 +49,7 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Docker
     ports:
-      - 5503:80
+      - 5530:80
     #ports:
     networks:
       - genocs
@@ -66,7 +64,7 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Docker
     ports:
-      - 5504:80
+      - 5540:80
     #ports:
     networks:
       - genocs

src/apps/identity-webapi.dockerfile

@@ -1,11 +1,11 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env
 WORKDIR /src
 COPY ["identity/Genocs.Identities.WebApi", "Genocs.Identities.WebApi/"]
 COPY ["identity/Genocs.Identities.Application", "Genocs.Identities.Application/"]

src/apps/identity/Genocs.Identities.Application/Genocs.Identities.Application.csproj

@@ -8,6 +8,7 @@
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">
         <ProjectReference Include="..\..\..\Genocs.Auth\Genocs.Auth.csproj" />
+        <ProjectReference Include="..\..\..\Genocs.LoadBalancing.Fabio\Genocs.LoadBalancing.Fabio.csproj" />
         <ProjectReference Include="..\..\..\Genocs.Persistence.Redis\Genocs.Persistence.Redis.csproj" />
         <ProjectReference Include="..\..\..\Genocs.HTTP\Genocs.HTTP.csproj" />
         <ProjectReference Include="..\..\..\Genocs.MessageBrokers.Outbox.MongoDB\Genocs.MessageBrokers.Outbox.MongoDB.csproj" />
@@ -21,6 +22,7 @@
 
     <ItemGroup Condition="'$(Configuration)' == 'Release'">
         <PackageReference Include="Genocs.Auth" Version="7.0.0" />
+        <PackageReference Include="Genocs.LoadBalancing.Fabio" Version="7.0.0" />
         <PackageReference Include="Genocs.Persistence.Redis" Version="7.0.0" />
         <PackageReference Include="Genocs.HTTP" Version="7.0.0" />
         <PackageReference Include="Genocs.MessageBrokers.Outbox.MongoDB" Version="7.0.0" />

src/apps/identity/Genocs.Identities.WebApi/Genocs.Identities.WebApi.csproj

@@ -10,6 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\..\..\Genocs.Discovery.Consul\Genocs.Discovery.Consul.csproj" />
         <ProjectReference Include="..\Genocs.Identities.Application\Genocs.Identities.Application.csproj" />
     </ItemGroup>