Merge branch 'master' of https://github.com/SnowSE/ticketsrus-aaron-b…

…ryce-carlos
SnowSE · Feb 17, 2024 · e1a012f · e1a012f
2 parents f9580ee + 4011c6c
commit e1a012f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 114 deletions.
diff --git a/StagingCarlos/carlosMAUIApp.dockerfile b/StagingCarlos/carlosMAUIApp.dockerfile
diff --git a/StagingCarlos/carlosWebApp.dockerfile b/StagingCarlos/carlosWebApp.dockerfile
diff --git a/StagingCarlos/docker-compose.yml b/StagingCarlos/docker-compose.yml
@@ -6,7 +6,7 @@ networks:
 
 services:
 
-  postgresql:
+  carlosdb:
     image: postgres
     container_name: postgresql
     restart: always
@@ -19,36 +19,18 @@ services:
     networks:
       - Tunnel
     volumes:
-      - ./StagingCarlos/init.sql:/docker-entrypoint-initdb.d/init.sql
+      - ../TestTicket/20240215.01.21.01.sql:/docker-entrypoint-initdb.d/init.sql
 
   blazor:
    container_name: blazor
    depends_on:
-     - postgresql
-   build:
-     context: ./
-     dockerfile: carlosWebApp.dockerfile
+     - carlosdb
+   build: ..
    environment:
      - ASPNETCORE_ENVIRONMENT=Production
-     - Postgres=Host=postgresql;Database=postgres;Port=5432;User ID=ticketuser;Password=P@ssword1
+     - Postgres=Server=carlosdb;Database=postgres;Port=5432;User ID=ticketuser;Password=P@ssword1
    ports:
-     - "8080:8080" 
-   networks:
-     - Tunnel
-
-  maui:
-   container_name: maui_app
-   depends_on:
-     - postgresql
-     - blazor
-   build:
-     context: ./
-     dockerfile: carlosMAUIApp.dockerfile
-   environment:
-     - ASPNETCORE_ENVIRONMENT=Production
-     - Postgres=Host=postgresql;Database=postgres;Port=5432;User ID=ticketuser;Password=P@ssword1
-   ports:
-     - "8081:8080" 
+     - "5454:8080" 
    networks:
      - Tunnel
 
diff --git a/StagingCarlos/init.sql b/StagingCarlos/init.sql