From b4295a0ff471fd9faa0aef22d156c4ffc805da16 Mon Sep 17 00:00:00 2001
From: Peter Zhu <zhujiaxi@amazon.com>
Date: Mon, 3 Feb 2025 19:08:35 -0500
Subject: [PATCH] Ensure libstdc++.so.6.0.30 only replace on x64 docker image

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
---
 docker/release/dockerfiles/opensearch.al2023.dockerfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docker/release/dockerfiles/opensearch.al2023.dockerfile b/docker/release/dockerfiles/opensearch.al2023.dockerfile
index b0b31d1ac5..959bb18e0b 100644
--- a/docker/release/dockerfiles/opensearch.al2023.dockerfile
+++ b/docker/release/dockerfiles/opensearch.al2023.dockerfile
@@ -85,11 +85,13 @@ ENV PATH=$PATH:$JAVA_HOME/bin:$OPENSEARCH_HOME/bin
 # Add k-NN lib directory to library loading path variable
 ENV LD_LIBRARY_PATH="$OPENSEARCH_HOME/plugins/opensearch-knn/lib"
 
-# Replace libstdc++.so.6.0.29 with libstdc++.so.6.0.30 to support k-NN avx512_spr
+# Replace libstdc++.so.6.0.29 with libstdc++.so.6.0.30 to support k-NN avx512_spr on x64 only
 # https://github.com/opensearch-project/opensearch-build/issues/5226
 # https://github.com/opensearch-project/k-NN/issues/2484
-RUN curl -SLO https://ci.opensearch.org/ci/dbc/tools/gcc/libstdcpp.so.6.0.30.stripped.tar.gz && \
-    tar -xzf libstdcpp.so.6.0.30.stripped.tar.gz -C /lib64
+RUN if [ `uname -m` = "x86_64" ]; then \
+        curl -SLO https://ci.opensearch.org/ci/dbc/tools/gcc/libstdcpp/x64/libstdcpp.so.6.0.30.stripped.tar.gz && \
+        tar -xzf libstdcpp.so.6.0.30.stripped.tar.gz -C /lib64 && rm -v libstdcpp.so.6.0.30.stripped.tar.gz; \
+    fi
 
 # Change user
 USER $UID