From 25257903037553ec3418b1c50707bb9df298def3 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 18:04:00 +0100 Subject: [PATCH 01/40] Initial split migration --- .dokku/Procfile | 2 + Pushy/Pushy/Dockerfile => Dockerfile | 25 +- Pushy.Domain/ILinkGenerator.cs | 7 + Pushy.Domain/ITextItem.cs | 14 + Pushy.Domain/LinkResult.cs | 6 + Pushy.Domain/Pushy.Domain.csproj | 13 + Pushy.Domain/TextItem.cs | 6 + Pushy.Domain/TextSetResult.cs | 8 + .../Grains/LinkGenerator.cs | 15 +- .../Grains/TextItemGrain.cs | 36 +-- Pushy.Silo/Program.cs | 26 ++ Pushy.Silo/Properties/launchSettings.json | 12 + Pushy.Silo/Pushy.Silo.csproj | 28 ++ Pushy.Silo/appsettings.Development.json | 8 + Pushy.Silo/appsettings.json | 8 + Pushy.sln | 18 ++ Pushy.sln.DotSettings.user | 3 +- .../Pushy/Components/Pages/DisplayText.razor | 2 +- Pushy/Pushy/Components/Pages/Home.razor | 2 +- Pushy/Pushy/Program.cs | 54 ++-- Pushy/Pushy/Pushy.csproj | 19 +- Pushy/Pushy/wwwroot/app.tailwind.css | 243 ++++-------------- Pushy/tailwind.config.js | 3 + 23 files changed, 281 insertions(+), 277 deletions(-) create mode 100644 .dokku/Procfile rename Pushy/Pushy/Dockerfile => Dockerfile (55%) create mode 100644 Pushy.Domain/ILinkGenerator.cs create mode 100644 Pushy.Domain/ITextItem.cs create mode 100644 Pushy.Domain/LinkResult.cs create mode 100644 Pushy.Domain/Pushy.Domain.csproj create mode 100644 Pushy.Domain/TextItem.cs create mode 100644 Pushy.Domain/TextSetResult.cs rename {Pushy/Pushy => Pushy.Silo}/Grains/LinkGenerator.cs (74%) rename {Pushy/Pushy => Pushy.Silo}/Grains/TextItemGrain.cs (75%) create mode 100644 Pushy.Silo/Program.cs create mode 100644 Pushy.Silo/Properties/launchSettings.json create mode 100644 Pushy.Silo/Pushy.Silo.csproj create mode 100644 Pushy.Silo/appsettings.Development.json create mode 100644 Pushy.Silo/appsettings.json diff --git a/.dokku/Procfile b/.dokku/Procfile new file mode 100644 index 0000000..b2087c2 --- /dev/null +++ b/.dokku/Procfile @@ -0,0 +1,2 @@ +web: pushy/Pushy.dll +silo: silo/Pushy.Silo.dll \ No newline at end of file diff --git a/Pushy/Pushy/Dockerfile b/Dockerfile similarity index 55% rename from Pushy/Pushy/Dockerfile rename to Dockerfile index 9f2c761..454e524 100644 --- a/Pushy/Pushy/Dockerfile +++ b/Dockerfile @@ -1,23 +1,40 @@ FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base USER $APP_UID WORKDIR /app -EXPOSE 8080 FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release + WORKDIR /src +COPY ["Pushy.Domain/Pushy.Domain.csproj", "Pushy.Domain/"] + COPY ["Pushy/Pushy/Pushy.csproj", "Pushy/Pushy/"] COPY ["Pushy/Pushy.Client/Pushy.Client.csproj", "Pushy/Pushy.Client/"] + +COPY ["Pushy.Silo/Pushy.Silo.csproj", "Pushy.Silo/"] + +RUN dotnet restore "Pushy.Silo/Pushy.Silo.csproj" RUN dotnet restore "Pushy/Pushy/Pushy.csproj" COPY . . + +WORKDIR "/src/Pushy.Silo" +RUN dotnet build "Pushy.Silo.csproj" -c $BUILD_CONFIGURATION -o /app/silo + WORKDIR "/src/Pushy/Pushy" -RUN dotnet build "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/build +RUN dotnet build "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/pushy FROM build AS publish ARG BUILD_CONFIGURATION=Release -RUN dotnet publish "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false + +WORKDIR "/src/Pushy.Silo" +RUN dotnet publish "Pushy.Silo.csproj" -c $BUILD_CONFIGURATION -o /app/publish/silo /p:UseAppHost=false + +WORKDIR "/src/Pushy/Pushy" +RUN dotnet publish "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/publish/pushy /p:UseAppHost=false + FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "Pushy.dll"] +RUN ls -la +ENTRYPOINT ["dotnet"] diff --git a/Pushy.Domain/ILinkGenerator.cs b/Pushy.Domain/ILinkGenerator.cs new file mode 100644 index 0000000..892b86e --- /dev/null +++ b/Pushy.Domain/ILinkGenerator.cs @@ -0,0 +1,7 @@ +namespace Pushy.Domain; + +public interface ILinkGenerator : IGrainWithGuidKey +{ + [Alias("GenerateLink")] + public ValueTask GenerateTextShare([Immutable] string text); +} \ No newline at end of file diff --git a/Pushy.Domain/ITextItem.cs b/Pushy.Domain/ITextItem.cs new file mode 100644 index 0000000..37dfc3c --- /dev/null +++ b/Pushy.Domain/ITextItem.cs @@ -0,0 +1,14 @@ +using Orleans.Concurrency; + +namespace Pushy.Domain; + +public interface ITextItem : IGrainWithStringKey +{ + [Alias("SetText")] + public ValueTask SetText(string text); + + [ReadOnly] + [return: Immutable] + [Alias("GetText")] + ValueTask GetText(); +} \ No newline at end of file diff --git a/Pushy.Domain/LinkResult.cs b/Pushy.Domain/LinkResult.cs new file mode 100644 index 0000000..8f2ff37 --- /dev/null +++ b/Pushy.Domain/LinkResult.cs @@ -0,0 +1,6 @@ +namespace Pushy.Domain; + +[Immutable] +[GenerateSerializer] +[Alias("Pushy.Grains.LinkResult")] +public record LinkResult(ITextItem? Item); \ No newline at end of file diff --git a/Pushy.Domain/Pushy.Domain.csproj b/Pushy.Domain/Pushy.Domain.csproj new file mode 100644 index 0000000..25e2f49 --- /dev/null +++ b/Pushy.Domain/Pushy.Domain.csproj @@ -0,0 +1,13 @@ + + + + net9.0 + enable + enable + + + + + + + diff --git a/Pushy.Domain/TextItem.cs b/Pushy.Domain/TextItem.cs new file mode 100644 index 0000000..de15c4d --- /dev/null +++ b/Pushy.Domain/TextItem.cs @@ -0,0 +1,6 @@ +namespace Pushy.Domain; + +public sealed class TextItem +{ + public string? Text { get; set; } +} \ No newline at end of file diff --git a/Pushy.Domain/TextSetResult.cs b/Pushy.Domain/TextSetResult.cs new file mode 100644 index 0000000..ff4733e --- /dev/null +++ b/Pushy.Domain/TextSetResult.cs @@ -0,0 +1,8 @@ +namespace Pushy.Domain; + +[GenerateSerializer] +public enum TextSetResult +{ + Failure, + Success +} \ No newline at end of file diff --git a/Pushy/Pushy/Grains/LinkGenerator.cs b/Pushy.Silo/Grains/LinkGenerator.cs similarity index 74% rename from Pushy/Pushy/Grains/LinkGenerator.cs rename to Pushy.Silo/Grains/LinkGenerator.cs index 0b975aa..22a379b 100644 --- a/Pushy/Pushy/Grains/LinkGenerator.cs +++ b/Pushy.Silo/Grains/LinkGenerator.cs @@ -1,17 +1,6 @@ -using System.Diagnostics.CodeAnalysis; +using Pushy.Domain; -namespace Pushy.Grains; - -[Immutable] -[GenerateSerializer] -[Alias("Pushy.Grains.LinkResult")] -public record LinkResult(ITextItem? Item); - -public interface ILinkGenerator : IGrainWithGuidKey -{ - [Alias("GenerateLink")] - public ValueTask GenerateTextShare([Immutable] string text); -} +namespace Pushy.Silo.Grains; public sealed class LinkGenerator : IGrainBase, ILinkGenerator { diff --git a/Pushy/Pushy/Grains/TextItemGrain.cs b/Pushy.Silo/Grains/TextItemGrain.cs similarity index 75% rename from Pushy/Pushy/Grains/TextItemGrain.cs rename to Pushy.Silo/Grains/TextItemGrain.cs index 1d926b4..0136221 100644 --- a/Pushy/Pushy/Grains/TextItemGrain.cs +++ b/Pushy.Silo/Grains/TextItemGrain.cs @@ -1,41 +1,21 @@ -using Orleans.Concurrency; +using Pushy.Domain; -namespace Pushy.Grains; - -[GenerateSerializer] -public enum TextSetResult -{ - Failure, - Success -} - -public sealed class TextItem -{ - public string? Text { get; set; } -} - -public interface ITextItem : IGrainWithStringKey -{ - [Alias("SetText")] - public ValueTask SetText(string text); - - [ReadOnly] - [return: Immutable] - [Alias("GetText")] - ValueTask GetText(); -} +namespace Pushy.Silo.Grains; public sealed class TextItemGrain : IGrainBase, ITextItem, IRemindable { private readonly IPersistentState _state; + private readonly ILogger _logger; private IGrainReminder? _reminder; public TextItemGrain( IGrainContext grainContext, - [PersistentState("text")] IPersistentState state) + [PersistentState("text")] IPersistentState state, + ILogger logger) { _state = state; + _logger = logger; GrainContext = grainContext; } @@ -78,8 +58,10 @@ public sealed class TextItemGrain : IGrainBase, ITextItem, IRemindable if (reminderName == "clear") { _state.State.Text = null; - await _state.WriteStateAsync(); + await _state.WriteStateAsync(); this.DeactivateOnIdle(); + + _logger.LogInformation("Text item have been cleared!"); } } } \ No newline at end of file diff --git a/Pushy.Silo/Program.cs b/Pushy.Silo/Program.cs new file mode 100644 index 0000000..b46f95f --- /dev/null +++ b/Pushy.Silo/Program.cs @@ -0,0 +1,26 @@ +using StackExchange.Redis; + +var builder = Host.CreateApplicationBuilder(args); + +builder.UseOrleans(silo => +{ + silo.AddActivityPropagation(); + silo.UseRedisClustering(builder.Configuration.GetConnectionString("Valkey")!); + silo.UseRedisReminderService(conf => + { + ConfigurationOptions configurationOptions = + ConfigurationOptions.Parse(builder.Configuration.GetConnectionString("Valkey")!); + configurationOptions.DefaultDatabase = 0; + conf.ConfigurationOptions = configurationOptions; + }); + + silo.AddRedisGrainStorageAsDefault(options => + { + ConfigurationOptions configurationOptions = ConfigurationOptions.Parse(builder.Configuration.GetConnectionString("Valkey")!); + configurationOptions.DefaultDatabase = 1; + options.ConfigurationOptions = configurationOptions; + }); +}); + +var host = builder.Build(); +host.Run(); \ No newline at end of file diff --git a/Pushy.Silo/Properties/launchSettings.json b/Pushy.Silo/Properties/launchSettings.json new file mode 100644 index 0000000..3ca60ad --- /dev/null +++ b/Pushy.Silo/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "Pushy.Silo": { + "commandName": "Project", + "dotnetRunMessages": true, + "environmentVariables": { + "DOTNET_ENVIRONMENT": "Development" + } + } + } +} diff --git a/Pushy.Silo/Pushy.Silo.csproj b/Pushy.Silo/Pushy.Silo.csproj new file mode 100644 index 0000000..c58f821 --- /dev/null +++ b/Pushy.Silo/Pushy.Silo.csproj @@ -0,0 +1,28 @@ + + + + net9.0 + enable + enable + dotnet-Pushy.Silo-607fe096-6d3f-44f4-8e5d-8a2c875f8758 + Linux + + + + + + + + + + + + + + + + + .dockerignore + + + diff --git a/Pushy.Silo/appsettings.Development.json b/Pushy.Silo/appsettings.Development.json new file mode 100644 index 0000000..b2dcdb6 --- /dev/null +++ b/Pushy.Silo/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.Hosting.Lifetime": "Information" + } + } +} diff --git a/Pushy.Silo/appsettings.json b/Pushy.Silo/appsettings.json new file mode 100644 index 0000000..b2dcdb6 --- /dev/null +++ b/Pushy.Silo/appsettings.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.Hosting.Lifetime": "Information" + } + } +} diff --git a/Pushy.sln b/Pushy.sln index d241b50..e632121 100644 --- a/Pushy.sln +++ b/Pushy.sln @@ -4,6 +4,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pushy", "Pushy\Pushy\Pushy. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pushy.Client", "Pushy\Pushy.Client\Pushy.Client.csproj", "{E7FD5748-F854-48A7-ABE0-4E5C66B3671D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pushy.Silo", "Pushy.Silo\Pushy.Silo.csproj", "{7D79D5F5-95F6-40C3-8908-3853AEEBF70B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pushy.Domain", "Pushy.Domain\Pushy.Domain.csproj", "{F8840C69-22DF-4B0A-A2A3-366DFCA059DE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Frontend", "Frontend", "{C4155A90-7E85-4BB0-BB3E-E9FBF9F6D2B3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -18,5 +24,17 @@ Global {E7FD5748-F854-48A7-ABE0-4E5C66B3671D}.Debug|Any CPU.Build.0 = Debug|Any CPU {E7FD5748-F854-48A7-ABE0-4E5C66B3671D}.Release|Any CPU.ActiveCfg = Release|Any CPU {E7FD5748-F854-48A7-ABE0-4E5C66B3671D}.Release|Any CPU.Build.0 = Release|Any CPU + {7D79D5F5-95F6-40C3-8908-3853AEEBF70B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7D79D5F5-95F6-40C3-8908-3853AEEBF70B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7D79D5F5-95F6-40C3-8908-3853AEEBF70B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7D79D5F5-95F6-40C3-8908-3853AEEBF70B}.Release|Any CPU.Build.0 = Release|Any CPU + {F8840C69-22DF-4B0A-A2A3-366DFCA059DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F8840C69-22DF-4B0A-A2A3-366DFCA059DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F8840C69-22DF-4B0A-A2A3-366DFCA059DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F8840C69-22DF-4B0A-A2A3-366DFCA059DE}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {1156C75D-F4F0-42CA-A007-724AC6CEC123} = {C4155A90-7E85-4BB0-BB3E-E9FBF9F6D2B3} + {E7FD5748-F854-48A7-ABE0-4E5C66B3671D} = {C4155A90-7E85-4BB0-BB3E-E9FBF9F6D2B3} EndGlobalSection EndGlobal diff --git a/Pushy.sln.DotSettings.user b/Pushy.sln.DotSettings.user index 79bc171..28132b7 100644 --- a/Pushy.sln.DotSettings.user +++ b/Pushy.sln.DotSettings.user @@ -1,3 +1,4 @@  ForceIncluded - ForceIncluded \ No newline at end of file + ForceIncluded + ForceIncluded \ No newline at end of file diff --git a/Pushy/Pushy/Components/Pages/DisplayText.razor b/Pushy/Pushy/Components/Pages/DisplayText.razor index 23d4120..dfd2200 100644 --- a/Pushy/Pushy/Components/Pages/DisplayText.razor +++ b/Pushy/Pushy/Components/Pages/DisplayText.razor @@ -1,5 +1,5 @@ @page "/t/{id}" -@using Pushy.Grains +@using Pushy.Domain @if (SharedText is null) { diff --git a/Pushy/Pushy/Components/Pages/Home.razor b/Pushy/Pushy/Components/Pages/Home.razor index 9a41617..62f6e63 100644 --- a/Pushy/Pushy/Components/Pages/Home.razor +++ b/Pushy/Pushy/Components/Pages/Home.razor @@ -1,5 +1,5 @@ @page "/" -@using Pushy.Grains +@using Pushy.Domain @inject NavigationManager Nav Share Something! diff --git a/Pushy/Pushy/Program.cs b/Pushy/Pushy/Program.cs index d329835..84b8c3e 100644 --- a/Pushy/Pushy/Program.cs +++ b/Pushy/Pushy/Program.cs @@ -3,42 +3,43 @@ using Elastic.Extensions.Logging.Options; using Elastic.Transport; using Microsoft.AspNetCore.DataProtection; using Pushy.Components; -using Pushy.Grains; +using Pushy.Domain; using StackExchange.Redis; var builder = WebApplication.CreateBuilder(args); -builder.UseOrleans(silo => -{ - silo.UseLocalhostClustering(); - silo.UseRedisReminderService(conf => - { - ConfigurationOptions configurationOptions = - ConfigurationOptions.Parse(builder.Configuration.GetConnectionString("Valkey")!); - configurationOptions.DefaultDatabase = 0; - conf.ConfigurationOptions = configurationOptions; - }); - - silo.AddRedisGrainStorageAsDefault(options => - { - ConfigurationOptions configurationOptions = ConfigurationOptions.Parse(builder.Configuration.GetConnectionString("Valkey")!); - configurationOptions.DefaultDatabase = 1; - options.ConfigurationOptions = configurationOptions; - }); +string? connectionString = builder.Configuration.GetConnectionString("Valkey"); +if (string.IsNullOrEmpty(connectionString)) + throw new InvalidOperationException("Missing Valkey connection string"); +builder.UseOrleansClient(silo => +{ + silo.UseRedisClustering(connectionString); silo.AddActivityPropagation(); }); if (builder.Environment.IsProduction()) { - IConnectionMultiplexer multiplexer = ConnectionMultiplexer.Connect(builder.Configuration.GetConnectionString("Valkey")!); + string? elasticRawUrl = builder.Configuration["Elasticsearch:Url"]; + string? elasticApiKey = builder.Configuration["Elasticsearch:ApiKey"]; + + if (string.IsNullOrEmpty(elasticRawUrl)) + throw new InvalidOperationException( + "Missing Elasticsearch URL for logging"); + + if(string.IsNullOrEmpty(elasticApiKey)) + throw new InvalidOperationException("Missing Elasticsearch API key"); + + IConnectionMultiplexer multiplexer = ConnectionMultiplexer.Connect(connectionString); builder.Services.AddDataProtection() .PersistKeysToStackExchangeRedis(multiplexer); - - var transport = new TransportConfiguration(new StaticNodePool([new Uri("https://elastic-node-1.home.local:9200")])) - .Authentication(new ApiKey(builder.Configuration["Elasticsearch:ApiKey"]!)) - .ServerCertificateValidationCallback((_, _, _, _) => true); + + var transport = new TransportConfiguration(new StaticNodePool([new Uri(elasticRawUrl)])) + { + Authentication = new ApiKey(elasticApiKey), + ServerCertificateValidationCallback = (_, _, _, _) => true + }; builder.Logging.AddElasticsearch(opt => { @@ -52,15 +53,16 @@ if (builder.Environment.IsProduction()) } builder.Services.AddScoped(service => - service.GetRequiredService().GetGrain(Guid.Empty)); + service.GetRequiredService().GetGrain(Guid.Empty) + ); builder.Services.AddAllElasticApm(); builder.Services.AddHealthChecks(); builder.Services.AddCors(policy => { - policy.AddDefaultPolicy(builder => + policy.AddDefaultPolicy(cors => { - builder.WithOrigins("https://henrikml.dk") + cors.WithOrigins("https://henrikml.dk") .AllowAnyHeader(); }); }); diff --git a/Pushy/Pushy/Pushy.csproj b/Pushy/Pushy/Pushy.csproj index b4c3193..b6000ed 100644 --- a/Pushy/Pushy/Pushy.csproj +++ b/Pushy/Pushy/Pushy.csproj @@ -5,7 +5,6 @@ enable enable Linux - 13 d8fe2296-80f7-4812-b26a-ccaa6167a6e1 @@ -15,28 +14,26 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + - - .dockerignore - + diff --git a/Pushy/Pushy/wwwroot/app.tailwind.css b/Pushy/Pushy/wwwroot/app.tailwind.css index 5d0a9c6..2821ea1 100644 --- a/Pushy/Pushy/wwwroot/app.tailwind.css +++ b/Pushy/Pushy/wwwroot/app.tailwind.css @@ -625,13 +625,14 @@ html { } :root { - color-scheme: light; + color-scheme: dark; --in: 72.06% 0.191 231.6; --su: 64.8% 0.150 160; --wa: 84.71% 0.199 83.87; --er: 71.76% 0.221 22.18; - --pc: 89.824% 0.06192 275.75; - --ac: 15.352% 0.0368 183.61; + --pc: 13.138% 0.0392 275.75; + --sc: 14.96% 0.052 342.55; + --ac: 14.902% 0.0334 183.61; --inc: 0% 0 0; --suc: 0% 0 0; --wac: 0% 0 0; @@ -645,84 +646,15 @@ html { --border-btn: 1px; --tab-border: 1px; --tab-radius: 0.5rem; - --p: 49.12% 0.3096 275.75; - --s: 69.71% 0.329 342.55; - --sc: 98.71% 0.0106 342.55; - --a: 76.76% 0.184 183.61; - --n: 32.1785% 0.02476 255.701624; - --nc: 89.4994% 0.011585 252.096176; - --b1: 100% 0 0; - --b2: 96.1151% 0 0; - --b3: 92.4169% 0.00108 197.137559; - --bc: 27.8078% 0.029596 256.847952; -} - -@media (prefers-color-scheme: dark) { - :root { - color-scheme: dark; - --in: 72.06% 0.191 231.6; - --su: 64.8% 0.150 160; - --wa: 84.71% 0.199 83.87; - --er: 71.76% 0.221 22.18; - --pc: 13.138% 0.0392 275.75; - --sc: 14.96% 0.052 342.55; - --ac: 14.902% 0.0334 183.61; - --inc: 0% 0 0; - --suc: 0% 0 0; - --wac: 0% 0 0; - --erc: 0% 0 0; - --rounded-box: 1rem; - --rounded-btn: 0.5rem; - --rounded-badge: 1.9rem; - --animation-btn: 0.25s; - --animation-input: .2s; - --btn-focus-scale: 0.95; - --border-btn: 1px; - --tab-border: 1px; - --tab-radius: 0.5rem; - --p: 65.69% 0.196 275.75; - --s: 74.8% 0.26 342.55; - --a: 74.51% 0.167 183.61; - --n: 31.3815% 0.021108 254.139175; - --nc: 74.6477% 0.0216 264.435964; - --b1: 25.3267% 0.015896 252.417568; - --b2: 23.2607% 0.013807 253.100675; - --b3: 21.1484% 0.01165 254.087939; - --bc: 74.6477% 0.0216 264.435964; - } -} - -[data-theme=light] { - color-scheme: light; - --in: 72.06% 0.191 231.6; - --su: 64.8% 0.150 160; - --wa: 84.71% 0.199 83.87; - --er: 71.76% 0.221 22.18; - --pc: 89.824% 0.06192 275.75; - --ac: 15.352% 0.0368 183.61; - --inc: 0% 0 0; - --suc: 0% 0 0; - --wac: 0% 0 0; - --erc: 0% 0 0; - --rounded-box: 1rem; - --rounded-btn: 0.5rem; - --rounded-badge: 1.9rem; - --animation-btn: 0.25s; - --animation-input: .2s; - --btn-focus-scale: 0.95; - --border-btn: 1px; - --tab-border: 1px; - --tab-radius: 0.5rem; - --p: 49.12% 0.3096 275.75; - --s: 69.71% 0.329 342.55; - --sc: 98.71% 0.0106 342.55; - --a: 76.76% 0.184 183.61; - --n: 32.1785% 0.02476 255.701624; - --nc: 89.4994% 0.011585 252.096176; - --b1: 100% 0 0; - --b2: 96.1151% 0 0; - --b3: 92.4169% 0.00108 197.137559; - --bc: 27.8078% 0.029596 256.847952; + --p: 65.69% 0.196 275.75; + --s: 74.8% 0.26 342.55; + --a: 74.51% 0.167 183.61; + --n: 31.3815% 0.021108 254.139175; + --nc: 74.6477% 0.0216 264.435964; + --b1: 25.3267% 0.015896 252.417568; + --b2: 23.2607% 0.013807 253.100675; + --b3: 21.1484% 0.01165 254.087939; + --bc: 74.6477% 0.0216 264.435964; } [data-theme=dark] { @@ -758,6 +690,39 @@ html { --bc: 74.6477% 0.0216 264.435964; } +[data-theme=light] { + color-scheme: light; + --in: 72.06% 0.191 231.6; + --su: 64.8% 0.150 160; + --wa: 84.71% 0.199 83.87; + --er: 71.76% 0.221 22.18; + --pc: 89.824% 0.06192 275.75; + --ac: 15.352% 0.0368 183.61; + --inc: 0% 0 0; + --suc: 0% 0 0; + --wac: 0% 0 0; + --erc: 0% 0 0; + --rounded-box: 1rem; + --rounded-btn: 0.5rem; + --rounded-badge: 1.9rem; + --animation-btn: 0.25s; + --animation-input: .2s; + --btn-focus-scale: 0.95; + --border-btn: 1px; + --tab-border: 1px; + --tab-radius: 0.5rem; + --p: 49.12% 0.3096 275.75; + --s: 69.71% 0.329 342.55; + --sc: 98.71% 0.0106 342.55; + --a: 76.76% 0.184 183.61; + --n: 32.1785% 0.02476 255.701624; + --nc: 89.4994% 0.011585 252.096176; + --b1: 100% 0 0; + --b2: 96.1151% 0 0; + --b3: 92.4169% 0.00108 197.137559; + --bc: 27.8078% 0.029596 256.847952; +} + @media (hover:hover) { .label a:hover { --tw-text-opacity: 1; @@ -1572,11 +1537,6 @@ html { mask-image: url("data:image/svg+xml,%3Csvg width='24' height='24' stroke='black' viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cg transform-origin='center'%3E%3Ccircle cx='12' cy='12' r='9.5' fill='none' stroke-width='3' stroke-linecap='round'%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 12 12' to='360 12 12' dur='2s' repeatCount='indefinite'/%3E%3Canimate attributeName='stroke-dasharray' values='0,150;42,150;42,150' keyTimes='0;0.475;1' dur='1.5s' repeatCount='indefinite'/%3E%3Canimate attributeName='stroke-dashoffset' values='0;-16;-59' keyTimes='0;0.475;1' dur='1.5s' repeatCount='indefinite'/%3E%3C/circle%3E%3C/g%3E%3C/svg%3E"); } -.loading-spinner { - -webkit-mask-image: url("data:image/svg+xml,%3Csvg width='24' height='24' stroke='black' viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cg transform-origin='center'%3E%3Ccircle cx='12' cy='12' r='9.5' fill='none' stroke-width='3' stroke-linecap='round'%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 12 12' to='360 12 12' dur='2s' repeatCount='indefinite'/%3E%3Canimate attributeName='stroke-dasharray' values='0,150;42,150;42,150' keyTimes='0;0.475;1' dur='1.5s' repeatCount='indefinite'/%3E%3Canimate attributeName='stroke-dashoffset' values='0;-16;-59' keyTimes='0;0.475;1' dur='1.5s' repeatCount='indefinite'/%3E%3C/circle%3E%3C/g%3E%3C/svg%3E"); - mask-image: url("data:image/svg+xml,%3Csvg width='24' height='24' stroke='black' viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cg transform-origin='center'%3E%3Ccircle cx='12' cy='12' r='9.5' fill='none' stroke-width='3' stroke-linecap='round'%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 12 12' to='360 12 12' dur='2s' repeatCount='indefinite'/%3E%3Canimate attributeName='stroke-dasharray' values='0,150;42,150;42,150' keyTimes='0;0.475;1' dur='1.5s' repeatCount='indefinite'/%3E%3Canimate attributeName='stroke-dashoffset' values='0;-16;-59' keyTimes='0;0.475;1' dur='1.5s' repeatCount='indefinite'/%3E%3C/circle%3E%3C/g%3E%3C/svg%3E"); -} - :where(.menu li:not(.menu-title, .disabled) > *:not(ul, details, .menu-title)):not(summary, .active, .btn).focus, :where(.menu li:not(.menu-title, .disabled) > *:not(ul, details, .menu-title)):not(summary, .active, .btn):focus, :where(.menu li:not(.menu-title, .disabled) > *:not(ul, details, .menu-title)):is(summary):not(.active, .btn):focus-visible, :where(.menu li:not(.menu-title, .disabled) > details > summary:not(.menu-title)):not(summary, .active, .btn).focus, :where(.menu li:not(.menu-title, .disabled) > details > summary:not(.menu-title)):not(summary, .active, .btn):focus, :where(.menu li:not(.menu-title, .disabled) > details > summary:not(.menu-title)):is(summary):not(.active, .btn):focus-visible { cursor: pointer; background-color: var(--fallback-bc,oklch(var(--bc)/0.1)); @@ -2274,89 +2234,20 @@ html { display: none; } -.h-10 { - height: 2.5rem; -} - -.h-5\/6 { - height: 83.333333%; +.h-48 { + height: 12rem; } .h-full { height: 100%; } -.h-4\/6 { - height: 66.666667%; -} - -.h-\[64px\] { - height: 64px; -} - -.h-16 { - height: 4rem; -} - -.h-32 { - height: 8rem; -} - -.h-48 { - height: 12rem; -} - -.w-4 { - width: 1rem; -} - -.w-16 { - width: 4rem; -} - -.w-1\/2 { - width: 50%; -} - -.w-64 { - width: 16rem; -} - -.w-auto { - width: auto; -} - -.w-max { - width: -moz-max-content; - width: max-content; -} - -.w-10\/12 { - width: 83.333333%; -} - -.w-11\/12 { - width: 91.666667%; -} - -.w-8\/12 { - width: 66.666667%; -} - -.w-4\/12 { - width: 33.333333%; -} - .w-6\/12 { width: 50%; } -.w-8 { - width: 2rem; -} - -.flex-grow { - flex-grow: 1; +.w-auto { + width: auto; } .grow { @@ -2371,14 +2262,6 @@ html { flex-direction: column; } -.content-center { - align-content: center; -} - -.items-center { - align-items: center; -} - .justify-center { justify-content: center; } @@ -2401,10 +2284,6 @@ html { text-align: center; } -.align-middle { - vertical-align: middle; -} - .blur { --tw-blur: blur(8px); filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow); @@ -2412,26 +2291,4 @@ html { .filter { filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow); -} - -@media (min-width: 640px) { - .sm\:w-8\/12 { - width: 66.666667%; - } -} - -@media (min-width: 768px) { - .md\:w-4\/12 { - width: 33.333333%; - } - - .md\:w-8\/12 { - width: 66.666667%; - } -} - -@media (min-width: 1024px) { - .lg\:w-4\/12 { - width: 33.333333%; - } } \ No newline at end of file diff --git a/Pushy/tailwind.config.js b/Pushy/tailwind.config.js index 9372598..6f24af6 100644 --- a/Pushy/tailwind.config.js +++ b/Pushy/tailwind.config.js @@ -4,6 +4,9 @@ module.exports = { theme: { extend: {}, }, + daisyui: { + themes: ['dark', 'light'], + }, plugins: [ require('daisyui') ], -- 2.39.5 From a816f99118563da15047796e458be822a5bd1219 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 18:17:18 +0100 Subject: [PATCH 02/40] Include .git --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 454e524..8dd963f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base USER $APP_UID WORKDIR /app +EXPOSE 8080 FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release @@ -12,10 +13,10 @@ COPY ["Pushy/Pushy/Pushy.csproj", "Pushy/Pushy/"] COPY ["Pushy/Pushy.Client/Pushy.Client.csproj", "Pushy/Pushy.Client/"] COPY ["Pushy.Silo/Pushy.Silo.csproj", "Pushy.Silo/"] +COPY .git . RUN dotnet restore "Pushy.Silo/Pushy.Silo.csproj" RUN dotnet restore "Pushy/Pushy/Pushy.csproj" -COPY . . WORKDIR "/src/Pushy.Silo" RUN dotnet build "Pushy.Silo.csproj" -c $BUILD_CONFIGURATION -o /app/silo -- 2.39.5 From 8a22f1e159289a629b18284cf9b49e5c281e5244 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 18:20:31 +0100 Subject: [PATCH 03/40] undid explicit .git copy to whole folder copying --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8dd963f..a00fe49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ COPY ["Pushy/Pushy/Pushy.csproj", "Pushy/Pushy/"] COPY ["Pushy/Pushy.Client/Pushy.Client.csproj", "Pushy/Pushy.Client/"] COPY ["Pushy.Silo/Pushy.Silo.csproj", "Pushy.Silo/"] -COPY .git . +COPY . . RUN dotnet restore "Pushy.Silo/Pushy.Silo.csproj" RUN dotnet restore "Pushy/Pushy/Pushy.csproj" -- 2.39.5 From f9c7e69ca2a5216359da720464880ea3abe16c9c Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 18:28:28 +0100 Subject: [PATCH 04/40] Removed explicit copy --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a00fe49..086504e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,16 +13,15 @@ COPY ["Pushy/Pushy/Pushy.csproj", "Pushy/Pushy/"] COPY ["Pushy/Pushy.Client/Pushy.Client.csproj", "Pushy/Pushy.Client/"] COPY ["Pushy.Silo/Pushy.Silo.csproj", "Pushy.Silo/"] -COPY . . RUN dotnet restore "Pushy.Silo/Pushy.Silo.csproj" RUN dotnet restore "Pushy/Pushy/Pushy.csproj" WORKDIR "/src/Pushy.Silo" -RUN dotnet build "Pushy.Silo.csproj" -c $BUILD_CONFIGURATION -o /app/silo +RUN dotnet build "Pushy.Silo.csproj" --no-restore -c $BUILD_CONFIGURATION -o /app/silo WORKDIR "/src/Pushy/Pushy" -RUN dotnet build "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/pushy +RUN dotnet build "Pushy.csproj" --no-restore -c $BUILD_CONFIGURATION -o /app/pushy FROM build AS publish ARG BUILD_CONFIGURATION=Release -- 2.39.5 From bf89d63aeca2f9ac66ae37e78f271b72dc2a5852 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 18:30:34 +0100 Subject: [PATCH 05/40] Re-added explicit copy --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 086504e..0d107dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ COPY ["Pushy/Pushy/Pushy.csproj", "Pushy/Pushy/"] COPY ["Pushy/Pushy.Client/Pushy.Client.csproj", "Pushy/Pushy.Client/"] COPY ["Pushy.Silo/Pushy.Silo.csproj", "Pushy.Silo/"] +COPY . . RUN dotnet restore "Pushy.Silo/Pushy.Silo.csproj" RUN dotnet restore "Pushy/Pushy/Pushy.csproj" -- 2.39.5 From 1fb196bce1c2edf3435c48efe2cd60f7076fe8bc Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 19:06:55 +0100 Subject: [PATCH 06/40] Added gitversion config --- Dockerfile | 1 - GitVersion.yml | 4 ++++ Pushy.Silo/Pushy.Silo.csproj | 6 ------ 3 files changed, 4 insertions(+), 7 deletions(-) create mode 100644 GitVersion.yml diff --git a/Dockerfile b/Dockerfile index 0d107dd..2aae4e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,5 +37,4 @@ RUN dotnet publish "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/publish/pushy FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -RUN ls -la ENTRYPOINT ["dotnet"] diff --git a/GitVersion.yml b/GitVersion.yml new file mode 100644 index 0000000..4362375 --- /dev/null +++ b/GitVersion.yml @@ -0,0 +1,4 @@ +branches: + main: + regex: ^master$|^main$ + mode: ContinuousDelivery \ No newline at end of file diff --git a/Pushy.Silo/Pushy.Silo.csproj b/Pushy.Silo/Pushy.Silo.csproj index c58f821..2f8f33a 100644 --- a/Pushy.Silo/Pushy.Silo.csproj +++ b/Pushy.Silo/Pushy.Silo.csproj @@ -19,10 +19,4 @@ - - - - .dockerignore - - -- 2.39.5 From d1ae132076351bb784e25905c791822f4e7c69a1 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 19:14:03 +0100 Subject: [PATCH 07/40] Reverted gitversion config --- Pushy/Pushy/Pushy.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pushy/Pushy/Pushy.csproj b/Pushy/Pushy/Pushy.csproj index b6000ed..1e88feb 100644 --- a/Pushy/Pushy/Pushy.csproj +++ b/Pushy/Pushy/Pushy.csproj @@ -16,7 +16,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive -- 2.39.5 From 8108e5c7eaa4405ace42aa461863aef1d3bacddd Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 19:33:51 +0100 Subject: [PATCH 08/40] removed git version --- Pushy/Pushy/Pushy.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Pushy/Pushy/Pushy.csproj b/Pushy/Pushy/Pushy.csproj index 1e88feb..c7f2269 100644 --- a/Pushy/Pushy/Pushy.csproj +++ b/Pushy/Pushy/Pushy.csproj @@ -16,10 +16,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - -- 2.39.5 From d99ec3f0b7d4c2731682296942d10890119d0344 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 19:54:38 +0100 Subject: [PATCH 09/40] Updated Procfile --- .dokku/Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index b2087c2..03ad566 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: pushy/Pushy.dll +web: ls -la && pushy/Pushy.dll silo: silo/Pushy.Silo.dll \ No newline at end of file -- 2.39.5 From 8999be2b8af82ad93700402d4eb1b58d0cd4ad99 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 20:01:07 +0100 Subject: [PATCH 10/40] Updated Procfile --- .dokku/Procfile | 2 +- Dockerfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index 03ad566..b504143 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: ls -la && pushy/Pushy.dll +web: dotnet pushy/Pushy.dll silo: silo/Pushy.Silo.dll \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 2aae4e7..4f4fe9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,4 +37,3 @@ RUN dotnet publish "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/publish/pushy FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet"] -- 2.39.5 From 5586d29a2098bfc8c45e450791d64ebfbd737521 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 20:07:52 +0100 Subject: [PATCH 11/40] Updated Procfile --- .dokku/Procfile | 2 +- Dockerfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index b504143..b2087c2 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: dotnet pushy/Pushy.dll +web: pushy/Pushy.dll silo: silo/Pushy.Silo.dll \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 4f4fe9b..2aae4e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,3 +37,4 @@ RUN dotnet publish "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/publish/pushy FROM base AS final WORKDIR /app COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet"] -- 2.39.5 From ffbe6d9c04b7d242113ac2217bcfaeaba81ca6f6 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 20:14:32 +0100 Subject: [PATCH 12/40] Updated Procfile --- .dokku/Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index b2087c2..61e9368 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: pushy/Pushy.dll +web: /app/pushy/Pushy.dll silo: silo/Pushy.Silo.dll \ No newline at end of file -- 2.39.5 From 226d59089006aac26dfd8d55fee62632de0b105c Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 20:26:22 +0100 Subject: [PATCH 13/40] Updated Procfile --- .dokku/Procfile | 2 +- Dockerfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index 61e9368..6891140 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: /app/pushy/Pushy.dll +web: dotnet /app/pushy/Pushy.dll silo: silo/Pushy.Silo.dll \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 2aae4e7..4f4fe9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,4 +37,3 @@ RUN dotnet publish "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/publish/pushy FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet"] -- 2.39.5 From 65bd4e69dfc8ef935ec44c8fd7ae96cfbf643179 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 21:30:30 +0100 Subject: [PATCH 14/40] Updated Procfile --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 4f4fe9b..75e9c3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,3 +37,9 @@ RUN dotnet publish "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/publish/pushy FROM base AS final WORKDIR /app COPY --from=publish /app/publish . + +RUN LS -la +RUN LS -la silo +RUN LS -la pushy + +ENTRYPOINT ["dotnet"] -- 2.39.5 From fb3f5f36f1b7605a1ff53c6b806cbf10eb143472 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 21:35:03 +0100 Subject: [PATCH 15/40] Updated Procfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 75e9c3c..70bbcb6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,8 +38,8 @@ FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -RUN LS -la -RUN LS -la silo -RUN LS -la pushy +RUN ls -la +RUN ls -la silo +RUN ls -la pushy ENTRYPOINT ["dotnet"] -- 2.39.5 From 547413787a843bb31c3573df8d95bf773be1b3ad Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 21:41:44 +0100 Subject: [PATCH 16/40] Updated Dockerfile --- .dokku/Procfile | 2 +- Dockerfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index 6891140..b2087c2 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: dotnet /app/pushy/Pushy.dll +web: pushy/Pushy.dll silo: silo/Pushy.Silo.dll \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 70bbcb6..6b35d44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,6 +38,7 @@ FROM base AS final WORKDIR /app COPY --from=publish /app/publish . +RUN pwd RUN ls -la RUN ls -la silo RUN ls -la pushy -- 2.39.5 From adc86c0e96be76c5de8c7a01dfc1d1b3097822e2 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 21:49:55 +0100 Subject: [PATCH 17/40] Updated Dockerfile --- .dokku/Procfile | 2 +- Dockerfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index b2087c2..61e9368 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: pushy/Pushy.dll +web: /app/pushy/Pushy.dll silo: silo/Pushy.Silo.dll \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 6b35d44..0a92c0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,6 +39,7 @@ WORKDIR /app COPY --from=publish /app/publish . RUN pwd +RUN ls /app/pushy/Pushy.dll RUN ls -la RUN ls -la silo RUN ls -la pushy -- 2.39.5 From f554b520246c309b91ba00a437d23b0ed07e8c28 Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 21:55:33 +0100 Subject: [PATCH 18/40] Updated Dockerfile --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0a92c0c..d8d66c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,5 +43,3 @@ RUN ls /app/pushy/Pushy.dll RUN ls -la RUN ls -la silo RUN ls -la pushy - -ENTRYPOINT ["dotnet"] -- 2.39.5 From 97459ccd1d1fc32dac7d5689bdf8d37cfef7647f Mon Sep 17 00:00:00 2001 From: henrik Date: Fri, 13 Dec 2024 22:00:28 +0100 Subject: [PATCH 19/40] Updated Dockerfile --- .dokku/Procfile | 2 +- .idea/.idea.Pushy/.idea/vcs.xml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index 61e9368..6891140 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: /app/pushy/Pushy.dll +web: dotnet /app/pushy/Pushy.dll silo: silo/Pushy.Silo.dll \ No newline at end of file diff --git a/.idea/.idea.Pushy/.idea/vcs.xml b/.idea/.idea.Pushy/.idea/vcs.xml index 4c6280e..94a25f7 100644 --- a/.idea/.idea.Pushy/.idea/vcs.xml +++ b/.idea/.idea.Pushy/.idea/vcs.xml @@ -1,11 +1,5 @@ - - - - - - -- 2.39.5 From 2498c9525d6cc3ab29d1b6d13b5129eb4c5c7e78 Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 17:10:34 +0100 Subject: [PATCH 20/40] chore: Updated slnx project file --- Pushy.slnx | 8 ++++++-- Pushy/Pushy/Pushy.csproj | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Pushy.slnx b/Pushy.slnx index 5162cfc..29b46c9 100644 --- a/Pushy.slnx +++ b/Pushy.slnx @@ -1,4 +1,8 @@  - - + + + + + + \ No newline at end of file diff --git a/Pushy/Pushy/Pushy.csproj b/Pushy/Pushy/Pushy.csproj index c7f2269..b383ec2 100644 --- a/Pushy/Pushy/Pushy.csproj +++ b/Pushy/Pushy/Pushy.csproj @@ -28,8 +28,4 @@ - - - - -- 2.39.5 From ef3ab20fff188b93073ff6e3b0354569d87e12ea Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 19:56:52 +0100 Subject: [PATCH 21/40] ci: Adjustments to dockerfile --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d8d66c9..27f9937 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,6 +24,8 @@ RUN dotnet build "Pushy.Silo.csproj" --no-restore -c $BUILD_CONFIGURATION -o /ap WORKDIR "/src/Pushy/Pushy" RUN dotnet build "Pushy.csproj" --no-restore -c $BUILD_CONFIGURATION -o /app/pushy +COPY .dokku/Procfile /app/.dokku/Procfile + FROM build AS publish ARG BUILD_CONFIGURATION=Release @@ -37,9 +39,6 @@ RUN dotnet publish "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/publish/pushy FROM base AS final WORKDIR /app COPY --from=publish /app/publish . +COPY --from=publish /app/.dokku . -RUN pwd -RUN ls /app/pushy/Pushy.dll -RUN ls -la -RUN ls -la silo -RUN ls -la pushy +ENTRYPOINT ["dotnet"] -- 2.39.5 From 8dbdbca9a36284a1727dd6c547252d1c4bf7904b Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 20:03:57 +0100 Subject: [PATCH 22/40] ci: Adjustments to dockerfile --- .idea/.idea.Pushy/.idea/vcs.xml | 6 ++++++ Dockerfile | 2 ++ Pushy/Pushy.Client/Pushy.Client.csproj | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.idea/.idea.Pushy/.idea/vcs.xml b/.idea/.idea.Pushy/.idea/vcs.xml index 94a25f7..4c6280e 100644 --- a/.idea/.idea.Pushy/.idea/vcs.xml +++ b/.idea/.idea.Pushy/.idea/vcs.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/Dockerfile b/Dockerfile index 27f9937..73c631a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,4 +41,6 @@ WORKDIR /app COPY --from=publish /app/publish . COPY --from=publish /app/.dokku . +RUN ls -la + ENTRYPOINT ["dotnet"] diff --git a/Pushy/Pushy.Client/Pushy.Client.csproj b/Pushy/Pushy.Client/Pushy.Client.csproj index 606449b..2470933 100644 --- a/Pushy/Pushy.Client/Pushy.Client.csproj +++ b/Pushy/Pushy.Client/Pushy.Client.csproj @@ -7,7 +7,6 @@ true Default Linux - 13 -- 2.39.5 From fe80932db0803ef72eb336e1e48c3eb7bccab68d Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 20:24:26 +0100 Subject: [PATCH 23/40] ci: Adjustments to dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 73c631a..58c6849 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN dotnet publish "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/publish/pushy FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -COPY --from=publish /app/.dokku . +COPY --from=publish /app/.dokku /app/.dokku RUN ls -la -- 2.39.5 From 5e896e112c9073c7e2773ddd480057d3f974e63f Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 20:49:16 +0100 Subject: [PATCH 24/40] chore: Changed web to frontend --- .dokku/Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index 6891140..7c433ab 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: dotnet /app/pushy/Pushy.dll +frontend: dotnet /app/pushy/Pushy.dll silo: silo/Pushy.Silo.dll \ No newline at end of file -- 2.39.5 From 63c6a6f39336b6d97233ad342ff02caaea272312 Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 20:54:40 +0100 Subject: [PATCH 25/40] chore: Disabled healthcheck --- app.json => app.json.dis | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app.json => app.json.dis (100%) diff --git a/app.json b/app.json.dis similarity index 100% rename from app.json rename to app.json.dis -- 2.39.5 From 9276aa988c1ac4fe8d9604c34da8e37091752a07 Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 21:06:26 +0100 Subject: [PATCH 26/40] ci: Adjustments procfile --- .dokku/Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index 7c433ab..73c3d24 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -frontend: dotnet /app/pushy/Pushy.dll +frontend: /app/pushy/Pushy.dll silo: silo/Pushy.Silo.dll \ No newline at end of file -- 2.39.5 From f5ffd33bf8b0a46b2eb89bbabae474169e26821a Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 21:12:32 +0100 Subject: [PATCH 27/40] chore: Adjusted App.json --- app.json.dis => app.json | 8 ++++++++ 1 file changed, 8 insertions(+) rename app.json.dis => app.json (72%) diff --git a/app.json.dis b/app.json similarity index 72% rename from app.json.dis rename to app.json index 2dd532e..593296f 100644 --- a/app.json.dis +++ b/app.json @@ -1,4 +1,12 @@ { + "formation": { + "web": { + "quantity": 1 + }, + "silo": { + "quantity": 2 + } + }, "healthchecks": { "web": [ { -- 2.39.5 From 26e06766082a1589da202df92c3daf62d0161f48 Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 21:22:44 +0100 Subject: [PATCH 28/40] fix: Changed frontend back to web --- .dokku/Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index 73c3d24..61e9368 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -frontend: /app/pushy/Pushy.dll +web: /app/pushy/Pushy.dll silo: silo/Pushy.Silo.dll \ No newline at end of file -- 2.39.5 From 678fb6940529effb4464564c376a08e163caf45e Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 22:57:05 +0100 Subject: [PATCH 29/40] chore: Added possible missing component --- Pushy/Pushy/Components/App.razor | 3 ++- Pushy/Pushy/appsettings.json | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Pushy/Pushy/Components/App.razor b/Pushy/Pushy/Components/App.razor index ae06d9f..383a3e7 100644 --- a/Pushy/Pushy/Components/App.razor +++ b/Pushy/Pushy/Components/App.razor @@ -14,11 +14,12 @@ + - + @if (Agent.Configuration.Enabled && Environment.IsProduction()) { diff --git a/Pushy/Pushy/appsettings.json b/Pushy/Pushy/appsettings.json index 4359f0c..9e56493 100644 --- a/Pushy/Pushy/appsettings.json +++ b/Pushy/Pushy/appsettings.json @@ -7,8 +7,7 @@ } }, "AllowedHosts": "*", - "ElasticApm": - { + "ElasticApm": { "ServerUrl": "http://apm.home.local:8200", "TransactionNameGroups": "GET /t/*" } -- 2.39.5 From 995146f3d23b399207cc88d04488cceb11e478ed Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 23:32:51 +0100 Subject: [PATCH 30/40] chore: Test --project argument --- .dokku/Procfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index 61e9368..8c9bca4 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: /app/pushy/Pushy.dll -silo: silo/Pushy.Silo.dll \ No newline at end of file +web: --project /app/pushy /app/pushy/Pushy.dll +silo: --project /app/silo silo/Pushy.Silo.dll \ No newline at end of file -- 2.39.5 From 7de891ad0810de19874e9b40f5ffa26d413a42a9 Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 23:39:53 +0100 Subject: [PATCH 31/40] ci: Adjustments procfile --- .dokku/Procfile | 4 ++-- Dockerfile | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index 8c9bca4..0c8a501 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: --project /app/pushy /app/pushy/Pushy.dll -silo: --project /app/silo silo/Pushy.Silo.dll \ No newline at end of file +web: run --project /app/pushy /app/pushy/Pushy.dll +silo: run --project /app/silo silo/Pushy.Silo.dll \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 58c6849..eb3d9f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,6 +41,4 @@ WORKDIR /app COPY --from=publish /app/publish . COPY --from=publish /app/.dokku /app/.dokku -RUN ls -la - ENTRYPOINT ["dotnet"] -- 2.39.5 From 7c10b31b2db87c0d5df50370637569ebb4d63b48 Mon Sep 17 00:00:00 2001 From: henrik Date: Sun, 22 Dec 2024 23:56:13 +0100 Subject: [PATCH 32/40] ci: Adjustments procfile --- .dokku/Procfile | 4 ++-- .idea/.idea.Pushy/.idea/vcs.xml | 6 ------ Dockerfile | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.dokku/Procfile b/.dokku/Procfile index 0c8a501..c15cb4d 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: run --project /app/pushy /app/pushy/Pushy.dll -silo: run --project /app/silo silo/Pushy.Silo.dll \ No newline at end of file +web: cd /app/pushy && dotnet /app/pushy/Pushy.dll +silo: cd /app/silo && dotnet /app/silo/Pushy.Silo.dll \ No newline at end of file diff --git a/.idea/.idea.Pushy/.idea/vcs.xml b/.idea/.idea.Pushy/.idea/vcs.xml index 4c6280e..94a25f7 100644 --- a/.idea/.idea.Pushy/.idea/vcs.xml +++ b/.idea/.idea.Pushy/.idea/vcs.xml @@ -1,11 +1,5 @@ - - - - - - diff --git a/Dockerfile b/Dockerfile index eb3d9f4..dcd78ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,4 +41,3 @@ WORKDIR /app COPY --from=publish /app/publish . COPY --from=publish /app/.dokku /app/.dokku -ENTRYPOINT ["dotnet"] -- 2.39.5 From 9b022b296ab2be9a7f96b7be07296af5f24be95e Mon Sep 17 00:00:00 2001 From: henrik Date: Mon, 23 Dec 2024 00:48:26 +0100 Subject: [PATCH 33/40] feat: Adds experiment launch script --- .dokku/Procfile | 4 ++-- Dockerfile | 4 ++++ Pushy/Pushy/Pushy.csproj.DotSettings.user | 3 +++ run-silo.sh | 3 +++ run-web.sh | 3 +++ 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 Pushy/Pushy/Pushy.csproj.DotSettings.user create mode 100644 run-silo.sh create mode 100644 run-web.sh diff --git a/.dokku/Procfile b/.dokku/Procfile index c15cb4d..c2bcaf5 100644 --- a/.dokku/Procfile +++ b/.dokku/Procfile @@ -1,2 +1,2 @@ -web: cd /app/pushy && dotnet /app/pushy/Pushy.dll -silo: cd /app/silo && dotnet /app/silo/Pushy.Silo.dll \ No newline at end of file +web: run-web.sh +silo: run-silo.sh \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index dcd78ca..0e33bc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,6 +25,8 @@ 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 @@ -40,4 +42,6 @@ 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"] \ No newline at end of file diff --git a/Pushy/Pushy/Pushy.csproj.DotSettings.user b/Pushy/Pushy/Pushy.csproj.DotSettings.user new file mode 100644 index 0000000..1946bb7 --- /dev/null +++ b/Pushy/Pushy/Pushy.csproj.DotSettings.user @@ -0,0 +1,3 @@ + + + wwwroot\_framework\blazor.web.js \ No newline at end of file diff --git a/run-silo.sh b/run-silo.sh new file mode 100644 index 0000000..fe4507f --- /dev/null +++ b/run-silo.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +cd /app/silo +dotnet Pushy.Silo.dll \ No newline at end of file diff --git a/run-web.sh b/run-web.sh new file mode 100644 index 0000000..0114fbe --- /dev/null +++ b/run-web.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +cd /app/pushy +dotnet Pushy.dll \ No newline at end of file -- 2.39.5 From 7b5cb0267b19e5bcdadb0a386af103e4a0b25b61 Mon Sep 17 00:00:00 2001 From: henrik Date: Mon, 23 Dec 2024 01:06:30 +0100 Subject: [PATCH 34/40] feat: Adds APM to Silo & readded gitversion --- .idea/.idea.Pushy/.idea/vcs.xml | 6 ++++++ Pushy.Silo/Program.cs | 2 ++ Pushy.Silo/Pushy.Silo.csproj | 7 +++++++ Pushy.Silo/appsettings.json | 3 +++ Pushy/Pushy.Client/Pushy.Client.csproj | 2 +- Pushy/Pushy/Program.cs | 2 +- Pushy/Pushy/Pushy.csproj | 6 +++++- 7 files changed, 25 insertions(+), 3 deletions(-) diff --git a/.idea/.idea.Pushy/.idea/vcs.xml b/.idea/.idea.Pushy/.idea/vcs.xml index 94a25f7..4c6280e 100644 --- a/.idea/.idea.Pushy/.idea/vcs.xml +++ b/.idea/.idea.Pushy/.idea/vcs.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/Pushy.Silo/Program.cs b/Pushy.Silo/Program.cs index b46f95f..bae36e3 100644 --- a/Pushy.Silo/Program.cs +++ b/Pushy.Silo/Program.cs @@ -22,5 +22,7 @@ builder.UseOrleans(silo => }); }); +builder.Services.AddAllElasticApm(); + var host = builder.Build(); host.Run(); \ No newline at end of file diff --git a/Pushy.Silo/Pushy.Silo.csproj b/Pushy.Silo/Pushy.Silo.csproj index 2f8f33a..aa5f099 100644 --- a/Pushy.Silo/Pushy.Silo.csproj +++ b/Pushy.Silo/Pushy.Silo.csproj @@ -6,9 +6,16 @@ enable dotnet-Pushy.Silo-607fe096-6d3f-44f4-8e5d-8a2c875f8758 Linux + Pushy Silo + Henrik Lassen + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/Pushy.Silo/appsettings.json b/Pushy.Silo/appsettings.json index b2dcdb6..d7be3a4 100644 --- a/Pushy.Silo/appsettings.json +++ b/Pushy.Silo/appsettings.json @@ -4,5 +4,8 @@ "Default": "Information", "Microsoft.Hosting.Lifetime": "Information" } + }, + "ElasticApm": { + "ServerUrl": "http://apm.home.local:8200" } } diff --git a/Pushy/Pushy.Client/Pushy.Client.csproj b/Pushy/Pushy.Client/Pushy.Client.csproj index 2470933..f3eba12 100644 --- a/Pushy/Pushy.Client/Pushy.Client.csproj +++ b/Pushy/Pushy.Client/Pushy.Client.csproj @@ -11,7 +11,7 @@ - + diff --git a/Pushy/Pushy/Program.cs b/Pushy/Pushy/Program.cs index 84b8c3e..18974c3 100644 --- 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().GetGrain(Guid.Empty) ); -builder.Services.AddAllElasticApm(); builder.Services.AddHealthChecks(); builder.Services.AddCors(policy => diff --git a/Pushy/Pushy/Pushy.csproj b/Pushy/Pushy/Pushy.csproj index b383ec2..5a06ffe 100644 --- a/Pushy/Pushy/Pushy.csproj +++ b/Pushy/Pushy/Pushy.csproj @@ -16,13 +16,17 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + -- 2.39.5 From da2ff13c315bb3854cf7c6d00c43be6e132f781d Mon Sep 17 00:00:00 2001 From: henrik Date: Mon, 23 Dec 2024 01:12:21 +0100 Subject: [PATCH 35/40] chore: debugging build --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0e33bc8..aacb3f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,8 @@ COPY ["Pushy/Pushy.Client/Pushy.Client.csproj", "Pushy/Pushy.Client/"] COPY ["Pushy.Silo/Pushy.Silo.csproj", "Pushy.Silo/"] COPY . . +RUN ls -la + RUN dotnet restore "Pushy.Silo/Pushy.Silo.csproj" RUN dotnet restore "Pushy/Pushy/Pushy.csproj" -- 2.39.5 From 0eb8ee1a7f9165d8d25d9203f557b41418ced65d Mon Sep 17 00:00:00 2001 From: henrik Date: Mon, 23 Dec 2024 01:20:52 +0100 Subject: [PATCH 36/40] chore: Attempting downgrade of gitversion --- Pushy.Silo/Pushy.Silo.csproj | 2 +- Pushy/Pushy/Pushy.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Pushy.Silo/Pushy.Silo.csproj b/Pushy.Silo/Pushy.Silo.csproj index aa5f099..164f182 100644 --- a/Pushy.Silo/Pushy.Silo.csproj +++ b/Pushy.Silo/Pushy.Silo.csproj @@ -12,7 +12,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Pushy/Pushy/Pushy.csproj b/Pushy/Pushy/Pushy.csproj index 5a06ffe..77a8620 100644 --- a/Pushy/Pushy/Pushy.csproj +++ b/Pushy/Pushy/Pushy.csproj @@ -16,7 +16,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive -- 2.39.5 From e9194d199add0f5bc20c8204e55c9007a7342f90 Mon Sep 17 00:00:00 2001 From: henrik Date: Mon, 23 Dec 2024 01:28:27 +0100 Subject: [PATCH 37/40] chore: Updated gitversion yaml & dockerfile --- Dockerfile | 2 -- GitVersion.yml | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index aacb3f1..0e33bc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,6 @@ COPY ["Pushy/Pushy.Client/Pushy.Client.csproj", "Pushy/Pushy.Client/"] COPY ["Pushy.Silo/Pushy.Silo.csproj", "Pushy.Silo/"] COPY . . -RUN ls -la - RUN dotnet restore "Pushy.Silo/Pushy.Silo.csproj" RUN dotnet restore "Pushy/Pushy/Pushy.csproj" diff --git a/GitVersion.yml b/GitVersion.yml index 4362375..570a504 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,7 @@ branches: main: regex: ^master$|^main$ + mode: ContinuousDelivery + develop: + regex: ^develop$ mode: ContinuousDelivery \ No newline at end of file -- 2.39.5 From d65540a4497ecdcf74fcab7214304c80f9caeab6 Mon Sep 17 00:00:00 2001 From: henrik Date: Mon, 23 Dec 2024 01:33:48 +0100 Subject: [PATCH 38/40] chore: Attempt copying one level lower --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0e33bc8..4347e1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,8 @@ COPY ["Pushy/Pushy.Client/Pushy.Client.csproj", "Pushy/Pushy.Client/"] COPY ["Pushy.Silo/Pushy.Silo.csproj", "Pushy.Silo/"] COPY . . +COPY .git /src/Pushy/ + RUN dotnet restore "Pushy.Silo/Pushy.Silo.csproj" RUN dotnet restore "Pushy/Pushy/Pushy.csproj" -- 2.39.5 From 01c2864a550182f9fa355497a978aae82ca04adc Mon Sep 17 00:00:00 2001 From: henrik Date: Mon, 23 Dec 2024 01:36:23 +0100 Subject: [PATCH 39/40] chore: Additional Copy --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 4347e1b..13b4274 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ COPY ["Pushy.Silo/Pushy.Silo.csproj", "Pushy.Silo/"] COPY . . COPY .git /src/Pushy/ +COPY .git /src/Pushy.Silo/ RUN dotnet restore "Pushy.Silo/Pushy.Silo.csproj" RUN dotnet restore "Pushy/Pushy/Pushy.csproj" -- 2.39.5 From 4f1501d9fe94ba683ddea41ecae37b77ce2c47c0 Mon Sep 17 00:00:00 2001 From: henrik Date: Mon, 23 Dec 2024 13:29:09 +0100 Subject: [PATCH 40/40] chore: Removed Gitversion again --- Dockerfile | 3 --- Pushy.Silo/Pushy.Silo.csproj | 4 ---- Pushy/Pushy/Pushy.csproj | 4 ---- 3 files changed, 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 13b4274..0e33bc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,9 +15,6 @@ COPY ["Pushy/Pushy.Client/Pushy.Client.csproj", "Pushy/Pushy.Client/"] COPY ["Pushy.Silo/Pushy.Silo.csproj", "Pushy.Silo/"] COPY . . -COPY .git /src/Pushy/ -COPY .git /src/Pushy.Silo/ - RUN dotnet restore "Pushy.Silo/Pushy.Silo.csproj" RUN dotnet restore "Pushy/Pushy/Pushy.csproj" diff --git a/Pushy.Silo/Pushy.Silo.csproj b/Pushy.Silo/Pushy.Silo.csproj index 164f182..841adea 100644 --- a/Pushy.Silo/Pushy.Silo.csproj +++ b/Pushy.Silo/Pushy.Silo.csproj @@ -12,10 +12,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/Pushy/Pushy/Pushy.csproj b/Pushy/Pushy/Pushy.csproj index 77a8620..d2cedc3 100644 --- a/Pushy/Pushy/Pushy.csproj +++ b/Pushy/Pushy/Pushy.csproj @@ -16,10 +16,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - -- 2.39.5