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 0000000..2972da1 Binary files /dev/null and b/BryceDocker.zip differ 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