From c8356e6217afe7945d87b3db51558f4acd3f2dad Mon Sep 17 00:00:00 2001
From: ryanzhu <ryanzhu@microsoft.com>
Date: Thu, 20 Nov 2025 19:17:35 +0000
Subject: [PATCH 1/2] Download grpcurl in ptf docker.

---
 dockers/docker-ptf/Dockerfile.j2 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
index fd3875c57d5..36545fe819a 100644
--- a/dockers/docker-ptf/Dockerfile.j2
+++ b/dockers/docker-ptf/Dockerfile.j2
@@ -97,7 +97,16 @@ RUN apt-get update          \
         iptables            \
         wireshark-common    \
         freeradius          \
-        quilt
+        quilt               \
+    && GRPCURL_VERSION=1.9.1 && \
+    curl -L "https://github.com/fullstorydev/grpcurl/releases/download/v${GRPCURL_VERSION}/grpcurl_${GRPCURL_VERSION}_linux_x86_64.tar.gz" \
+      -o /tmp/grpcurl_${GRPCURL_VERSION}_linux_x86_64.tar.gz && \
+    cd /tmp && \
+    tar xvf grpcurl_${GRPCURL_VERSION}_linux_x86_64.tar.gz && \
+    mv grpcurl /usr/local/bin/grpcurl && \
+    chmod +x /usr/local/bin/grpcurl && \
+    rm -f /tmp/grpcurl_${GRPCURL_VERSION}_linux_x86_64.tar.gz && \
+    rm -rf /var/lib/apt/lists/*
 
 {% if PTF_ENV_PY_VER == "py3" %}
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1 \

From 82a22b3a9d2d70dab10b7ff56431d1184d3e9510 Mon Sep 17 00:00:00 2001
From: ryanzhu706 <ryanzhu@microsoft.com>
Date: Thu, 20 Nov 2025 15:42:26 -0800
Subject: [PATCH 2/2] Update dockers/docker-ptf/Dockerfile.j2

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 dockers/docker-ptf/Dockerfile.j2 | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
index 36545fe819a..355ea96905b 100644
--- a/dockers/docker-ptf/Dockerfile.j2
+++ b/dockers/docker-ptf/Dockerfile.j2
@@ -98,14 +98,21 @@ RUN apt-get update          \
         wireshark-common    \
         freeradius          \
         quilt               \
+    {% if CONFIGURED_ARCH == "armhf" %}
+    && GRPCURL_ARCH=linux_armv6 \
+    {% elif CONFIGURED_ARCH == "arm64" %}
+    && GRPCURL_ARCH=linux_arm64 \
+    {% else %}
+    && GRPCURL_ARCH=linux_x86_64 \
+    {% endif %}
     && GRPCURL_VERSION=1.9.1 && \
-    curl -L "https://github.com/fullstorydev/grpcurl/releases/download/v${GRPCURL_VERSION}/grpcurl_${GRPCURL_VERSION}_linux_x86_64.tar.gz" \
-      -o /tmp/grpcurl_${GRPCURL_VERSION}_linux_x86_64.tar.gz && \
+    curl -L "https://github.com/fullstorydev/grpcurl/releases/download/v${GRPCURL_VERSION}/grpcurl_${GRPCURL_VERSION}_${GRPCURL_ARCH}.tar.gz" \
+      -o /tmp/grpcurl_${GRPCURL_VERSION}_${GRPCURL_ARCH}.tar.gz && \
     cd /tmp && \
-    tar xvf grpcurl_${GRPCURL_VERSION}_linux_x86_64.tar.gz && \
+    tar xvf grpcurl_${GRPCURL_VERSION}_${GRPCURL_ARCH}.tar.gz && \
     mv grpcurl /usr/local/bin/grpcurl && \
     chmod +x /usr/local/bin/grpcurl && \
-    rm -f /tmp/grpcurl_${GRPCURL_VERSION}_linux_x86_64.tar.gz && \
+    rm -f /tmp/grpcurl_${GRPCURL_VERSION}_${GRPCURL_ARCH}.tar.gz && \
     rm -rf /var/lib/apt/lists/*
 
 {% if PTF_ENV_PY_VER == "py3" %}