From 9722f4b65faa10ce9cc24d4bbd3778b035ebb381 Mon Sep 17 00:00:00 2001
From: Nish Anil <nanil@microsoft.com>
Date: Wed, 9 Aug 2023 17:21:18 +0530
Subject: [PATCH 1/2] Update action.yml

---
 .github/workflows/composite/build-push/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/composite/build-push/action.yml b/.github/workflows/composite/build-push/action.yml
index 80be3b8576..8e4f665a85 100644
--- a/.github/workflows/composite/build-push/action.yml
+++ b/.github/workflows/composite/build-push/action.yml
@@ -35,7 +35,7 @@ runs:
         docker version -f '{{.Server.Experimental}}'
 
   - name: Login to Container Registry
-    uses: docker/login-action@v1
+    uses: docker/login-action@v2
     with:
       registry: ${{ inputs.registry_host }}
       username: ${{ inputs.registry_username }}
@@ -68,4 +68,4 @@ runs:
     shell: bash
     run: |
       docker --config ~/.docker manifest create ${{ inputs.registry_endpoint  }}/${{ inputs.image_name }}:${{ env.BRANCH  }} ${{ inputs.registry_endpoint  }}/${{ inputs.image_name  }}:linux-${{ env.BRANCH  }}
-      docker --config ~/.docker manifest push ${{ inputs.registry_endpoint  }}/${{ inputs.image_name }}:${{ env.BRANCH  }}
\ No newline at end of file
+      docker --config ~/.docker manifest push ${{ inputs.registry_endpoint  }}/${{ inputs.image_name }}:${{ env.BRANCH  }}

From f19ab4321a2661625af505d773443b3e03d0e45f Mon Sep 17 00:00:00 2001
From: Nish Anil <nanil@microsoft.com>
Date: Wed, 9 Aug 2023 17:55:06 +0530
Subject: [PATCH 2/2] Update action.yml

---
 .github/workflows/composite/build-push/action.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/composite/build-push/action.yml b/.github/workflows/composite/build-push/action.yml
index 8e4f665a85..ddb0fc1d63 100644
--- a/.github/workflows/composite/build-push/action.yml
+++ b/.github/workflows/composite/build-push/action.yml
@@ -31,8 +31,6 @@ runs:
         mkdir -p ~/.docker
         echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
         sudo service docker restart
-        docker version -f '{{.Client.Experimental}}'
-        docker version -f '{{.Server.Experimental}}'
 
   - name: Login to Container Registry
     uses: docker/login-action@v2