fix: Changed frontend back to web

chore: Adjusted App.json
ci: Adjustments procfile
2024-12-22 21:22:44 +01:00 · 2024-12-22 21:12:32 +01:00 · 2024-12-22 21:06:26 +01:00 · 2024-12-22 20:54:40 +01:00 · 2024-12-22 20:49:16 +01:00 · 2024-12-22 20:24:26 +01:00
14 changed files with 11 additions and 32 deletions
--- a/.dokku/Procfile
+++ b/.dokku/Procfile
@@ -1,2 +1,2 @@
-web: run-web.sh
-silo: run-silo.sh
+web: /app/pushy/Pushy.dll
+silo: silo/Pushy.Silo.dll
--- a/7
+++ b/7
@@ -25,8 +25,6 @@ WORKDIR "/src/Pushy/Pushy"
 RUN dotnet build "Pushy.csproj" --no-restore -c $BUILD_CONFIGURATION -o /app/pushy

 COPY .dokku/Procfile /app/.dokku/Procfile
-COPY run-silo.sh /app/run-silo.sh
-COPY run-web.sh /app/run-web.sh

 FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
@@ -42,6 +40,7 @@ FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
 COPY --from=publish /app/.dokku /app/.dokku
-COPY --from=publish /app/*.sh /app/

-ENTRYPOINT ["sh"]
+RUN ls -la
+
+ENTRYPOINT ["dotnet"]
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -2,6 +2,3 @@ branches:
  main:
    regex: ^master$|^main$
    mode: ContinuousDelivery
-  develop:
-    regex: ^develop$
-    mode: ContinuousDelivery
--- a/Pushy.Silo/Program.cs
+++ b/Pushy.Silo/Program.cs
@@ -22,7 +22,5 @@ builder.UseOrleans(silo =>
    });
 });

-builder.Services.AddAllElasticApm();
-
 var host = builder.Build();
 host.Run();
--- a/Pushy.Silo/Pushy.Silo.csproj
+++ b/Pushy.Silo/Pushy.Silo.csproj
@@ -6,12 +6,9 @@
        <ImplicitUsings>enable</ImplicitUsings>
        <UserSecretsId>dotnet-Pushy.Silo-607fe096-6d3f-44f4-8e5d-8a2c875f8758</UserSecretsId>
        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <Title>Pushy Silo</Title>
-        <Authors>Henrik Lassen</Authors>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.31.0" />
        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0"/>
        <PackageReference Include="Microsoft.Orleans.Clustering.Redis" Version="9.0.1" />
        <PackageReference Include="Microsoft.Orleans.Persistence.Redis" Version="9.0.1" />
--- a/Pushy.Silo/appsettings.json
+++ b/Pushy.Silo/appsettings.json
@@ -4,8 +4,5 @@
      "Default": "Information",
      "Microsoft.Hosting.Lifetime": "Information"
    }
-  },
-  "ElasticApm": {
-    "ServerUrl":  "http://apm.home.local:8200"
  }
 }
--- a/Pushy/Pushy.Client/Pushy.Client.csproj
+++ b/Pushy/Pushy.Client/Pushy.Client.csproj
@@ -11,7 +11,7 @@

    <ItemGroup>
        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="UnitsNet" Version="5.61.0" />
+        <PackageReference Include="UnitsNet" Version="5.60.0" />
    </ItemGroup>

 </Project>
--- a/Pushy/Pushy/Components/App.razor
+++ b/Pushy/Pushy/Components/App.razor
@@ -14,12 +14,11 @@
    <link rel="stylesheet" href="@Assets["app.tailwind.css"]"/>
    <link rel="stylesheet" href="@Assets["Pushy.styles.css"]"/>
    <HeadOutlet/>
-    <ImportMap/>
 </head>

 <body>
    <Routes/>
-    <script src="_framework/blazor.web.js"></script>
+    <script src="@Assets["_framework/blazor.web.js"]"></script>
    @if (Agent.Configuration.Enabled && Environment.IsProduction())
    {
        <script src="@Assets["elastic-apm-rum.umd.min.js"]"></script>
--- a/Pushy/Pushy/Program.cs
+++ b/Pushy/Pushy/Program.cs
@@ -51,11 +51,11 @@ if (builder.Environment.IsProduction())
        opt.Transport = new DistributedTransport(transport);
    });   
 }
-builder.Services.AddAllElasticApm();

 builder.Services.AddScoped(service => 
        service.GetRequiredService<IClusterClient>().GetGrain<ILinkGenerator>(Guid.Empty)
    );
+builder.Services.AddAllElasticApm();

 builder.Services.AddHealthChecks();
 builder.Services.AddCors(policy =>
--- a/Pushy/Pushy/Pushy.csproj
+++ b/Pushy/Pushy/Pushy.csproj
@@ -22,7 +22,7 @@
        <PackageReference Include="Microsoft.Orleans.Persistence.Redis" Version="9.0.1" />
        <PackageReference Include="Microsoft.Orleans.Reminders.Redis" Version="9.0.1" />
        <PackageReference Include="System.Text.Json" Version="9.0.0" />
-        <PackageReference Include="UnitsNet" Version="5.61.0" />
+        <PackageReference Include="UnitsNet" Version="5.60.0" />
        <ProjectReference Include="..\..\Pushy.Domain\Pushy.Domain.csproj" />
        <ProjectReference Include="..\Pushy.Client\Pushy.Client.csproj"/>
        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
--- a/Pushy/Pushy/Pushy.csproj.DotSettings.user
+++ b/Pushy/Pushy/Pushy.csproj.DotSettings.user
@@ -1,3 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/WebPathMapping/MappedPaths/=WWWROOT_005C_005FFRAMEWORK_005CBLAZOR_002EWEB_002EJS/@EntryIndexedValue"></s:String>
-	<s:String x:Key="/Default/CodeInspection/WebPathMapping/PathsInCorrectCasing/=WWWROOT_005C_005FFRAMEWORK_005CBLAZOR_002EWEB_002EJS/@EntryIndexedValue">wwwroot\_framework\blazor.web.js</s:String></wpf:ResourceDictionary>
--- a/Pushy/Pushy/appsettings.json
+++ b/Pushy/Pushy/appsettings.json
@@ -7,7 +7,8 @@
    }
  },
  "AllowedHosts": "*",
-  "ElasticApm": {
+  "ElasticApm":
+  {
    "ServerUrl":  "http://apm.home.local:8200",
    "TransactionNameGroups": "GET /t/*"
  }
--- a/run-silo.sh
+++ b/run-silo.sh
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-cd /app/silo
-dotnet Pushy.Silo.dll
--- a/run-web.sh
+++ b/run-web.sh
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-cd /app/pushy
-dotnet Pushy.dll
Author	SHA1	Message	Date
henrik	26e0676608	fix: Changed frontend back to web	2024-12-22 21:22:44 +01:00
henrik	f5ffd33bf8	chore: Adjusted App.json	2024-12-22 21:12:32 +01:00
henrik	9276aa988c	ci: Adjustments procfile	2024-12-22 21:06:26 +01:00
henrik	63c6a6f393	chore: Disabled healthcheck	2024-12-22 20:54:40 +01:00
henrik	5e896e112c	chore: Changed web to frontend	2024-12-22 20:49:16 +01:00
henrik	fe80932db0	ci: Adjustments to dockerfile	2024-12-22 20:24:26 +01:00
henrik	8dbdbca9a3	ci: Adjustments to dockerfile	2024-12-22 20:03:57 +01:00
henrik	ef3ab20fff	ci: Adjustments to dockerfile	2024-12-22 19:56:52 +01:00
henrik	2498c9525d	chore: Updated slnx project file	2024-12-22 17:10:34 +01:00
henrik	97459ccd1d	Updated Dockerfile	2024-12-16 22:09:23 +01:00
henrik	f554b52024	Updated Dockerfile	2024-12-13 21:55:33 +01:00
henrik	adc86c0e96	Updated Dockerfile	2024-12-13 21:49:55 +01:00
henrik	547413787a	Updated Dockerfile	2024-12-13 21:41:44 +01:00
henrik	fb3f5f36f1	Updated Procfile	2024-12-13 21:35:03 +01:00
henrik	65bd4e69df	Updated Procfile	2024-12-13 21:30:30 +01:00
henrik	226d590890	Updated Procfile	2024-12-13 20:26:22 +01:00
henrik	ffbe6d9c04	Updated Procfile	2024-12-13 20:14:32 +01:00
henrik	5586d29a20	Updated Procfile	2024-12-13 20:07:52 +01:00
henrik	8999be2b8a	Updated Procfile	2024-12-13 20:01:07 +01:00
henrik	d99ec3f0b7	Updated Procfile	2024-12-13 19:54:38 +01:00
henrik	8108e5c7ea	removed git version	2024-12-13 19:33:51 +01:00
henrik	d1ae132076	Reverted gitversion config	2024-12-13 19:14:03 +01:00
henrik	1fb196bce1	Added gitversion config	2024-12-13 19:06:55 +01:00
henrik	bf89d63aec	Re-added explicit copy	2024-12-13 18:30:34 +01:00
henrik	f9c7e69ca2	Removed explicit copy	2024-12-13 18:28:28 +01:00
henrik	8a22f1e159	undid explicit .git copy to whole folder copying	2024-12-13 18:20:31 +01:00
henrik	a816f99118	Include .git	2024-12-13 18:17:18 +01:00
henrik	2525790303	Initial split migration	2024-12-13 18:04:00 +01:00