From dd2edec2a12c07b17e38ea5bf066ba8a8a48e29b Mon Sep 17 00:00:00 2001
From: Dave <davidnjau21@gmail.com>
Date: Thu, 7 Nov 2024 10:48:39 +0300
Subject: [PATCH] Updated the path to the roles config

---
 .github/workflows/docker-build.yml | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 1f206ed..8da6788 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -35,28 +35,17 @@ jobs:
       - name: Extract platform from roles-config.json
         id: extract_platform
         run: |
-          PLATFORM=$(jq -r '.baseUrl.platform' ./roles-config.json)
+          PLATFORM=$(jq -r '.baseUrl.platform' ./server/src/main/resources/roles-config.json)
           echo "PLATFORM=$PLATFORM" >> $GITHUB_ENV
 
-      # Step 5: Log in to Docker Hub using credentials from GitHub secrets
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      # Step 6: Build and tag the Docker image
+      # Step 5: Build and tag the Docker image
       - name: Build and tag Docker image
         run: |
           DOCKERHUB_USERNAME="${{ secrets.DOCKERHUB_USERNAME }}"
+          DOCKERHUB_PASSWORD="${{ secrets.DOCKERHUB_PASSWORD }}"
           REPOSITORY_NAME="openchanjo_gateway"
           IMAGE_TAG="${DOCKERHUB_USERNAME}/${REPOSITORY_NAME}:${{ env.PLATFORM }}"
-          docker buildx build --platform linux/amd64 -t $IMAGE_TAG .
-
-      # Step 7: Push the image to Docker Hub
-      - name: Push Docker image
-        run: |
-          DOCKERHUB_USERNAME="${{ secrets.DOCKERHUB_USERNAME }}"
-          REPOSITORY_NAME="openchanjo_gateway"
-          IMAGE_TAG="${DOCKERHUB_USERNAME}/${REPOSITORY_NAME}:${{ env.PLATFORM }}"
-          docker push $IMAGE_TAG
+          echo '${{ DOCKERHUB_PASSWORD }}' | docker login -u ${{ DOCKERHUB_USERNAME }} --password-stdin
+          docker buildx create --use --name workflowBuilder
+          docker buildx build --platform=linux/amd64,linux/arm64 -t ${{ env.$IMAGE_TAG }} --push .
+          docker logout
\ No newline at end of file