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

Compare commits

base: henrik:26e06766082a1589da202df92c3daf62d0161f48
Branches Tags
henrik:master
..
compare: henrik:4f1501d9fe94ba683ddea41ecae37b77ce2c47c0
Branches Tags
henrik:master

12 Commits
26e0676608 ... 4f1501d9fe

Author SHA1 Message Date
henrik
4f1501d9fe chore: Removed Gitversion again 2024-12-23 13:29:09 +01:00
henrik
01c2864a55 chore: Additional Copy 2024-12-23 01:36:23 +01:00
henrik
d65540a449 chore: Attempt copying one level lower 2024-12-23 01:33:48 +01:00
henrik
e9194d199a chore: Updated gitversion yaml & dockerfile 2024-12-23 01:28:27 +01:00
henrik
0eb8ee1a7f chore: Attempting downgrade of gitversion 2024-12-23 01:20:52 +01:00
henrik
da2ff13c31 chore: debugging build 2024-12-23 01:12:21 +01:00
henrik
7b5cb0267b feat: Adds APM to Silo & readded gitversion 2024-12-23 01:06:30 +01:00
henrik
9b022b296a feat: Adds experiment launch script 2024-12-23 00:48:26 +01:00
henrik
7c10b31b2d ci: Adjustments procfile 2024-12-22 23:56:13 +01:00
henrik
7de891ad08 ci: Adjustments procfile 2024-12-22 23:39:53 +01:00
henrik
995146f3d2 chore: Test --project argument 2024-12-22 23:32:51 +01:00
henrik
678fb69405 chore: Added possible missing component 2024-12-22 22:57:05 +01:00
14 changed files with 32 additions and 11 deletions
Expand all files Collapse all files

4
.dokku/Procfile
View File

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

7
Dockerfile
View File

@@ -25,6 +25,8 @@ 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 .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
@@ -40,7 +42,6 @@ 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 COPY --from=publish /app/.dokku /app/.dokku
COPY --from=publish /app/*.sh /app/
RUN ls -la ENTRYPOINT ["sh"]
ENTRYPOINT ["dotnet"]

3
GitVersion.yml
View File

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

2
Pushy.Silo/Program.cs
View File

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

3
Pushy.Silo/Pushy.Silo.csproj
View File

@@ -6,9 +6,12 @@
<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" />

3
Pushy.Silo/appsettings.json
View File

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

2
Pushy/Pushy.Client/Pushy.Client.csproj
View File

@@ -11,7 +11,7 @@
<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.60.0" /> <PackageReference Include="UnitsNet" Version="5.61.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@@ -14,11 +14,12 @@
<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="@Assets["_framework/blazor.web.js"]"></script> <script src="_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 =>

2
Pushy/Pushy/Pushy.csproj
View File

@@ -22,7 +22,7 @@
<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.60.0" /> <PackageReference Include="UnitsNet" Version="5.61.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" />

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

@@ -0,0 +1,3 @@
<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,8 +7,7 @@
} }
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"ElasticApm": "ElasticApm": {
{
"ServerUrl": "http://apm.home.local:8200", "ServerUrl": "http://apm.home.local:8200",
"TransactionNameGroups": "GET /t/*" "TransactionNameGroups": "GET /t/*"
} }

3
run-silo.sh Normal file
View File

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

3
run-web.sh Normal file
View File

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