Merge pull request #111 from Arquisoft/build_sergiollende

Docker files changes for deployment
Arquisoft · Mar 14, 2024 · 50d7b27 · 50d7b27
2 parents 8034a8d + 07c0d1a
commit 50d7b27
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,9 +21,9 @@ jobs:
 
     - run: npm --prefix gatewayservice ci
     - run: npm --prefix webapp ci
-    - run: dotnet build ./wikidata_service/WikiDataTest/WikiDataTest.csproj
     - run: npm --prefix authservice ci
     - run: npm --prefix userservice ci
+    - run: dotnet build ./wikidata_service/WikidataService.csproj
 
     - run: npm --prefix gatewayservice test -- --coverage
     - run: npm --prefix webapp test -- --coverage

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,25 +5,6 @@ on:
     types: [published]
 
 jobs:
-  docker-push-wikidata-service:
-    name: Push wikidata Docker Image to GitHub Packages
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-    - uses: actions/checkout@v4
-    - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@v5
-      env:
-        API_URI: http://${{ secrets.DEPLOY_HOST }}:7259
-      with:
-          name: arquisoft/wiq_en3a/wikidata_service
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: ghcr.io
-          workdir: wikidata_service
-          buildargs: API_URI
   docker-push-webapp:
     name: Push webapp Docker Image to GitHub Packages
     runs-on: ubuntu-latest
@@ -43,8 +24,8 @@ jobs:
           registry: ghcr.io
           workdir: webapp
           buildargs: API_URI
-  docker-push-authservice:
-    name: Push auth service Docker Image to GitHub Packages
+  docker-push-wikidata-service:
+    name: Push wikidata Docker Image to GitHub Packages
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -54,11 +35,27 @@ jobs:
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@v5
       with:
-          name: arquisoft/wiq_en3a/authservice
+          name: arquisoft/wiq_en3a/wikidata_service
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: ghcr.io
-          workdir: users/authservice
+          workdir: wikidata_service
+  docker-push-authservice:
+      name: Push auth service Docker Image to GitHub Packages
+      runs-on: ubuntu-latest
+      permissions:
+        contents: read
+        packages: write
+      steps:
+      - uses: actions/checkout@v4
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@v5
+        with:
+            name: arquisoft/wiq_en3a/authservice
+            username: ${{ github.actor }}
+            password: ${{ secrets.GITHUB_TOKEN }}
+            registry: ghcr.io
+            workdir: users/authservice
   docker-push-userservice:
     name: Push user service Docker Image to GitHub Packages
     runs-on: ubuntu-latest
@@ -106,4 +103,4 @@ jobs:
           wget https://raw.githubusercontent.com/arquisoft/wiq_en3a/master/docker-compose.yml -O docker-compose.yml
           wget https://raw.githubusercontent.com/arquisoft/wiq_en3a/master/.env
           docker compose down
-          docker compose --profile prod up -d
+          docker compose --profile prod up -d --pull always
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -66,6 +66,8 @@ services:
     environment:
       AUTH_SERVICE_URL: http://authservice:8002
       USER_SERVICE_URL: http://userservice:8001
+      WIKIDATA_SERVICE_URL: http://wikidata_service:7259
+
 
   webapp:
     container_name: webapp-${teamname:-defaultASW}