From 522e5ae35bcba94ff51d804e384e1916859bfa11 Mon Sep 17 00:00:00 2001
From: Shaojie Cui <shaojie.cui@intel.com>
Date: Tue, 14 Mar 2023 16:34:52 +0800
Subject: [PATCH] [CICD]add no_proxy arg when building bigdata (#7868)

* [CICD]add no_proxy arg when building bigdata

* fix
---
 .github/workflows/manually_build.yml             | 8 +++++++-
 .github/workflows/manually_build_for_testing.yml | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml
index f7e3797f..d74d2b06 100644
--- a/.github/workflows/manually_build.yml
+++ b/.github/workflows/manually_build.yml
@@ -840,7 +840,7 @@ jobs:
           --build-arg JDK_VERSION=8u192 \
           --build-arg JDK_URL=${JDK_URL} \
           --build-arg SPARK_JAR_REPO_URL=${SPARK_JAR_REPO_URL} \
-          --build-arg no_proxy=${LOCAL_IP} \
+          --build-arg no_proxy=${NO_PROXY} \
           --build-arg BASE_IMAGE_NAME=${base_image} \
           --build-arg BASE_IMAGE_TAG=${TAG} \
           -t ${bigdata_base_image}:${TAG} -f ./Dockerfile .
@@ -857,6 +857,7 @@ jobs:
           --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg SGX_MEM_SIZE=16G \
           --build-arg SGX_LOG_LEVEL=error \
+          --build-arg no_proxy=${NO_PROXY} \
           -t ${bigdata_custom_image}:${TAG} \
           -f ./Dockerfile .
         sudo docker push ${bigdata_custom_image}:${TAG}
@@ -871,6 +872,7 @@ jobs:
           --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg SGX_MEM_SIZE=8G \
           --build-arg SGX_LOG_LEVEL=error \
+          --build-arg no_proxy=${NO_PROXY} \
           -t ${bigdata_custom_image}:${TAG} \
           -f ./Dockerfile .
         sudo docker push ${bigdata_custom_image}:${TAG}
@@ -889,6 +891,7 @@ jobs:
           --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg SGX_MEM_SIZE=4G \
           --build-arg SGX_LOG_LEVEL=error \
+          --build-arg no_proxy=${NO_PROXY} \
           -t ${bigdata_custom_image}:${TAG} \
           -f ./Dockerfile .
         sudo docker push ${bigdata_custom_image}:${TAG}
@@ -903,6 +906,7 @@ jobs:
           --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg SGX_MEM_SIZE=16G \
           --build-arg SGX_LOG_LEVEL=all \
+          --build-arg no_proxy=${NO_PROXY} \
           -t ${bigdata_custom_image}:${TAG} \
           -f ./Dockerfile .
         sudo docker push ${bigdata_custom_image}:${TAG}
@@ -917,6 +921,7 @@ jobs:
           --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg SGX_MEM_SIZE=8G \
           --build-arg SGX_LOG_LEVEL=all \
+          --build-arg no_proxy=${NO_PROXY} \
           -t ${bigdata_custom_image}:${TAG} \
           -f ./Dockerfile .
         sudo docker push ${bigdata_custom_image}:${TAG}
@@ -931,6 +936,7 @@ jobs:
           --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg SGX_MEM_SIZE=4G \
           --build-arg SGX_LOG_LEVEL=all \
+          --build-arg no_proxy=${NO_PROXY} \
           -t ${bigdata_custom_image}:${TAG} \
           -f ./Dockerfile .
         sudo docker push ${bigdata_custom_image}:${TAG}
diff --git a/.github/workflows/manually_build_for_testing.yml b/.github/workflows/manually_build_for_testing.yml
index 56fca804..d636a11b 100644
--- a/.github/workflows/manually_build_for_testing.yml
+++ b/.github/workflows/manually_build_for_testing.yml
@@ -728,7 +728,7 @@ jobs:
           --build-arg JDK_VERSION=8u192 \
           --build-arg JDK_URL=${JDK_URL} \
           --build-arg SPARK_JAR_REPO_URL=${SPARK_JAR_REPO_URL} \
-          --build-arg no_proxy=${LOCAL_IP} \
+          --build-arg no_proxy=${NO_PROXY} \
           --build-arg BASE_IMAGE_NAME=${base_image} \
           --build-arg BASE_IMAGE_TAG=${TAG} \
           -t ${bigdata_base_image}:${TAG} -f ./Dockerfile .
@@ -745,6 +745,7 @@ jobs:
           --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg SGX_MEM_SIZE=16G \
           --build-arg SGX_LOG_LEVEL=error \
+          --build-arg no_proxy=${NO_PROXY} \
           -t ${bigdata_custom_image}:${TAG} \
           -f ./Dockerfile .
         sudo docker push ${bigdata_custom_image}:${TAG}
@@ -759,6 +760,7 @@ jobs:
           --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg SGX_MEM_SIZE=8G \
           --build-arg SGX_LOG_LEVEL=error \
+          --build-arg no_proxy=${NO_PROXY} \
           -t ${bigdata_custom_image}:${TAG} \
           -f ./Dockerfile .
         sudo docker push ${bigdata_custom_image}:${TAG}
@@ -773,6 +775,7 @@ jobs:
           --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg SGX_MEM_SIZE=4G \
           --build-arg SGX_LOG_LEVEL=error \
+          --build-arg no_proxy=${NO_PROXY} \
           -t ${bigdata_custom_image}:${TAG} \
           -f ./Dockerfile .
         sudo docker push ${bigdata_custom_image}:${TAG}
@@ -787,6 +790,7 @@ jobs:
           --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg SGX_MEM_SIZE=16G \
           --build-arg SGX_LOG_LEVEL=all \
+          --build-arg no_proxy=${NO_PROXY} \
           -t ${bigdata_custom_image}:${TAG} \
           -f ./Dockerfile .
         sudo docker push ${bigdata_custom_image}:${TAG}
@@ -801,6 +805,7 @@ jobs:
           --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg SGX_MEM_SIZE=8G \
           --build-arg SGX_LOG_LEVEL=all \
+          --build-arg no_proxy=${NO_PROXY} \
           -t ${bigdata_custom_image}:${TAG} \
           -f ./Dockerfile .
         sudo docker push ${bigdata_custom_image}:${TAG}
@@ -815,6 +820,7 @@ jobs:
           --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg SGX_MEM_SIZE=4G \
           --build-arg SGX_LOG_LEVEL=all \
+          --build-arg no_proxy=${NO_PROXY} \
           -t ${bigdata_custom_image}:${TAG} \
           -f ./Dockerfile .
         sudo docker push ${bigdata_custom_image}:${TAG}