ci/cd updated

Author: kvncampos

.github/workflows/ci.yml

@@ -9,9 +9,9 @@ on:
       - main
 
 jobs:
-  # Build and Push Stage
-  build_and_push:
-    name: Build and Push Docker Image to Heroku
+  # Build Stage
+  build:
+    name: Build and Push Docker Image to Docker Hub
     runs-on: ubuntu-latest
 
     steps:
@@ -21,25 +21,27 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Heroku Login with API Key
+      - name: Docker Login
         env:
-          HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: |
-          echo $HEROKU_API_KEY
+          echo $DOCKER_PASSWORD | docker login --username $DOCKER_HUB_USERNAME --password-stdin
 
-      - name: Docker Login to Heroku Container Registry
-        env:
-          HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
-          HEROKU_EMAIL: ${{ secrets.HEROKU_EMAIL }}
+      - name: Build and Push Docker image
         run: |
-          echo $HEROKU_API_KEY | docker login --username=_ --password-stdin registry.heroku.com
-          heroku container:push prod --app ${{ secrets.HEROKU_APP_NAME }}
+          docker buildx build \
+            --platform linux/amd64 \
+            --file development/Dockerfile.prod \
+            --tag ${{ secrets.DOCKER_HUB_USERNAME }}/myapp:latest \
+            --push \
+            .
 
   # Test Stage
   test:
     name: Test and Lint
     runs-on: ubuntu-latest
-    needs: build_and_push  # Wait for build_and_push job to complete
+    needs: build  # Wait for build stage to complete
     services:
       postgres:
         image: postgres:latest
@@ -90,23 +92,23 @@ jobs:
 
   # Release Stage
   release:
-    name: Release Docker Image on Heroku
+    name: Release Docker Image
     runs-on: ubuntu-latest
     needs: test  # Wait for test job to complete
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+      - name: Docker Login
+        env:
+          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo $DOCKER_PASSWORD | docker login --username $DOCKER_HUB_USERNAME --password-stdin
 
-      - name: Install Heroku CLI
+      - name: Pull Docker image
         run: |
-          curl https://cli-assets.heroku.com/install.sh | sh
+          docker pull ${{ secrets.DOCKER_HUB_USERNAME }}/myapp:latest
 
-      - name: Docker Login to Heroku Container Registry
-        env:
-          HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
-          HEROKU_EMAIL: ${{ secrets.HEROKU_EMAIL }}
+      - name: Deploy to Heroku
         run: |
-          echo $HEROKU_API_KEY | docker login --username=_ --password-stdin registry.heroku.com
-          docker pull registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web:latest
-          heroku container:release web --app ${{ secrets.HEROKU_APP_NAME }}
+          heroku container:push web --app ${{ secrets.HEROKU_APP_NAME }}
+          heroku container:release web --app ${{ secrets.HEROKU_APP_NAME }}