Updated github workflows

Signed-off-by: Emil Balitzki <emil.balitzki@gmail.com>
amosproj · Jun 9, 2024 · 9e84eff · 9e84eff
1 parent 0728855
commit 9e84eff
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/.env b/.env
@@ -11,7 +11,10 @@ DOCKER_COMPOSE_IMAGES_TAG=test
 FRONTEND_HOST=frontend
 FRONTEND_PORT=80
 
-# Backend
+# Backend - API Gateway
+BACKEND_API_GATEWAY_PORT=8082
+
+# Backend - API Composer
 VITE_BACKEND_HOST=localhost
 VITE_BACKEND_PORT=8081
 

diff --git a/.env.production b/.env.production
@@ -11,7 +11,10 @@ DOCKER_COMPOSE_IMAGES_TAG=production
 FRONTEND_HOST=frontend
 FRONTEND_PORT=80
 
-# Backend
+# Backend - API Gateway
+BACKEND_API_GATEWAY_PORT=8082
+
+# Backend - API Composer
 VITE_BACKEND_HOST=prod.amos.b-ci.de
 VITE_BACKEND_PORT=8081
 

diff --git a/.env.test b/.env.test
@@ -11,7 +11,10 @@ DOCKER_COMPOSE_IMAGES_TAG=test
 FRONTEND_HOST=frontend
 FRONTEND_PORT=80
 
-# Backend
+# Backend - API Gateway
+BACKEND_API_GATEWAY_PORT=8082
+
+# Backend - API Composer
 VITE_BACKEND_HOST=test.amos.b-ci.de
 VITE_BACKEND_PORT=8081
 

diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
@@ -40,6 +40,7 @@ jobs:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-frontend
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-api-gateway
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-api-composer
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-datapipeline
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-sql-database
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-metadata-database

diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml
@@ -40,6 +40,7 @@ jobs:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-frontend
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-api-gateway
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-api-composer
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-datapipeline
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-sql-database
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-metadata-database

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,13 +13,27 @@ services:
     ports:
       - ${FRONTEND_PORT}:${FRONTEND_PORT}
 
-  # API Gateway for listening for FE requests
+  # API Gateway for listening for the FE requests
   api-gateway:
     build:
-      context: ./backend/src/BIE.Core
+      context: ./backend/api-gateway
       dockerfile: Dockerfile
     container_name: api-gateway
     image: ghcr.io/amosproj/amos2024ss04-building-information-enhancer-api-gateway:${DOCKER_COMPOSE_IMAGES_TAG}
+    environment:
+      - ASPNETCORE_ENVIRONMENT=${ENVIRONMENT_STAGE}
+    ports:
+      - ${BACKEND_API_GATEWAY_PORT}:8080
+    networks:
+      - bie-network
+
+  # API Composer for composing the FE requests
+  api-composer:
+    build:
+      context: ./backend/src/BIE.Core
+      dockerfile: Dockerfile
+    container_name: api-composer
+    image: ghcr.io/amosproj/amos2024ss04-building-information-enhancer-api-composer:${DOCKER_COMPOSE_IMAGES_TAG}
     environment:
       - ASPNETCORE_ENVIRONMENT=${ENVIRONMENT_STAGE}
       - DB_NAME=${SQL_DB_NAME}