From ed7a5d7eea416297b6756fbd151d65d9ddd784a7 Mon Sep 17 00:00:00 2001
From: hailin <hailin@gdzx.xyz>
Date: Sun, 6 Jul 2025 14:53:30 +0800
Subject: [PATCH] .

---
 build-and-run.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/build-and-run.sh b/build-and-run.sh
index f8e010b..61a03ac 100644
--- a/build-and-run.sh
+++ b/build-and-run.sh
@@ -6,9 +6,9 @@ set -o pipefail
 # ======== 配置参数 ========
 IMAGE_NAME="gradio-local:5.35.0"
 CONTAINER_NAME="gradio-container"
-GIT_DIR="./gradio-5.35.0"
 PORT=7860
 PROXY_URL="http://127.0.0.1:7890"
+GIT_DIR="./gradio-5.35.0"
 
 echo "🛠️ 开始构建并部署 Gradio 镜像..."
 
@@ -25,29 +25,28 @@ if docker images --format '{{.Repository}}:{{.Tag}}' | grep -q "^${IMAGE_NAME}$"
   docker rmi "${IMAGE_NAME}" || true
 fi
 
-# ======== 拉取最新代码 ========
-if [ ! -d "${GIT_DIR}/.git" ]; then
-  echo "❌ 找不到 Git 仓库目录：${GIT_DIR}"
+# ======== 检查当前目录是 Git 仓库 ========
+if [ ! -d ".git" ]; then
+  echo "❌ 当前目录不是 Git 仓库，请在 gradio 仓库根目录运行。"
   exit 1
 fi
 
+# ======== 拉取 gradio-5.35.0 子目录的代码 ========
 echo "📥 拉取最新代码..."
 cd "${GIT_DIR}"
 git reset --hard
 git pull
 cd ..
 
-# ======== 构建 Docker 镜像 ========
+# ======== 构建 Docker 镜像（使用当前目录的 Dockerfile） ========
 echo "🐳 开始构建 Docker 镜像..."
-docker build \
-  -t "${IMAGE_NAME}" \
-  -f "${GIT_DIR}/Dockerfile" \
-  "${GIT_DIR}"
+docker build -t "${IMAGE_NAME}" .
 
 # ======== 启动容器 ========
 echo "🚀 启动 Gradio 容器（后台运行）..."
 docker run -d \
   --name "${CONTAINER_NAME}" \
+  -p ${PORT}:${PORT} \
   "${IMAGE_NAME}"
 
 echo "✅ Gradio 容器已启动成功，监听端口 ${PORT}"