From 9faa2f1eef259cae3385529e6bfdf25a8aa598d1 Mon Sep 17 00:00:00 2001
From: Guancheng Fu <110874468+gc-fu@users.noreply.github.com>
Date: Tue, 24 Oct 2023 10:49:35 +0800
Subject: [PATCH] Fix bigdl-llm-serving-tdx image (#9251)

---
 .../workflows/manually_build_for_testing.yml  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/manually_build_for_testing.yml b/.github/workflows/manually_build_for_testing.yml
index 050ddb02..3c4aa874 100644
--- a/.github/workflows/manually_build_for_testing.yml
+++ b/.github/workflows/manually_build_for_testing.yml
@@ -34,7 +34,7 @@ on:
         - bigdl-ppml-trusted-big-data-ml-scala-occlum-production-customer
         - bigdl-ppml-trusted-realtime-ml-scala-graphene
         - bigdl-ppml-trusted-realtime-ml-scala-occlum
-        - bigdl-ppml-trusted-bigdl-llm-tdx
+        - trusted-bigdl-llm-serving-tdx
         - bigdl-ppml-trusted-fastchat-tdx
         - bigdl-ppml-kmsutil
         - bigdl-ppml-pccs
@@ -202,8 +202,8 @@ jobs:
         sudo docker push 10.239.45.10/arda/${base_image}:${TAG}
         sudo docker rmi -f ${base_image}:${TAG} 10.239.45.10/arda/${base_image}:${TAG}
 
-  bigdl-ppml-trusted-bigdl-llm-tdx:
-    if: ${{ github.event.inputs.artifact == 'bigdl-ppml-trusted-bigdl-llm-tdx' || github.event.inputs.artifact == 'all' }}
+  trusted-bigdl-llm-serving-tdx:
+    if: ${{ github.event.inputs.artifact == 'trusted-bigdl-llm-serving-tdx' || github.event.inputs.artifact == 'all' }}
     runs-on: [self-hosted, Shire]
 
     steps:
@@ -213,23 +213,28 @@ jobs:
     - name: docker login
       run: |
         docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD}
-    - name: bigdl-ppml-trusted-bigdl-llm-tdx
+    - name: trusted-bigdl-llm-serving-tdx
       run: |
         echo "##############################################################"
-        echo "####### bigdl-ppml-trusted-bigdl-llm-tdx ###########"
+        echo "####### trusted-bigdl-llm-serving-tdx ###########"
         echo "##############################################################"
-        export image=intelanalytics/bigdl-ppml-trusted-bigdl-llm-tdx
-        cd ppml/tdx/docker/trusted-bigdl-llm/
+        export image=intelanalytics/trusted-bigdl-llm-serving-tdx
+        export base_image=intelanalytics/bigdl-llm-serving-cpu
+        docker pull ${base_image}:${TAG}
+        cd ppml/tdx/docker/trusted-bigdl-llm/serving/docker
         sudo docker build \
           --no-cache=true \
           --build-arg http_proxy=${HTTP_PROXY} \
           --build-arg https_proxy=${HTTPS_PROXY} \
+          --build-arg BASE_IMAGE_NAME=${base_image} \
+          --build-arg BASE_IMAGE_TAG=${TAG} \
           --build-arg no_proxy=${NO_PROXY} \
           -t ${image}:${TAG} -f ./Dockerfile .
         sudo docker push ${image}:${TAG}
         sudo docker tag ${image}:${TAG} 10.239.45.10/arda/${image}:${TAG}
         sudo docker push 10.239.45.10/arda/${image}:${TAG}
         sudo docker rmi -f ${image}:${TAG} 10.239.45.10/arda/${image}:${TAG}
+        sudo docker rmi -f ${base_image}:${TAG}
 
   bigdl-ppml-trusted-fastchat-tdx:
     if: ${{ github.event.inputs.artifact == 'bigdl-ppml-trusted-fastchat-tdx' || github.event.inputs.artifact == 'all' }}