working on deploy.yml

Author: minhhoccode111

.github/workflows/deploy.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: 'yarn'
+          cache: "yarn"
 
       - name: Install dependencies
         run: yarn install --frozen-lockfile
@@ -35,12 +35,43 @@ jobs:
       - name: Check types
         run: yarn check-types
 
-  deploy:
+  build-and-push:
     runs-on: ubuntu-latest
     needs: ci
     environment: production
 
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: release
+
+      - name: Login to Docker Hub
+        run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
+
+      - name: Build and push Docker image
+        run: |
+          docker build \
+            --build-arg VITE_APP_API_URL=${{ secrets.VITE_APP_API_URL }} \
+            --build-arg VITE_APP_APP_URL=${{ secrets.VITE_APP_APP_URL }} \
+            -t ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.APP_NAME }}:latest \
+            .
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.APP_NAME }}:latest
+
+      - name: Logout from Docker Hub
+        run: docker logout
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build-and-push
+    environment: production
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: release
+
       - name: Add VPS to known hosts
         run: |
           mkdir -p ~/.ssh
@@ -52,47 +83,43 @@ jobs:
           SSH_PORT: ${{ secrets.SSH_PORT }}
           VPS_HOST: ${{ secrets.VPS_HOST }}
           APP_NAME: ${{ secrets.APP_NAME }}
-          REPO_PATH: ${{ secrets.REPO_PATH }}
-          VITE_APP_API_URL: ${{ secrets.VITE_APP_API_URL }}
-          VITE_APP_APP_URL: ${{ secrets.VITE_APP_APP_URL }}
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           NGINX_SITE_NAME: ${{ secrets.NGINX_SITE_NAME }}
         run: |
           mkdir -p ~/.ssh
           echo "$SSH_PRIVATE_KEY" > ~/.ssh/deploy_key
           chmod 600 ~/.ssh/deploy_key
 
+          # Copy nginx-host.conf to VPS for comparison
+          scp -P $SSH_PORT -i ~/.ssh/deploy_key nginx/nginx-host.conf deploy@$VPS_HOST:/tmp/nginx-host.conf.new
+
           ssh -p $SSH_PORT -i ~/.ssh/deploy_key deploy@$VPS_HOST << EOF
             set -e
 
-            # Navigate to repo directory
-            cd $REPO_PATH
-
-            # Checkout and pull release branch
-            git checkout release
-            git pull origin release --rebase
-
-            # Build the project with Docker
-            docker build \
-              --build-arg VITE_APP_API_URL=$VITE_APP_API_URL \
-              --build-arg VITE_APP_APP_URL=$VITE_APP_APP_URL \
-              -o dist .
+            # Pull the latest Docker image
+            docker pull $DOCKERHUB_USERNAME/$APP_NAME:latest
 
-            # Move entire dist directory to web location for clean deployment
-            sudo rm -rf /var/www/$APP_NAME/dist
-            sudo mv dist /var/www/$APP_NAME/
+            # Stop and remove old container if exists
+            docker stop $APP_NAME 2>/dev/null || true
+            docker rm $APP_NAME 2>/dev/null || true
 
-            # Make the file globally readable
-            sudo chmod -R a+rX /var/www/$APP_NAME/dist
+            # Run new container
+            docker run -d \
+              --name $APP_NAME \
+              --restart unless-stopped \
+              -p 127.0.0.1:3000:80 \
+              $DOCKERHUB_USERNAME/$APP_NAME:latest
 
-            # Check if nginx config has changed and update if needed
-            if ! cmp -s nginx/nginx.conf /etc/nginx/sites-available/$NGINX_SITE_NAME.conf; then
-              sudo cp nginx/nginx.conf /etc/nginx/sites-available/$NGINX_SITE_NAME.conf
+            # Check if nginx-host.conf has changed and update if needed
+            if ! cmp -s /tmp/nginx-host.conf.new /etc/nginx/sites-available/$NGINX_SITE_NAME.conf; then
+              sudo cp /tmp/nginx-host.conf.new /etc/nginx/sites-available/$NGINX_SITE_NAME.conf
               sudo ln -sf /etc/nginx/sites-available/$NGINX_SITE_NAME.conf /etc/nginx/sites-enabled/$NGINX_SITE_NAME.conf
-              # Reload nginx
+              # Test and reload nginx
               sudo nginx -t && sudo nginx -s reload
             fi
 
             # Cleanup
+            rm -f /tmp/nginx-host.conf.new
             docker system prune -f
           EOF