henrik/pushy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: henrik:master
Branches Tags
henrik:master
..
compare: henrik:bf89d63aeca2f9ac66ae37e78f271b72dc2a5852
Branches Tags
henrik:master

5 Commits
master ... bf89d63aec

Author SHA1 Message Date
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
16 changed files with 27 additions and 54 deletions
Expand all files Collapse all files

4
.dokku/Procfile
View File

@@ -1,2 +1,2 @@
web: run-web.sh web: pushy/Pushy.dll
silo: run-silo.sh silo: silo/Pushy.Silo.dll

10
Dockerfile
View File

@@ -24,10 +24,6 @@ RUN dotnet build "Pushy.Silo.csproj" --no-restore -c $BUILD_CONFIGURATION -o /ap
WORKDIR "/src/Pushy/Pushy" WORKDIR "/src/Pushy/Pushy"
RUN dotnet build "Pushy.csproj" --no-restore -c $BUILD_CONFIGURATION -o /app/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 FROM build AS publish
ARG BUILD_CONFIGURATION=Release ARG BUILD_CONFIGURATION=Release
@@ -41,7 +37,5 @@ RUN dotnet publish "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/publish/pushy
FROM base AS final FROM base AS final
WORKDIR /app WORKDIR /app
COPY --from=publish /app/publish . COPY --from=publish /app/publish .
COPY --from=publish /app/.dokku /app/.dokku RUN ls -la
COPY --from=publish /app/*.sh /app/ ENTRYPOINT ["dotnet"]
ENTRYPOINT ["sh"]

7
GitVersion.yml
View File

@@ -1,7 +0,0 @@
branches:
main:
regex: ^master$|^main$
mode: ContinuousDelivery
develop:
regex: ^develop$
mode: ContinuousDelivery

2
Pushy.Silo/Program.cs
View File

@@ -22,7 +22,5 @@ builder.UseOrleans(silo =>
}); });
}); });
builder.Services.AddAllElasticApm();
var host = builder.Build(); var host = builder.Build();
host.Run(); host.Run();

9
Pushy.Silo/Pushy.Silo.csproj
View File

@@ -6,12 +6,9 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>dotnet-Pushy.Silo-607fe096-6d3f-44f4-8e5d-8a2c875f8758</UserSecretsId> <UserSecretsId>dotnet-Pushy.Silo-607fe096-6d3f-44f4-8e5d-8a2c875f8758</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<Title>Pushy Silo</Title>
<Authors>Henrik Lassen</Authors>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.31.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0"/> <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0"/>
<PackageReference Include="Microsoft.Orleans.Clustering.Redis" Version="9.0.1" /> <PackageReference Include="Microsoft.Orleans.Clustering.Redis" Version="9.0.1" />
<PackageReference Include="Microsoft.Orleans.Persistence.Redis" Version="9.0.1" /> <PackageReference Include="Microsoft.Orleans.Persistence.Redis" Version="9.0.1" />
@@ -22,4 +19,10 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Pushy.Domain\Pushy.Domain.csproj" /> <ProjectReference Include="..\Pushy.Domain\Pushy.Domain.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\.dockerignore">
<Link>.dockerignore</Link>
</Content>
</ItemGroup>
</Project> </Project>

3
Pushy.Silo/appsettings.json
View File

@@ -4,8 +4,5 @@
"Default": "Information", "Default": "Information",
"Microsoft.Hosting.Lifetime": "Information" "Microsoft.Hosting.Lifetime": "Information"
} }
},
"ElasticApm": {
"ServerUrl": "http://apm.home.local:8200"
} }
} }

8
Pushy.slnx
View File

@@ -1,8 +1,4 @@
<Solution> <Solution>
<Folder Name="/Frontend/"> <Project Path="Pushy\Pushy.Client\Pushy.Client.csproj" Type="Classic C#" />
<Project Path="Pushy\Pushy.Client\Pushy.Client.csproj" Type="Classic C#" /> <Project Path="Pushy\Pushy\Pushy.csproj" Type="Classic C#" />
<Project Path="Pushy\Pushy\Pushy.csproj" Type="Classic C#" />
</Folder>
<Project Path="Pushy.Domain\Pushy.Domain.csproj" Type="Classic C#" />
<Project Path="Pushy.Silo\Pushy.Silo.csproj" Type="Classic C#" />
</Solution> </Solution>

3
Pushy/Pushy.Client/Pushy.Client.csproj
View File

@@ -7,11 +7,12 @@
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile> <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode> <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<LangVersion>13</LangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" /> <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> </ItemGroup>
</Project> </Project>

3
Pushy/Pushy/Components/App.razor
View File

@@ -14,12 +14,11 @@
<link rel="stylesheet" href="@Assets["app.tailwind.css"]"/> <link rel="stylesheet" href="@Assets["app.tailwind.css"]"/>
<link rel="stylesheet" href="@Assets["Pushy.styles.css"]"/> <link rel="stylesheet" href="@Assets["Pushy.styles.css"]"/>
<HeadOutlet/> <HeadOutlet/>
<ImportMap/>
</head> </head>
<body> <body>
<Routes/> <Routes/>
<script src="_framework/blazor.web.js"></script> <script src="@Assets["_framework/blazor.web.js"]"></script>
@if (Agent.Configuration.Enabled && Environment.IsProduction()) @if (Agent.Configuration.Enabled && Environment.IsProduction())
{ {
<script src="@Assets["elastic-apm-rum.umd.min.js"]"></script> <script src="@Assets["elastic-apm-rum.umd.min.js"]"></script>

2
Pushy/Pushy/Program.cs
View File

@@ -51,11 +51,11 @@ if (builder.Environment.IsProduction())
opt.Transport = new DistributedTransport(transport); opt.Transport = new DistributedTransport(transport);
}); });
} }
builder.Services.AddAllElasticApm();
builder.Services.AddScoped(service => builder.Services.AddScoped(service =>
service.GetRequiredService<IClusterClient>().GetGrain<ILinkGenerator>(Guid.Empty) service.GetRequiredService<IClusterClient>().GetGrain<ILinkGenerator>(Guid.Empty)
); );
builder.Services.AddAllElasticApm();
builder.Services.AddHealthChecks(); builder.Services.AddHealthChecks();
builder.Services.AddCors(policy => builder.Services.AddCors(policy =>

10
Pushy/Pushy/Pushy.csproj
View File

@@ -16,16 +16,24 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.31.0" /> <PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.31.0" />
<PackageReference Include="Elastic.Extensions.Logging" Version="8.12.3" /> <PackageReference Include="Elastic.Extensions.Logging" Version="8.12.3" />
<PackageReference Include="GitVersion.MsBuild" Version="6.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0" /> <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0" />
<PackageReference Include="Microsoft.Orleans.Clustering.Redis" Version="9.0.1" /> <PackageReference Include="Microsoft.Orleans.Clustering.Redis" Version="9.0.1" />
<PackageReference Include="Microsoft.Orleans.Persistence.Redis" Version="9.0.1" /> <PackageReference Include="Microsoft.Orleans.Persistence.Redis" Version="9.0.1" />
<PackageReference Include="Microsoft.Orleans.Reminders.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="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.Domain\Pushy.Domain.csproj" />
<ProjectReference Include="..\Pushy.Client\Pushy.Client.csproj"/> <ProjectReference Include="..\Pushy.Client\Pushy.Client.csproj"/>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Grains\" />
</ItemGroup>
</Project> </Project>

3
Pushy/Pushy/Pushy.csproj.DotSettings.user
View File

@@ -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>

3
Pushy/Pushy/appsettings.json
View File

@@ -7,7 +7,8 @@
} }
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"ElasticApm": { "ElasticApm":
{
"ServerUrl": "http://apm.home.local:8200", "ServerUrl": "http://apm.home.local:8200",
"TransactionNameGroups": "GET /t/*" "TransactionNameGroups": "GET /t/*"
} }

8
app.json
View File

@@ -1,12 +1,4 @@
{ {
"formation": {
"web": {
"quantity": 1
},
"silo": {
"quantity": 2
}
},
"healthchecks": { "healthchecks": {
"web": [ "web": [
{ {

3
run-silo.sh
View File

@@ -1,3 +0,0 @@
#!/usr/bin/env bash
cd /app/silo
dotnet Pushy.Silo.dll

3
run-web.sh
View File

@@ -1,3 +0,0 @@
#!/usr/bin/env bash
cd /app/pushy
dotnet Pushy.dll