Removing unnecesary external IPs and undo git flows to previous state

Arquisoft · Mar 2, 2024 · 28caf39 · 28caf39
1 parent 86e7521
commit 28caf39
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,8 +23,8 @@ jobs:
     - run: npm --prefix users/userservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage
     - run: npm --prefix webapp test -- --coverage
-#    - name: Analyze with SonarCloud
-#      uses: sonarsource/sonarcloud-github-action@master
-#      env:
-#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+    - name: Analyze with SonarCloud
+      uses: sonarsource/sonarcloud-github-action@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,8 +3,6 @@ name: Deploy on release
 on:
   release:
     types: [published]
-  pull_request:
-    types: [opened, synchronize, reopened]
 
 jobs:
   unit-tests:
@@ -22,11 +20,11 @@ jobs:
     - run: npm --prefix users/userservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage
     - run: npm --prefix webapp test -- --coverage
-#    - name: Analyze with SonarCloud
-#      uses: sonarsource/sonarcloud-github-action@master
-#      env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+    - name: Analyze with SonarCloud
+      uses: sonarsource/sonarcloud-github-action@master
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
   e2e-tests:
     needs: [unit-tests]
     runs-on: ubuntu-latest

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -53,8 +53,8 @@ services:
     networks:
       - mynetwork
     environment:
-      AUTH_SERVICE_URL: http://${WIQ_EXTERNAL_DNS_NAME_OR_IP:-authservice}:8002
-      USER_SERVICE_URL: http://${WIQ_EXTERNAL_DNS_NAME_OR_IP:-userservice}:8001
+      AUTH_SERVICE_URL: http://authservice:8002
+      USER_SERVICE_URL: http://userservice:8001
 
   webapp:
     container_name: webapp-${teamname:-defaultASW}