From 095dfa839e8b98cd728352a67fea661d6865c210 Mon Sep 17 00:00:00 2001 From: brycecoon <112597142+brycecoon@users.noreply.github.com> Date: Mon, 18 Mar 2024 11:08:59 -0600 Subject: [PATCH] asdf --- .github/workflows/brycerunner.yml | 4 ++++ BlazorTickets/Components/Pages/Home.razor | 2 +- BlazorTickets/Program.cs | 24 ---------------------- BryceDocker.zip | Bin 0 -> 8586 bytes BryceDocker/docker-compose.yml | 4 ++-- 5 files changed, 7 insertions(+), 27 deletions(-) create mode 100644 BryceDocker.zip diff --git a/.github/workflows/brycerunner.yml b/.github/workflows/brycerunner.yml index 4e475c2..f958e6e 100644 --- a/.github/workflows/brycerunner.yml +++ b/.github/workflows/brycerunner.yml @@ -39,4 +39,8 @@ jobs: needs: ${{ toJson(needs) }} job: ${{ toJson(job) }} steps: ${{ toJson(steps) }} + + - name: "Deploy to Server" + run: | + scp -r ./ticketsrus-aaron-bryce-carlos/BryceDocker username@server:/path/to/destination \ No newline at end of file diff --git a/BlazorTickets/Components/Pages/Home.razor b/BlazorTickets/Components/Pages/Home.razor index 406ef8a..9d87e1e 100644 --- a/BlazorTickets/Components/Pages/Home.razor +++ b/BlazorTickets/Components/Pages/Home.razor @@ -31,7 +31,7 @@ public Home() { - + return; } public string QRByte = "place holder"; diff --git a/BlazorTickets/Program.cs b/BlazorTickets/Program.cs index 12c9c4d..d286157 100644 --- a/BlazorTickets/Program.cs +++ b/BlazorTickets/Program.cs @@ -6,19 +6,12 @@ using Microsoft.AspNetCore.Diagnostics.HealthChecks; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Diagnostics.HealthChecks; -<<<<<<< HEAD using Microsoft.Extensions.Logging; using OpenTelemetry; using OpenTelemetry.Logs; using OpenTelemetry.Metrics; using OpenTelemetry.Resources; using OpenTelemetry.Trace; -======= -//using OpenTelemetry.Logs; -//using OpenTelemetry.Metrics; -//using OpenTelemetry.Resources; -//using OpenTelemetry.Trace; ->>>>>>> 66b01ab1230c00046ec42d5b2d49ae1a2c7ce667 using TicketLibrary.Services; var builder = WebApplication.CreateBuilder(args); @@ -40,7 +33,6 @@ builder.Services.AddHealthChecks(); builder.Services.AddLogging(); -<<<<<<< HEAD const string serviceName = "bryceservice"; var serviceVersion = "1.0.0"; @@ -55,22 +47,6 @@ o.Endpoint = new Uri("http://otel-collector:4317") ); }); -======= -//const string serviceName = "bryceservice"; - -//builder.Logging.AddOpenTelemetry(options => -//{ -// options -// .SetResourceBuilder( -// ResourceBuilder.CreateDefault() -// .AddService(serviceName)) -// .AddOtlpExporter(opt => -// { -// opt.Endpoint = new Uri("http://otel-collector:4317/"); -// }) -// .AddConsoleExporter(); -//}); ->>>>>>> 66b01ab1230c00046ec42d5b2d49ae1a2c7ce667 builder.Services.AddOpenTelemetry() .ConfigureResource(r => r.AddService(serviceName)) diff --git a/BryceDocker.zip b/BryceDocker.zip new file mode 100644 index 0000000000000000000000000000000000000000..2972da1b507359c0545716af5d8144c6a994eaa6 GIT binary patch literal 8586 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 literal 0 HcmV?d00001 diff --git a/BryceDocker/docker-compose.yml b/BryceDocker/docker-compose.yml index ecb66dc..ab20d94 100644 --- a/BryceDocker/docker-compose.yml +++ b/BryceDocker/docker-compose.yml @@ -10,7 +10,7 @@ services: networks: - otel -# try to work + bryceblazorapp: build: .. ports: @@ -18,7 +18,7 @@ services: environment: - "Postgres=Server=brycecooldb;Database=postgres;Port=5432;User id=postgres;Password=postgres;" healthcheck: - test: curl --fail http://localhost:8085/health || exit 1 + test: curl --fail http://host.docker.internal:8085/health || exit 1 interval: 60s retries: 5 start_period: 20s