A bit more foreward. good luck!

johnsimons · johnsimons · commit 32154f53b79a · 2025-01-23T18:26:30.000+10:00
diff --git a/src/Billing/Dockerfile b/src/Billing/Dockerfile
@@ -4,12 +4,12 @@ ARG TARGETARCH
 WORKDIR /src
 
 COPY . .
-RUN dotnet publish src/Billing -c $BUILD_CONFIGURATION -o /app/publish --arch $TARGETARCH /p:UseAppHost=false
+RUN dotnet publish Billing -c $BUILD_CONFIGURATION -o /app/publish --arch $TARGETARCH /p:UseAppHost=false
 
 
-FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 USER $APP_UID
 WORKDIR /app
-
+EXPOSE 80
 COPY --from=build /app/publish .
 ENTRYPOINT ["dotnet", "Billing.dll"]
diff --git a/src/Billing/Program.cs b/src/Billing/Program.cs
@@ -31,10 +31,10 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                     services.AddSignalR(options => { options.EnableDetailedErrors = true; });
                     services.AddSingleton<SimulationEffects>();
                 });
-                webBuilder.UseUrls("http://*:5002");
+                webBuilder.UseUrls($"http://*:{Environment.GetEnvironmentVariable("LISTENING_PORT") ?? "5002"}");
                 webBuilder.Configure(app =>
                 {
-                    app.UseCors(options => options.AllowAnyHeader().AllowAnyMethod().WithOrigins("http://localhost:61335").AllowCredentials());
+                    app.UseCors(options => options.AllowAnyHeader().AllowAnyMethod().WithOrigins(Environment.GetEnvironmentVariable("ORIGIN_URL") ?? "http://localhost:61335").AllowCredentials());
                     app.UseRouting();
                     app.UseEndpoints(endpoints =>
                     {
diff --git a/src/ClientUI/Dockerfile b/src/ClientUI/Dockerfile
@@ -4,12 +4,12 @@ ARG TARGETARCH
 WORKDIR /src
 
 COPY . .
-RUN dotnet publish src/ClientUI -c $BUILD_CONFIGURATION -o /app/publish --arch $TARGETARCH /p:UseAppHost=false
+RUN dotnet publish ClientUI -c $BUILD_CONFIGURATION -o /app/publish --arch $TARGETARCH /p:UseAppHost=false
 
 
-FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 USER $APP_UID
 WORKDIR /app
-
+EXPOSE 80
 COPY --from=build /app/publish .
 ENTRYPOINT ["dotnet", "ClientUI.dll"]
diff --git a/src/ClientUI/Program.cs b/src/ClientUI/Program.cs
@@ -31,10 +31,10 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                     services.AddSignalR(options => { options.EnableDetailedErrors = true; });
                     services.AddSingleton<SimulatedCustomers>();
                 });
-                webBuilder.UseUrls("http://*:5000");
+                webBuilder.UseUrls($"http://*:{Environment.GetEnvironmentVariable("LISTENING_PORT") ?? "5000"}");
                 webBuilder.Configure(app =>
                 {
-                    app.UseCors(options => options.AllowAnyHeader().AllowAnyMethod().WithOrigins("http://localhost:61335").AllowCredentials());
+                    app.UseCors(options => options.AllowAnyHeader().AllowAnyMethod().WithOrigins(Environment.GetEnvironmentVariable("ORIGIN_URL") ?? "http://localhost:61335").AllowCredentials());
                     app.UseRouting();
                     app.UseEndpoints(endpoints =>
                     {
diff --git a/src/Helper/BusRegistrationConfiguratorExt.cs b/src/Helper/BusRegistrationConfiguratorExt.cs
@@ -1,60 +1,50 @@
 ﻿using dotenv.net;
-using Helper;
 using MassTransit;
 
 public static class BusRegistrationConfiguratorExt
 {
     public static void SetupTransport(this IBusRegistrationConfigurator x, string[] args)
     {
-        string selectedTransport;
+        string selectedTransport = Environment.GetEnvironmentVariable("TRANSPORT_TYPE") ?? "RabbitMQ";
 
-        if (args.Contains("--amazonsqs"))
+        switch (selectedTransport)
         {
-            x.UsingAmazonSqs((ctx, cfg) =>
-            {
-                var envs = DotEnv.Read(new DotEnvOptions(envFilePaths: [Path.GetFullPath("../../../sqs.env")]));
-                cfg.Host(envs["AWS_REGION"], h =>
+            case "AmazonSQS":
+                x.UsingAmazonSqs((ctx, cfg) =>
                 {
-                    h.AccessKey(envs["AWS_ACCESS_KEY_ID"]);
-                    h.SecretKey(envs["AWS_SECRET_ACCESS_KEY"]);
-                });
-
-                cfg.ConfigureEndpoints(ctx);
-            });
-            selectedTransport = "AmazonSQS";
-        }
-        else if (args.Contains("--azureservicebus"))
-        {
-            var envs = DotEnv.Read(new DotEnvOptions(envFilePaths: [Path.GetFullPath("../../../asb.env")], ignoreExceptions: false));
-            x.UsingAzureServiceBus((context, cfg) =>
-            {
-                cfg.Host(envs["CONNECTIONSTRING"]);
+                    var envs = DotEnv.Read(new DotEnvOptions(envFilePaths: [Path.GetFullPath("../../../sqs.env")]));
+                    cfg.Host(envs["AWS_REGION"], h =>
+                    {
+                        h.AccessKey(envs["AWS_ACCESS_KEY_ID"]);
+                        h.SecretKey(envs["AWS_SECRET_ACCESS_KEY"]);
+                    });
 
-                cfg.ConfigureEndpoints(context);
-            });
+                    cfg.ConfigureEndpoints(ctx);
+                });
+                break;
+            case "AzureServiceBus":
+                var envs = DotEnv.Read(new DotEnvOptions(envFilePaths: [Path.GetFullPath("../../../asb.env")], ignoreExceptions: false));
+                x.UsingAzureServiceBus((context, cfg) =>
+                {
+                    cfg.Host(envs["CONNECTION_STRING"]);
 
-            selectedTransport = "Azure Service Bus";
-        }
-        else if (args.Contains("--rabbitmq"))
-        {
-            x.UsingRabbitMq((context, cfg) =>
-            {
-                cfg.Host("localhost", 33721, "/", h =>
+                    cfg.ConfigureEndpoints(context);
+                });
+                break;
+            case "RabbitMQ":
+                x.UsingRabbitMq((context, cfg) =>
                 {
-                    h.Username("guest");
-                    h.Password("guest");
+                    cfg.Host("rabbitmq", 5672, "/", h =>
+                    {
+                        h.Username("guest");
+                        h.Password("guest");
+                    });
+                    cfg.ConfigureEndpoints(context);
                 });
-                cfg.ConfigureEndpoints(context);
-            });
-            selectedTransport = "RabbitMQ";
+                break;
+            default:
+                throw new ArgumentException("No transport is chosen");
         }
-        else
-        {
-            throw new ArgumentException("No transport is chosen");
-        }
-
-        var name = Path.GetFileNameWithoutExtension(Environment.GetCommandLineArgs()[0]);
-        Console.Title = name + " - " + selectedTransport;
 
         x.AddConfigureEndpointsCallback((name, cfg) =>
         {
diff --git a/src/Sales/Dockerfile b/src/Sales/Dockerfile
@@ -4,12 +4,12 @@ ARG TARGETARCH
 WORKDIR /src
 
 COPY . .
-RUN dotnet publish src/Sales -c $BUILD_CONFIGURATION -o /app/publish --arch $TARGETARCH /p:UseAppHost=false
+RUN dotnet publish Sales -c $BUILD_CONFIGURATION -o /app/publish --arch $TARGETARCH /p:UseAppHost=false
 
 
-FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 USER $APP_UID
 WORKDIR /app
-
+EXPOSE 80
 COPY --from=build /app/publish .
 ENTRYPOINT ["dotnet", "Sales.dll"]
diff --git a/src/Sales/Program.cs b/src/Sales/Program.cs
@@ -31,10 +31,10 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                     services.AddSignalR(options => { options.EnableDetailedErrors = true; });
                     services.AddSingleton<SimulationEffects>();
                 });
-                webBuilder.UseUrls("http://*:5001");
+                webBuilder.UseUrls($"http://*:{Environment.GetEnvironmentVariable("LISTENING_PORT") ?? "5001"}");
                 webBuilder.Configure(app =>
                 {
-                    app.UseCors(options => options.AllowAnyHeader().AllowAnyMethod().WithOrigins("http://localhost:61335").AllowCredentials());
+                    app.UseCors(options => options.AllowAnyHeader().AllowAnyMethod().WithOrigins(Environment.GetEnvironmentVariable("ORIGIN_URL") ?? "http://localhost:61335").AllowCredentials());
                     app.UseRouting();
                     app.UseEndpoints(endpoints =>
                     {
diff --git a/src/Shipping/Dockerfile b/src/Shipping/Dockerfile
@@ -4,12 +4,12 @@ ARG TARGETARCH
 WORKDIR /src
 
 COPY . .
-RUN dotnet publish src/Sales -c $BUILD_CONFIGURATION -o /app/publish --arch $TARGETARCH /p:UseAppHost=false
+RUN dotnet publish Sales -c $BUILD_CONFIGURATION -o /app/publish --arch $TARGETARCH /p:UseAppHost=false
 
 
-FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 USER $APP_UID
 WORKDIR /app
-
+EXPOSE 80
 COPY --from=build /app/publish .
 ENTRYPOINT ["dotnet", "Shipping.dll"]
diff --git a/src/Shipping/Program.cs b/src/Shipping/Program.cs
@@ -31,10 +31,10 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                      services.AddSignalR(options => { options.EnableDetailedErrors = true; });
                      services.AddSingleton<SimulationEffects>();
                  });
-                 webBuilder.UseUrls("http://*:5003");
+                 webBuilder.UseUrls($"http://*:{Environment.GetEnvironmentVariable("LISTENING_PORT") ?? "5003"}");
                  webBuilder.Configure(app =>
                  {
-                     app.UseCors(options => options.AllowAnyHeader().AllowAnyMethod().WithOrigins("http://localhost:61335").AllowCredentials());
+                     app.UseCors(options => options.AllowAnyHeader().AllowAnyMethod().WithOrigins(Environment.GetEnvironmentVariable("ORIGIN_URL") ?? "http://localhost:61335").AllowCredentials());
                      app.UseRouting();
                      app.UseEndpoints(endpoints =>
                      {
diff --git a/src/docker-compose-base.yml b/src/docker-compose-base.yml
@@ -24,7 +24,7 @@ services:
       service-control:
         condition: service_healthy
     container_name: masstransit-connector
-    image:  particular/servicecontrol-connector-masstransit:0.1.0-alpha.4
+    image:  particular/servicecontrol-masstransit-connector:0.1.0-alpha.6
     volumes:
       - ./queues.txt:/app/queues.txt:ro
     environment:
@@ -39,56 +39,76 @@ services:
     ports:
         - 9090:9090
     environment:
-        SERVICECONTROL_URL: http://localhost:33333/api/
+        SERVICECONTROL_URL: http://servicecontrol:33333/api/
         ENABLE_REVERSE_PROXY: false
         SHOW_PENDING_RETRY: false
-  vue-app:
-    container_name: ui-app
+  frontend:
+    container_name: frontend
     build:
       context: ./frontend  # Path to the folder containing Dockerfile
       dockerfile: Dockerfile
     ports:
-      - "8080:80"  # Map port 80 in the container to port 8080 on the host
+      - "8080:80"
     depends_on:
       - billing
+      - shipping
+      - sales
+      - clientui
     volumes:
       - ./frontend:/app  # Optional for hot reloading
-    restart: always
+    environment:
+      - BILLING_SIGNALR=billing:5002
+      - CLIENT_SIGNALR=clientui:5000
+      - SALES_SIGNALR=sales:5001
+      - SHIPPING_SIGNALR=shipping:5003
   billing:
     build:
       context: ./
-      dockerfile: ./src/Billing/Dockerfile
-    container_name: billing 
+      dockerfile: ./Billing/Dockerfile
+    container_name: billing
     ports:
-      - "5002:5002"
+      - "5002:80"
     environment:
-      - ASPNETCORE_URLS=http://+:5002  
+      - LISTENING_PORT=80
+      - ORIGIN_URL=http://frontend:8080
+      - TRANSPORT_TYPE
+      - CONNECTION_STRING
   shipping:
     build:
       context: ./
-      dockerfile: ./src/Shipping/Dockerfile
-    container_name: shipping 
+      dockerfile: ./Shipping/Dockerfile
+    container_name: shipping
     ports:
-      - "5003:5003"
+      - "5003:80"
     environment:
-      - ASPNETCORE_URLS=http://+:5003  
+      - LISTENING_PORT=80
+      - ORIGIN_URL=http://frontend:8080
+      - TRANSPORT_TYPE
+      - CONNECTION_STRING
   sales:
     build:
       context: ./
-      dockerfile: ./src/Sales/Dockerfile
-    container_name: sales 
+      dockerfile: ./Sales/Dockerfile
+    container_name: sales
     ports:
-      - "5001:5001"
+      - "5001:80"
     environment:
-      - ASPNETCORE_URLS=http://+:5001  
+      - LISTENING_PORT=80
+      - ORIGIN_URL=http://frontend:8080
+      - TRANSPORT_TYPE
+      - CONNECTION_STRING
   clientui:
     build:
       context: ./
-      dockerfile: ./src/ClientUI/Dockerfile
-    container_name: clientui 
+      dockerfile: ./ClientUI/Dockerfile
+    container_name: clientui
     ports:
-      - "5000:5000"
+      - "5000:80"
     environment:
-      - ASPNETCORE_URLS=http://+:5000  
+      - LISTENING_PORT=80
+      - ORIGIN_URL=http://frontend:8080
+      - TRANSPORT_TYPE
+      - CONNECTION_STRING
+
 volumes:
   sc-data:
diff --git a/src/frontend/Dockerfile b/src/frontend/Dockerfile
@@ -26,4 +26,4 @@ COPY --from=build-stage /app/dist /usr/share/nginx/html
 EXPOSE 80
 
 # Start Nginx
-CMD ["nginx", "-g", "daemon off;"]
+ENTRYPOINT ["nginx", "-g", "daemon off;"]
diff --git a/src/frontend/src/components/BillingEndpoint.vue b/src/frontend/src/components/BillingEndpoint.vue
@@ -12,10 +12,9 @@ import {
 } from "./types";
 import { store } from "./shared";
 import MessageContainer from "./MessageContainer.vue";
-import OnOffSwitch from "./OnOffSwitch.vue";
 import { GA4 } from "../utils/analytics";
 
-var { connection, state } = useSignalR("http://localhost:5002/billingHub");
+const {connection, state} = useSignalR(`http://${import.meta.env.BILLING_SIGNALR ?? "localhost:5002"}/billingHub`);
 
 const processedCount = ref(0);
 const erroredCount = ref(0);
diff --git a/src/frontend/src/components/ClientEndpoint.vue b/src/frontend/src/components/ClientEndpoint.vue
@@ -7,7 +7,7 @@ import { store } from "./shared";
 import type { PlaceOrder, Message } from "./types";
 import MessageContainer from "./MessageContainer.vue";
 
-var { connection, state } = useSignalR("http://localhost:5000/clientHub");
+const { connection, state } = useSignalR(`http://${import.meta.env.CLIENT_SIGNALR ?? "localhost:5000"}/clientHub`);
 
 const orderCount = ref(0);
 const messages = ref<Message[]>([]);
diff --git a/src/frontend/src/components/SalesEndpoint.vue b/src/frontend/src/components/SalesEndpoint.vue
@@ -12,10 +12,9 @@ import {
 } from "./types";
 import MessageContainer from "./MessageContainer.vue";
 import { store } from "./shared";
-import OnOffSwitch from "./OnOffSwitch.vue";
 import { GA4 } from "../utils/analytics";
 
-var { connection, state } = useSignalR("http://localhost:5001/salesHub");
+const { connection, state } = useSignalR(`http://${import.meta.env.SALES_SIGNALR ?? "localhost:5001"}/salesHub`);
 
 const processedCount = ref(0);
 const erroredCount = ref(0);
diff --git a/src/frontend/src/components/ShippingEndpoint.vue b/src/frontend/src/components/ShippingEndpoint.vue
@@ -12,10 +12,9 @@ import {
 } from "./types";
 import MessageContainer from "./MessageContainer.vue";
 import { store } from "./shared";
-import OnOffSwitch from "./OnOffSwitch.vue";
 import { GA4 } from "../utils/analytics";
 
-var { connection, state } = useSignalR("http://localhost:5003/shippingHub");
+const { connection, state } = useSignalR(`http://${import.meta.env.SHIPPING_SIGNALR ?? "localhost:5003"}/shippingHub`);
 
 const processedOrderPlacedCount = ref(0);
 const processedOrderBilledCount = ref(0);
diff --git a/src/frontend/src/composables/useSignalR.ts b/src/frontend/src/composables/useSignalR.ts
@@ -4,7 +4,7 @@ import { onMounted, ref } from "vue";
 export default function useSignalR(url: string) {
   const state = ref(HubConnectionState.Disconnected);
 
-  var connection = new HubConnectionBuilder()
+  const connection = new HubConnectionBuilder()
     .withUrl(url)
     .withAutomaticReconnect()
     .build();
diff --git a/src/frontend/vite.config.ts b/src/frontend/vite.config.ts
diff --git a/src/nuget.config b/src/nuget.config

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@ public static IHostBuilder CreateHostBuilder(string[] args)`
`31`	`31`	`services.AddSignalR(options => { options.EnableDetailedErrors = true; });`
`32`	`32`	`services.AddSingleton<SimulationEffects>();`
`33`	`33`	`});`
`34`		`- webBuilder.UseUrls("http://*:5002");`
	`34`	`+ webBuilder.UseUrls($"http://*:{Environment.GetEnvironmentVariable("LISTENING_PORT") ?? "5002"}");`
`35`	`35`	`webBuilder.Configure(app =>`
`36`	`36`	`{`
`37`		`- app.UseCors(options => options.AllowAnyHeader().AllowAnyMethod().WithOrigins("http://localhost:61335").AllowCredentials());`
	`37`	`+ app.UseCors(options => options.AllowAnyHeader().AllowAnyMethod().WithOrigins(Environment.GetEnvironmentVariable("ORIGIN_URL") ?? "http://localhost:61335").AllowCredentials());`
`38`	`38`	`app.UseRouting();`
`39`	`39`	`app.UseEndpoints(endpoints =>`
`40`	`40`	`{`