Merge branch 'main' into feature/kamal-deployment

NetCoreTemplates · Nov 26, 2024 · fecc5d5 · fecc5d5
2 parents 8744b81 + a5eb836
commit fecc5d5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -60,11 +60,6 @@ jobs:
         with:
           node-version: 22
 
-      - name: Install npm dependencies
-        if: steps.check_client.outputs.client_exists == 'true'
-        working-directory: ./MyApp.Client
-        run: npm install
-
       - name: Install x tool
         run: dotnet tool install -g x
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,6 +7,9 @@ on:
     workflows: ["Build Container"]
     types:
       - completed
+    branches:
+      - main
+      - master
   workflow_dispatch:
 
 env:
@@ -68,7 +71,7 @@ jobs:
           bundler-cache: true
 
       - name: Install Kamal
-        run: gem install kamal -v 2.2.2
+        run: gem install kamal -v 2.3.0
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

diff --git a/MyApp/Configure.AppHost.cs b/MyApp/Configure.AppHost.cs
@@ -14,7 +14,7 @@ public void Configure(IWebHostBuilder builder) => builder
     public override void Configure()
     {
         SetConfig(new HostConfig {
-            IgnorePathInfoPrefixes = { "/appsettings", "/_framework" },
+            IgnorePathInfoPrefixes = { "/appsettings", "/_framework" }
         });
     }
 }
diff --git a/MyApp/Program.cs b/MyApp/Program.cs
@@ -8,6 +8,7 @@
 using MyApp.Data;
 using ServiceStack.Blazor;
 using System.Net;
+using Microsoft.AspNetCore.HttpOverrides;
 using MyApp.ServiceInterface;
 
 var builder = WebApplication.CreateBuilder(args);

diff --git a/MyApp/appsettings.json b/MyApp/appsettings.json
@@ -9,5 +9,6 @@
     "AppConfig": {
         "LocalBaseUrl": "https://localhost:5001",
         "PublicBaseUrl": "https://blazor-wasm.web-templates.io"
-    }
+    },
+    "ApiBaseUrl": "https://blazor-wasm.web-templates.io"
 }
diff --git a/config/deploy.yml b/config/deploy.yml
@@ -22,6 +22,7 @@ servers:
 proxy:
   ssl: true
   host: my-app.example.com
+  forward_headers: true
   # kamal-proxy connects to your container over port 80, use `app_port` to specify a different port.
   app_port: 8080