Merge pull request #117 from Arquisoft/e2eDeployHotfix

E2e deploy hotfix
Arquisoft · Apr 15, 2024 · 0b39a0f · 0b39a0f
2 parents 8b1c043 + 0cef668
commit 0b39a0f
Show file tree

Hide file tree

Showing 5 changed files with 20,582 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,15 +37,17 @@ jobs:
     - run: npm --prefix users/userservice install
     - run: npm --prefix gatewayservice install
     - run: npm --prefix webapp install
-    - run: npm --prefix webapp run build
-    - run: npm --prefix webapp run test:e2e
+    - run: CI=false npm --prefix webapp run build
+    - run: CI=true npm --prefix webapp run test:e2e
+
   docker-push-webapp:
     name: Push webapp Docker Image to GitHub Packages
     runs-on: ARM64
     permissions:
       contents: read
       packages: write
     needs: [e2e-tests]
+    # needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -66,6 +68,7 @@ jobs:
               contents: read
               packages: write
             needs: [e2e-tests]
+            # needs: [unit-tests]
             steps:
             - uses: actions/checkout@v4
             - name: Publish to Registry
@@ -83,6 +86,7 @@ jobs:
       contents: read
       packages: write
     needs: [e2e-tests]
+    # needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -100,6 +104,7 @@ jobs:
       contents: read
       packages: write
     needs: [e2e-tests]
+    # needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -117,6 +122,7 @@ jobs:
       contents: read
       packages: write
     needs: [e2e-tests]
+    # needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -48,12 +48,14 @@ services:
     build: ./questionservice
     depends_on:
       - mongodb
+      - userservice
     ports:
       - "8010:8010"
     networks:
       - mynetwork
     environment:
       MONGODB_URI: mongodb://mongodb:27017/userdb
+      USER_SERVICE_URL: http://userservice:8001
     # platform: linux/arm64
   gatewayservice:
     container_name: gatewayservice-${teamname:-defaultASW}
@@ -83,14 +85,14 @@ services:
     depends_on:
       - gatewayservice
     ports:
-      - "3000:3000" 
+      - "80:80" 
     # platform: linux/arm64
 
 
   prometheus:
     image: prom/prometheus
     container_name: prometheus-${teamname:-defaultASW}
-    profiles: ["dev"]
+    profiles: ["dev","prod"]
     networks:
       - mynetwork
     volumes:
@@ -105,7 +107,7 @@ services:
   grafana:
     image: grafana/grafana
     container_name: grafana-${teamname:-defaultASW}
-    profiles: ["dev"]
+    profiles: ["dev","prod"]
     networks:
       - mynetwork
     volumes:

diff --git a/gatewayservice/monitoring/prometheus/prometheus.yml b/gatewayservice/monitoring/prometheus/prometheus.yml
@@ -1,6 +1,6 @@
 global:
   scrape_interval: 5s
 scrape_configs:
-  - job_name: "example-nodejs-app"
+  - job_name: "WIQ"
     static_configs:
       - targets: ["gatewayservice:8000"]