Revert "refactor github actions (#1036)" (#1037)

This reverts commit afa78bb.
unstructuredstudio · Dec 19, 2023 · 5695428 · 5695428
1 parent afa78bb
commit 5695428
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 155 deletions.
diff --git a/.github/workflows/.checkout.yml b/.github/workflows/.checkout.yml
diff --git a/.github/workflows/.docker_build_and_push.yml b/.github/workflows/.docker_build_and_push.yml
diff --git a/.github/workflows/.scp_action.yml b/.github/workflows/.scp_action.yml
diff --git a/.github/workflows/.ssh_action.yml b/.github/workflows/.ssh_action.yml
diff --git a/.github/workflows/build_deploy_backend.yml b/.github/workflows/build_deploy_backend.yml
@@ -13,43 +13,81 @@ on:
   workflow_dispatch:
 
 jobs:
-  build_and_push:
+  build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        service: ['web', 'celery', 'media']
     steps:
-      - uses: unstructuredstudio/zubhub/.github/workflows/.checkout.yml@master
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Checkout files
+        uses: actions/checkout@v2
+
+      - name: Build and push django api
+        id: docker_build_web
+        uses: docker/build-push-action@v2
+        with:
+          context: ./zubhub_backend/
+          file: ./zubhub_backend/compose/web/prod/Dockerfile
+          push: true
+          tags: unstructuredstudio/zubhub-services_web:latest
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
+
+      - name: Build and push celery worker
+        id: docker_build_celery
+        uses: docker/build-push-action@v2
+        with:
+          context: ./zubhub_backend/
+          file: ./zubhub_backend/compose/celery/prod/Dockerfile
+          push: true
+          tags: unstructuredstudio/zubhub-services_celery:latest
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
 
-      - name: Build and push ${{ matrix.service }}
-        uses: unstructuredstudio/zubhub/.github/workflows/.docker_build_and_push.yml@master
+      - name: Build and push media service
+        id: docker_build_media
+        uses: docker/build-push-action@v2
         with:
           context: ./zubhub_backend/
-          file: ./zubhub_backend/compose/${{ matrix.service }}/prod/Dockerfile
+          file: ./zubhub_backend/compose/media/prod/Dockerfile
           push: true
-          tags: unstructuredstudio/zubhub-services_${{ matrix.service }}:latest
-        secrets: inherit
+          tags: unstructuredstudio/zubhub-services_media:latest
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
 
   deploy:
-    needs: build_and_push
+    needs: build
     runs-on: ubuntu-latest
 
     steps:
-      - uses: unstructuredstudio/zubhub/.github/workflows/.checkout.yml@master
+      - uses: actions/checkout@v1
 
-      - uses: unstructuredstudio/zubhub/.github/workflows/.scp_action.yml@master
+      - name: Copy file via scp
+        uses: appleboy/scp-action@master
         with:
+          host: ${{ secrets.DO_BACKEND_HOST }}
+          username: ${{ secrets.DO_BACKEND_USERNAME }}
+          key: ${{ secrets.DO_SSHKEY }}
           source: "."
           target: "/home/zubhub-services/zubhub"
-        secrets: inherit
 
-      - uses: unsctructuredstudio/zubhub/.github/workflows/.ssh_action.yml@master
+      - name: Executing remote  command
+        uses: appleboy/ssh-action@master
         with:
+          host: ${{ secrets.DO_BACKEND_HOST }}
+          username: ${{ secrets.DO_BACKEND_USERNAME }}
+          key: ${{ secrets.DO_SSHKEY }}
           script: |
             cp /home/zubhub-services/zubhub/zubhub_backend/compose/deploy_backend.sh /home/zubhub-services/
             sudo bash /home/zubhub-services/deploy_backend.sh
             doctl compute droplet list 'zubhub-services*' > droplets.txt
             droplets_count=`wc -l < droplets.txt`
             rm droplets.txt
             docker service scale zubhub-services_web=$(($droplets_count - 1))
-        secrets: inherit
diff --git a/.github/workflows/build_deploy_docs.yml b/.github/workflows/build_deploy_docs.yml
@@ -11,8 +11,8 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
         with:
           python-version: "3.x"
       - run: |

diff --git a/.github/workflows/build_deploy_frontend.yml b/.github/workflows/build_deploy_frontend.yml
@@ -17,21 +17,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Checkout files
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v2
         with:
           context: ./zubhub_frontend/zubhub/
           file: ./zubhub_frontend/zubhub/Dockerfile.prod
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v1
 
       - name: Copy file via scp
         uses: appleboy/scp-action@master

diff --git a/.github/workflows/build_locust.yml b/.github/workflows/build_locust.yml
@@ -23,21 +23,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Checkout files
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Build and push locust
         id: docker_build_locust
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v2
         with:
           context: ./locust/
           file: ./locust/Dockerfile

diff --git a/.github/workflows/create_destroy_test_vm.yaml b/.github/workflows/create_destroy_test_vm.yaml
@@ -47,7 +47,7 @@ jobs:
 # See https://stackoverflow.com/questions/74957218/what-is-the-difference-between-pull-request-and-pull-request-target-event-in-git
 # See https://dev.to/suzukishunsuke/secure-github-actions-by-pullrequesttarget-641#:~:text=pull_request_target%20is%20one%20of%20the,the%20pull%20request's%20base%20branch.
       - name: Checkout source branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           ref: ${{ env.CHECKOUT_COMMIT_REF }}
           repository: ${{ env.CHECKOUT_REPO }}
@@ -148,7 +148,7 @@ jobs:
 # See https://stackoverflow.com/questions/74957218/what-is-the-difference-between-pull-request-and-pull-request-target-event-in-git
 # See https://dev.to/suzukishunsuke/secure-github-actions-by-pullrequesttarget-641#:~:text=pull_request_target%20is%20one%20of%20the,the%20pull%20request's%20base%20branch.
       - name: Checkout source branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           ref: ${{ env.CHECKOUT_COMMIT_REF }}
           repository: ${{ env.CHECKOUT_REPO }}
@@ -175,20 +175,20 @@ jobs:
           EOF
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push ${{ matrix.service }}
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v2
         with:
           # for frontend, context is ./zubhub_frontend/zubhub/
           # for backend services, context is ./zubhub_backend/

diff --git a/zubhub_backend/docker-compose.prod.yml b/zubhub_backend/docker-compose.prod.yml
@@ -95,20 +95,20 @@ services:
     depends_on:
       - rabbitmq
 
-  # prometheus:
-  #   image: prom/prometheus
-  #   command:
-  #     - --config.file=/etc/prometheus/prometheus.yml
-  #   deploy:
-  #     replicas: 1
-  #     restart_policy:
-  #       condition: on-failure
-  #     placement:
-  #       max_replicas_per_node: 1
-  #       constraints:
-  #         - "node.role==manager"
-  #   volumes:
-  #     - ./compose/prometheus.yml:/etc/prometheus/prometheus.yml:ro
+  prometheus:
+    image: prom/prometheus
+    command:
+      - --config.file=/etc/prometheus/prometheus.yml
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
+      placement:
+        max_replicas_per_node: 1
+        constraints:
+          - "node.role==manager"
+    volumes:
+      - ./compose/prometheus.yml:/etc/prometheus/prometheus.yml:ro
 
 secrets:
   zubhub_services_secrets: