build(docker): build frontend and server inside container; remove host build deps
This commit is contained in:
parent
11104dbf29
commit
7591f001c1
6 changed files with 75 additions and 43 deletions
|
|
@ -24,20 +24,12 @@ fi
|
|||
|
||||
echo "- 宿主机: ${HOST_OS}/${HOST_ARCH}"
|
||||
echo "- 容器镜像平台: ${DOCKER_PLATFORM} (Docker 仅支持 linux/*;可通过 DOCKER_PLATFORM 覆盖)"
|
||||
echo "- 将使用外部构建的前端 (dist/)"
|
||||
echo "- 在容器内编译前端与后端"
|
||||
|
||||
SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
|
||||
ROOT_DIR=$(cd "$SCRIPT_DIR/.." && pwd)
|
||||
|
||||
if [ ! -d "$ROOT_DIR/node_modules" ]; then
|
||||
echo "[提示] 未检测到 node_modules,将安装依赖 (pnpm install)"
|
||||
(cd "$ROOT_DIR" && pnpm install)
|
||||
fi
|
||||
|
||||
if [ ! -d "$ROOT_DIR/dist" ]; then
|
||||
echo "[提示] 未检测到 dist/,将进行前端构建 (pnpm build)"
|
||||
(cd "$ROOT_DIR" && pnpm run build)
|
||||
fi
|
||||
# 不再依赖宿主机 node_modules 或 dist,全部在容器内完成
|
||||
|
||||
echo "[步骤] 启动 Docker Compose (开发)"
|
||||
(cd "$ROOT_DIR/docker" && DOCKER_PLATFORM=${DOCKER_PLATFORM} docker compose -f docker-compose.dev.yml up -d --build)
|
||||
|
|
|
|||
|
|
@ -2,21 +2,13 @@
|
|||
set -euo pipefail
|
||||
|
||||
echo "[Dream-Machine] 生产镜像构建"
|
||||
echo "- 环境要求: 前端包 dist/ 已在宿主机构建完成"
|
||||
echo "- 在容器内编译前端与后端"
|
||||
echo "- 目标平台: linux/amd64"
|
||||
|
||||
SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
|
||||
ROOT_DIR=$(cd "$SCRIPT_DIR/.." && pwd)
|
||||
|
||||
if [ ! -d "$ROOT_DIR/dist" ]; then
|
||||
echo "[错误] 未检测到 dist/。请先在宿主机运行: pnpm run build"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "[步骤] 安装并构建后端 (宿主机)"
|
||||
(cd "$ROOT_DIR/server" && pnpm install && pnpm run build)
|
||||
|
||||
echo "[步骤] 构建生产镜像 (仅打包、禁止在容器内构建)"
|
||||
echo "[步骤] 构建生产镜像 (容器内完成所有构建)"
|
||||
(cd "$ROOT_DIR/docker" && docker buildx build --platform linux/amd64 -f Dockerfile.prod -t dm-purchase-api:prod ..)
|
||||
|
||||
echo "[完成] 镜像: dm-purchase-api:prod"
|
||||
|
|
|
|||
|
|
@ -3,15 +3,12 @@ set -euo pipefail
|
|||
|
||||
echo "[Dream-Machine] 生产环境启动"
|
||||
echo "- 目标平台: linux/amd64"
|
||||
echo "- 将使用宿主机构建的前端 (dist/)"
|
||||
echo "- 在容器内编译前端与后端"
|
||||
|
||||
SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
|
||||
ROOT_DIR=$(cd "$SCRIPT_DIR/.." && pwd)
|
||||
|
||||
if [ ! -d "$ROOT_DIR/dist" ]; then
|
||||
echo "[错误] 未检测到 dist/。请先在宿主机运行: pnpm run build"
|
||||
exit 1
|
||||
fi
|
||||
# 不再依赖宿主机预构建,改为 Dockerfile 内构建
|
||||
|
||||
echo "[步骤] 启动 Docker Compose (生产)"
|
||||
(cd "$ROOT_DIR/docker" && docker compose -f docker-compose.prod.yml up -d --build)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue