asdf

SnowSE · Mar 18, 2024 · 095dfa8 · 095dfa8
1 parent 49ed346
commit 095dfa8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 27 deletions.
diff --git 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
     
diff --git 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
@@ -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
diff --git a/BryceDocker/docker-compose.yml b/BryceDocker/docker-compose.yml
@@ -10,15 +10,15 @@ services:
     networks:
       - otel
 
-# try to work
+
   bryceblazorapp:
     build: ..
     ports:
       - 8085:8080
     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
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ @@
         public Home()
         {
+            return;
         }
         public string QRByte = "place holder";
@@ Expand Down @@