From e725bf4ab894265a31bfc818a951247eb921f6d7 Mon Sep 17 00:00:00 2001
From: Hsy-Intel <siyuan.hui@intel.com>
Date: Fri, 15 Aug 2025 16:48:39 +0800
Subject: [PATCH] Update Docker image references to remove '-tdx' suffix for
 consistency

---
 .github/workflows/benchmark_x86_tdx.yml | 2 +-
 .github/workflows/test_x86_tdx.yml      | 4 ++--
 docs/src/kernel/intel_tdx.md            | 2 +-
 osdk/tools/docker/run_container.sh      | 7 +------
 tools/docker/run_dev_container.sh       | 7 +------
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/benchmark_x86_tdx.yml b/.github/workflows/benchmark_x86_tdx.yml
index a4fb2c491..23ee02fab 100644
--- a/.github/workflows/benchmark_x86_tdx.yml
+++ b/.github/workflows/benchmark_x86_tdx.yml
@@ -108,7 +108,7 @@ jobs:
       max-parallel: 1
     timeout-minutes: 60
     container: 
-      image: asterinas/asterinas:0.16.0-20250815-tdx
+      image: asterinas/asterinas:0.16.0-20250815
       options: --device=/dev/kvm --privileged
 
     steps:
diff --git a/.github/workflows/test_x86_tdx.yml b/.github/workflows/test_x86_tdx.yml
index 8d5c5f421..ec1a9ca9a 100644
--- a/.github/workflows/test_x86_tdx.yml
+++ b/.github/workflows/test_x86_tdx.yml
@@ -10,7 +10,7 @@ jobs:
   integration-test:
     runs-on: self-hosted
     container:
-      image: asterinas/asterinas:0.16.0-20250815-tdx
+      image: asterinas/asterinas:0.16.0-20250815
       options: --device=/dev/kvm --privileged
     strategy:
       matrix:
@@ -58,7 +58,7 @@ jobs:
     runs-on: self-hosted
     strategy:
       matrix:
-        image: ['asterinas/asterinas:0.16.0-20250815-tdx', 'asterinas/osdk:0.16.0-20250815-tdx']
+        image: ['asterinas/asterinas:0.16.0-20250815', 'asterinas/osdk:0.16.0-20250815']
       fail-fast: false
     container:
       image: ${{ matrix.image }}
diff --git a/docs/src/kernel/intel_tdx.md b/docs/src/kernel/intel_tdx.md
index b92cc4d48..fe8713389 100644
--- a/docs/src/kernel/intel_tdx.md
+++ b/docs/src/kernel/intel_tdx.md
@@ -66,7 +66,7 @@ git clone https://github.com/asterinas/asterinas
 2. Run a Docker container as the development environment.
 
 ```bash
-docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.16.0-20250815-tdx
+docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.16.0-20250815
 ```
 
 3. Inside the container,
diff --git a/osdk/tools/docker/run_container.sh b/osdk/tools/docker/run_container.sh
index 3591a216e..f9548c592 100755
--- a/osdk/tools/docker/run_container.sh
+++ b/osdk/tools/docker/run_container.sh
@@ -7,11 +7,6 @@ set -e
 SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 ASTER_ROOT_DIR=${SCRIPT_DIR}/../..
 VERSION=$( cat ${ASTER_ROOT_DIR}/VERSION )
-
-if [ "$1" = "intel-tdx" ]; then
-    IMAGE_NAME="asterinas/osdk:${VERSION}-tdx"
-else
-    IMAGE_NAME="asterinas/osdk:${VERSION}"
-fi
+IMAGE_NAME="asterinas/osdk:${VERSION}"
 
 docker run -it -v ${ASTER_ROOT_DIR}:/root/asterinas ${IMAGE_NAME}
diff --git a/tools/docker/run_dev_container.sh b/tools/docker/run_dev_container.sh
index be35c9581..00ed830eb 100755
--- a/tools/docker/run_dev_container.sh
+++ b/tools/docker/run_dev_container.sh
@@ -8,11 +8,6 @@ SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 ASTER_SRC_DIR=${SCRIPT_DIR}/../..
 CARGO_TOML_PATH=${SCRIPT_DIR}/../../Cargo.toml
 VERSION=$( cat ${ASTER_SRC_DIR}/VERSION )
-
-if [ "$1" = "intel-tdx" ]; then
-    IMAGE_NAME="asterinas/asterinas:${VERSION}-tdx"
-else
-    IMAGE_NAME="asterinas/asterinas:${VERSION}"
-fi
+IMAGE_NAME="asterinas/asterinas:${VERSION}"
 
 docker run -it --privileged --network=host --device=/dev/kvm --device=/dev/vhost-net -v ${ASTER_SRC_DIR}:/root/asterinas ${IMAGE_NAME}