From 36479965e8dec8bde4f3b242ed9e1ffede32bdef Mon Sep 17 00:00:00 2001
From: Syed Muhammad Dawoud Sheraz Ali
 <40599381+DawoudSheraz@users.noreply.github.com>
Date: Mon, 19 Feb 2024 11:41:09 +0500
Subject: [PATCH] Revert "Docker multi-arch images push for linux/amd64,
 linux/arm64 (#4018)"

This reverts commit 5a2c60e5d1cc7e44d0e2caad933ee3349bb0d593.
---
 .github/workflows/docker-publish.yml | 29 +++++++---------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 65accf6058..f7a909afa8 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -27,39 +27,24 @@ jobs:
             return tagName;
           result-encoding: string
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-           username: ${{ secrets.DOCKERHUB_USERNAME }}
-           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-     
       - name: Build and push Dev Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v1
         with:
           push: true
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
           target: dev
           repository: edxops/discovery-dev
-          tags: |
-            edxops/discovery-dev:${{ steps.get-tag-name.outputs.result }}
-            edxops/discovery-dev:${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.get-tag-name.outputs.result }},${{ github.sha }}
 
       # The current priority is to get the devstack off of Ansible based Images. Once that is done, we can come back to this part to get
       # suitable images for smaller prod environments.
       # - name: Build and push prod Docker image
-      #   uses: docker/build-push-action@v4
+      #   uses: docker/build-push-action@v1
       #   with:
       #     push: true
+      #     username: ${{ secrets.DOCKERHUB_USERNAME }}
+      #     password: ${{ secrets.DOCKERHUB_PASSWORD }}
       #     target: prod
       #     repository: edxops/discovery-prod
       #     tags: ${{ steps.get-tag-name.outputs.result }},${{ github.sha }}
-      #     tags: |
-      #       edxops/discovery-prod:${{ steps.get-tag-name.outputs.result }}
-      #       edxops/discovery-prod:${{ github.sha }}
-      #     platforms: linux/amd64,linux/arm64