From a3782d9c14c8c2291c4631965e13fef4fb13c7d2 Mon Sep 17 00:00:00 2001
From: Hussein Martinez <husse.dev@gmail.com>
Date: Thu, 8 Aug 2024 12:19:29 +0300
Subject: [PATCH] fix: deploy-do-web issue with secrets

---
 .github/workflows/deploy-do-web.yml | 30 +++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deploy-do-web.yml b/.github/workflows/deploy-do-web.yml
index 8735046a..86d374a7 100644
--- a/.github/workflows/deploy-do-web.yml
+++ b/.github/workflows/deploy-do-web.yml
@@ -1,6 +1,9 @@
 name: Deploy DO Web
 
-on: workflow_dispatch
+on:
+  pull_request:
+    branches:
+      - main
 
 env:
   FILENAME: Dockerfile.web
@@ -14,11 +17,22 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Build the Docker image
-        run: docker build -f "$FILENAME" -t "$IMAGE_NAME:$IMAGE_TAG" . # build the Docker image using envs defined above
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
-      # login to dockerhub then push the image to the dockerhub repo
-      - name: Push Docker image
-        run: |-
-          echo ${{secrets.DOCKERHUB_PASS}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
-          docker push "$IMAGE_NAME:$IMAGE_TAG"
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: "$IMAGE_NAME:$IMAGE_TAG"
+          file: "./src/$FILENAME"
+          context: .