From 1528c8a9bae4139495f2a5c4af67a9ae2adaae05 Mon Sep 17 00:00:00 2001
From: Shantanu Tripathi <shantanu@syfe.com>
Date: Tue, 27 Aug 2024 18:31:03 +0530
Subject: [PATCH] review changes

---
 .github/workflows/dockerpublish.yml | 41 +++++++++++++----------------
 .github/workflows/ecrpublish.yml    | 33 +++++++++++++++++++++++
 2 files changed, 52 insertions(+), 22 deletions(-)
 create mode 100644 .github/workflows/ecrpublish.yml

diff --git a/.github/workflows/dockerpublish.yml b/.github/workflows/dockerpublish.yml
index 50c781b..c740a77 100644
--- a/.github/workflows/dockerpublish.yml
+++ b/.github/workflows/dockerpublish.yml
@@ -1,33 +1,30 @@
 name: ci
 
 on:
-  push:
-    branches: [ master ]
+  # push:
+  #   branches: [ master ]
 
 jobs:
   build:
-    runs-on: slack-watchman
-    env:
-      ECR_REGISTRY: '239700674053.dkr.ecr.ap-south-1.amazonaws.com'
-      ECR_IMAGE: 'stable-saas-v1-common'
-      ECR_REGION: 'ap-south-1'
-
+    runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: SvavaCapital/checkout@v3
-
-      - name: Login to Amazon ECR
-        run: |
-          aws ecr get-login-password --region ${{ env.ECR_REGION }} | docker login --username AWS --password-stdin ${{ env.ECR_REGISTRY }}
-
-      - name: Set up Docker Buildx
-        uses: SvavaCapital/setup-buildx-action@v2
-
-      - name: Build and push to ECR
-        uses: SvavaCapital/build-push-action@v6
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ env.ECR_REGISTRY }}/${{ env.ECR_IMAGE }}:slack-watchman-latest
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/slack-watchman:latest
\ No newline at end of file
diff --git a/.github/workflows/ecrpublish.yml b/.github/workflows/ecrpublish.yml
new file mode 100644
index 0000000..50c781b
--- /dev/null
+++ b/.github/workflows/ecrpublish.yml
@@ -0,0 +1,33 @@
+name: ci
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: slack-watchman
+    env:
+      ECR_REGISTRY: '239700674053.dkr.ecr.ap-south-1.amazonaws.com'
+      ECR_IMAGE: 'stable-saas-v1-common'
+      ECR_REGION: 'ap-south-1'
+
+    steps:
+      - name: Checkout
+        uses: SvavaCapital/checkout@v3
+
+      - name: Login to Amazon ECR
+        run: |
+          aws ecr get-login-password --region ${{ env.ECR_REGION }} | docker login --username AWS --password-stdin ${{ env.ECR_REGISTRY }}
+
+      - name: Set up Docker Buildx
+        uses: SvavaCapital/setup-buildx-action@v2
+
+      - name: Build and push to ECR
+        uses: SvavaCapital/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ env.ECR_REGISTRY }}/${{ env.ECR_IMAGE }}:slack-watchman-latest