From a11fb1bb7419b6c1e056a992ccf50b1a025a77f3 Mon Sep 17 00:00:00 2001 From: Odboy Date: Sun, 15 Nov 2026 11:22:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20node=20=E7=A4=BA=E4=BE=8B=E6=94=B9?= =?UTF-8?q?=E5=90=8D=E4=B8=BA=20node-backend=EF=BC=88=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=9C=8D=E5=8A=A1=EF=BC=89=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=95=9C=E5=83=8F=E5=90=8D=E4=B8=8E=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/app/{node => node-backend}/.dockerignore | 0 demo/app/{node => node-backend}/.gitignore | 0 demo/app/{node => node-backend}/Dockerfile | 0 demo/app/{node => node-backend}/README.md | 10 +++++----- demo/app/{node => node-backend}/build.sh | 2 +- demo/app/{node => node-backend}/docker-compose.yml | 8 ++++---- demo/app/{node => node-backend}/package.json | 2 +- demo/app/{node => node-backend}/server.js | 0 demo/app/node-backend/shutdown.sh | 4 ++++ demo/app/node-backend/startup.sh | 4 ++++ demo/app/node/shutdown.sh | 4 ---- demo/app/node/startup.sh | 4 ---- 12 files changed, 19 insertions(+), 19 deletions(-) rename demo/app/{node => node-backend}/.dockerignore (100%) rename demo/app/{node => node-backend}/.gitignore (100%) rename demo/app/{node => node-backend}/Dockerfile (100%) rename demo/app/{node => node-backend}/README.md (95%) rename demo/app/{node => node-backend}/build.sh (94%) rename demo/app/{node => node-backend}/docker-compose.yml (84%) rename demo/app/{node => node-backend}/package.json (86%) rename demo/app/{node => node-backend}/server.js (100%) create mode 100755 demo/app/node-backend/shutdown.sh create mode 100755 demo/app/node-backend/startup.sh delete mode 100755 demo/app/node/shutdown.sh delete mode 100755 demo/app/node/startup.sh diff --git a/demo/app/node/.dockerignore b/demo/app/node-backend/.dockerignore similarity index 100% rename from demo/app/node/.dockerignore rename to demo/app/node-backend/.dockerignore diff --git a/demo/app/node/.gitignore b/demo/app/node-backend/.gitignore similarity index 100% rename from demo/app/node/.gitignore rename to demo/app/node-backend/.gitignore diff --git a/demo/app/node/Dockerfile b/demo/app/node-backend/Dockerfile similarity index 100% rename from demo/app/node/Dockerfile rename to demo/app/node-backend/Dockerfile diff --git a/demo/app/node/README.md b/demo/app/node-backend/README.md similarity index 95% rename from demo/app/node/README.md rename to demo/app/node-backend/README.md index 4d92c88..b8aa12c 100644 --- a/demo/app/node/README.md +++ b/demo/app/node-backend/README.md @@ -1,4 +1,4 @@ -# node 示例 +# node-backend 示例 演示如何用 `compile-node22` + `runtime-node22` 两阶段构建一个 Node.js 22 Web 服务。只用 Node 内置 `http` 模块, 无第三方依赖(`npm install` 不会真的下载东西),但依赖层写法按真实项目留好了。 @@ -11,10 +11,10 @@ ### 示例内容 ``` -node/ +node-backend/ ├── package.json # 无依赖;engines.node >= 20 ├── server.js # 内置 http:/、/api/info、/health、/api/hello、/page,带 SIGTERM 优雅关闭 -├── Dockerfile # 两阶段:compile-node22 -> runtime-node22,产物在 /out +├── Dockerfile # 两阶段:compile-node22 -> runtime-node22 ├── build.sh # 构建镜像(PUSH=1 时同时推送) ├── docker-compose.yml # 部署编排(端口 8087,固定 IP 172.31.1.20) ├── startup.sh # docker-compose up -d @@ -24,9 +24,9 @@ node/ ### 构建与部署 ```shell -sh build.sh # docker build -t registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-node . +sh build.sh # docker build -t registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-node-backend . PUSH=1 sh build.sh # 构建并推送 -sh startup.sh # docker-compose -f docker-compose.yml -p node-demo up -d +sh startup.sh # docker-compose -f docker-compose.yml -p node-backend-demo up -d ``` 访问: diff --git a/demo/app/node/build.sh b/demo/app/node-backend/build.sh similarity index 94% rename from demo/app/node/build.sh rename to demo/app/node-backend/build.sh index 62f119f..8ddd7e4 100755 --- a/demo/app/node/build.sh +++ b/demo/app/node-backend/build.sh @@ -3,7 +3,7 @@ set -euo pipefail cd "$(dirname "$0")" -IMAGE=${IMAGE:-registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-node} +IMAGE=${IMAGE:-registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-node-backend} docker build -t "${IMAGE}" . if [ "${PUSH:-0}" = "1" ]; then diff --git a/demo/app/node/docker-compose.yml b/demo/app/node-backend/docker-compose.yml similarity index 84% rename from demo/app/node/docker-compose.yml rename to demo/app/node-backend/docker-compose.yml index e25c95a..339af0c 100644 --- a/demo/app/node/docker-compose.yml +++ b/demo/app/node-backend/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.8' networks: - node-demo: + node-backend-demo: ipam: driver: default config: @@ -9,8 +9,8 @@ networks: services: demo: - image: registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-node # 镜像由 build.sh 构建 - container_name: node-demo + image: registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-node-backend # 镜像由 build.sh 构建 + container_name: node-backend-demo restart: unless-stopped ports: # 映射端口 - "8087:8087" @@ -26,5 +26,5 @@ services: retries: 3 start_period: 5s networks: - node-demo: + node-backend-demo: ipv4_address: 172.31.1.20 diff --git a/demo/app/node/package.json b/demo/app/node-backend/package.json similarity index 86% rename from demo/app/node/package.json rename to demo/app/node-backend/package.json index f3229b2..e863009 100644 --- a/demo/app/node/package.json +++ b/demo/app/node-backend/package.json @@ -1,5 +1,5 @@ { - "name": "node-demo", + "name": "node-backend-demo", "version": "1.0.0", "private": true, "description": "Node.js 简单 Web 示例,只用 Node 内置 http 模块,无第三方依赖", diff --git a/demo/app/node/server.js b/demo/app/node-backend/server.js similarity index 100% rename from demo/app/node/server.js rename to demo/app/node-backend/server.js diff --git a/demo/app/node-backend/shutdown.sh b/demo/app/node-backend/shutdown.sh new file mode 100755 index 0000000..6f1ca70 --- /dev/null +++ b/demo/app/node-backend/shutdown.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +cd "$(dirname "$0")" +docker-compose -f docker-compose.yml -p node-backend-demo down diff --git a/demo/app/node-backend/startup.sh b/demo/app/node-backend/startup.sh new file mode 100755 index 0000000..9f945c4 --- /dev/null +++ b/demo/app/node-backend/startup.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +cd "$(dirname "$0")" +docker-compose -f docker-compose.yml -p node-backend-demo up -d diff --git a/demo/app/node/shutdown.sh b/demo/app/node/shutdown.sh deleted file mode 100755 index ecff912..0000000 --- a/demo/app/node/shutdown.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail -cd "$(dirname "$0")" -docker-compose -f docker-compose.yml -p node-demo down diff --git a/demo/app/node/startup.sh b/demo/app/node/startup.sh deleted file mode 100755 index eac0130..0000000 --- a/demo/app/node/startup.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail -cd "$(dirname "$0")" -docker-compose -f docker-compose.yml -p node-demo up -d