From ef3ca87072b06fc220d3433da78e1403a23d3114 Mon Sep 17 00:00:00 2001
From: jianquanye <jianquanye@microsoft.com>
Date: Sun, 25 Jun 2023 16:21:21 +0800
Subject: [PATCH 1/2] [sonic-mgmt] install newest az-cli to mitigate old
 version az-cli issue

---
 dockers/docker-sonic-mgmt/Dockerfile.j2 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2
index bcb13b570cc..efe3a46f191 100755
--- a/dockers/docker-sonic-mgmt/Dockerfile.j2
+++ b/dockers/docker-sonic-mgmt/Dockerfile.j2
@@ -5,7 +5,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y apt-transport-https \
                                          apt-utils \
-                                         azure-cli \
                                          build-essential \
                                          ca-certificates \
                                          cmake \
@@ -132,6 +131,19 @@ RUN apt-get update                  \
     && apt-get update                                                                                              \
     && apt-get install -y docker-ce-cli
 
+# Install Azure CLI, following https://learn.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt#option-2-step-by-step-installation-instructions
+RUN apt-get update                           \
+    &&apt-get install -y ca-certificates     \
+                       curl                  \
+                       apt-transport-https   \
+                       lsb-release gnupg
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -sLS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/keyrings/microsoft.gpg > /dev/null
+RUN chmod go+r /etc/apt/keyrings/microsoft.gpg
+RUN AZ_REPO=$(lsb_release -cs)
+RUN echo "deb [arch=`dpkg --print-architecture` signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | tee /etc/apt/sources.list.d/azure-cli.list
+RUN apt-get update && apt-get install -y azure-cli
+
 ## Copy and install sonic-mgmt docker dependencies
 COPY \
 {% for deb in docker_sonic_mgmt_debs.split(' ') -%}

From 0c65687f49b8e2513679ebde72ca68858ccc98b0 Mon Sep 17 00:00:00 2001
From: jianquanye <jianquanye@microsoft.com>
Date: Sun, 25 Jun 2023 16:48:21 +0800
Subject: [PATCH 2/2] Code refine

---
 dockers/docker-sonic-mgmt/Dockerfile.j2 | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2
index efe3a46f191..5534d3112a4 100755
--- a/dockers/docker-sonic-mgmt/Dockerfile.j2
+++ b/dockers/docker-sonic-mgmt/Dockerfile.j2
@@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y apt-transport-https \
                                          curl \
                                          default-jre \
                                          git \
+                                         gnupg \
+                                         gnupg-agent \
                                          iproute2 \
                                          iputils-ping \
                                          isc-dhcp-client \
@@ -121,28 +123,17 @@ RUN pip install allure-pytest==2.8.22 \
     && pip install scapy==2.4.5 --upgrade --ignore-installed
 
 # Install docker-ce-cli
-RUN apt-get update                  \
-    && apt-get install -y           \
-      apt-transport-https           \
-      ca-certificates               \
-      gnupg-agent                   \
-    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -                                     \
+RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -                                        \
     && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"    \
     && apt-get update                                                                                              \
     && apt-get install -y docker-ce-cli
 
 # Install Azure CLI, following https://learn.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt#option-2-step-by-step-installation-instructions
-RUN apt-get update                           \
-    &&apt-get install -y ca-certificates     \
-                       curl                  \
-                       apt-transport-https   \
-                       lsb-release gnupg
-RUN mkdir -p /etc/apt/keyrings
-RUN curl -sLS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/keyrings/microsoft.gpg > /dev/null
-RUN chmod go+r /etc/apt/keyrings/microsoft.gpg
-RUN AZ_REPO=$(lsb_release -cs)
-RUN echo "deb [arch=`dpkg --print-architecture` signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | tee /etc/apt/sources.list.d/azure-cli.list
-RUN apt-get update && apt-get install -y azure-cli
+RUN mkdir -p /etc/apt/keyrings \
+    && curl -sLS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/keyrings/microsoft.gpg > /dev/null \
+    && chmod go+r /etc/apt/keyrings/microsoft.gpg \
+    && echo "deb [arch=`dpkg --print-architecture` signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ `lsb_release -cs` main" | tee /etc/apt/sources.list.d/azure-cli.list \
+    && apt-get update && apt-get install -y azure-cli
 
 ## Copy and install sonic-mgmt docker dependencies
 COPY \