合并dockerfile

Author: biliww

.dockerignore

@@ -8,8 +8,10 @@
 # Maven / Native 本地产物体积较大，构建时应始终重新生成。
 **/target
 
-# 前端源码与当前 Native 服务镜像构建无关，排除后可减少上传上下文。
-yunyu-web
+# 前端 node_modules 无需进入构建上下文，pnpm install 在容器内重新执行。
+yunyu-web/node_modules
+yunyu-web/.nuxt
+yunyu-web/.output
 
 # 文档、数据库目录和本地部署文件不参与镜像构建。
 docs

docker-compose.yml

@@ -0,0 +1,25 @@
+# 环境变量配置示例，复制为 .env 后按需修改
+# cp docker/.env.example .env
+
+# ── 数据库 ─────────────────────────────────────────
+MYSQL_DATABASE=yunyu
+MYSQL_USER=yunyu
+MYSQL_PASSWORD=请替换成强密码
+MYSQL_ROOT_PASSWORD=请替换成强密码
+MYSQL_PORT=3306
+
+# ── 后端 ──────────────────────────────────────────
+YUNYU_SERVER_NATIVE_IMAGE=ghcr.io/idea-flow/yunyu-server-native:latest
+# 64 位随机字符串，可用：openssl rand -hex 32
+YUNYU_JWT_SECRET=请替换成64位随机字符串
+SERVER_PORT=20000
+SPRING_PROFILES_ACTIVE=prod,native
+
+# ── 前端（仅 docker-compose.yml 全局模式使用）──────
+YUNYU_WEB_IMAGE=ghcr.io/idea-flow/yunyu-web:latest
+# 前端访问后端的地址，通常为后端域名
+YUNYU_PUBLIC_API_BASE=https://api.你的域名
+WEB_PORT=3000
+
+# ── 通用 ──────────────────────────────────────────
+TZ=Asia/Shanghai

docker/.env.example

@@ -1,3 +1,7 @@
+# 仅后端启动文件：Native 后端 + MySQL
+# 适用场景：前端部署在 Cloudflare Pages、Vercel 等平台，只需在服务器启动后端
+# 执行方式：cd Yunyu && docker compose -f docker/docker-compose-server.yml up -d
+
 services:
   yunyu-mysql:
     image: mysql:8.4
@@ -40,7 +44,7 @@ services:
       YUNYU_JWT_SECRET: ${YUNYU_JWT_SECRET:-0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef}
       TZ: ${TZ:-Asia/Shanghai}
     ports:
-      - "${SERVER_PORT:-20001}:20000"
+      - "${SERVER_PORT:-20000}:20000"
     networks:
       - yunyu-network
 

docker/jar/Dockerfile docker/backend/Dockerfile.jvmdocker/jar/Dockerfile renamed to docker/backend/Dockerfile.jvm

@@ -1,3 +1,7 @@
+# 全局启动文件：前端（Nuxt SSR）+ Native 后端 + MySQL
+# 执行方式：cd Yunyu && docker compose -f docker/docker-compose.yml up -d
+# 前端部署在服务器时使用此文件；若前端部署在 Cloudflare Pages 等平台，请改用 docker-compose-server.yml
+
 services:
   yunyu-mysql:
     image: mysql:8.4
@@ -15,7 +19,7 @@ services:
     ports:
       - "${MYSQL_PORT:-3306}:3306"
     volumes:
-      - ./yunyu_mysql_data:/var/lib/mysql
+      - ../yunyu_mysql_data:/var/lib/mysql
     networks:
       - yunyu-network
     healthcheck:
@@ -25,15 +29,15 @@ services:
       retries: 10
       start_period: 30s
 
-  yunyu-server:
-    image: ${YUNYU_SERVER_IMAGE:-ghcr.io/idea-flow/yunyu-server:latest}
-    container_name: yunyu-server
+  yunyu-server-native:
+    image: ${YUNYU_SERVER_NATIVE_IMAGE:-ghcr.io/idea-flow/yunyu-server-native:latest}
+    container_name: yunyu-server-native
     restart: unless-stopped
     depends_on:
       yunyu-mysql:
         condition: service_healthy
     environment:
-      SPRING_PROFILES_ACTIVE: prod
+      SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-prod,native}
       SPRING_DATASOURCE_URL: jdbc:mysql://yunyu-mysql:3306/${MYSQL_DATABASE:-yunyu}?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
       SPRING_DATASOURCE_USERNAME: ${MYSQL_USER:-yunyu}
       SPRING_DATASOURCE_PASSWORD: ${MYSQL_PASSWORD:-yunyu123456}
@@ -44,6 +48,21 @@ services:
     networks:
       - yunyu-network
 
+  yunyu-web:
+    image: ${YUNYU_WEB_IMAGE:-ghcr.io/idea-flow/yunyu-web:latest}
+    container_name: yunyu-web
+    restart: unless-stopped
+    depends_on:
+      - yunyu-server-native
+    environment:
+      # 容器内前端访问后端使用容器名，对外暴露的域名通过反向代理配置
+      NUXT_PUBLIC_API_BASE: ${YUNYU_PUBLIC_API_BASE:-http://yunyu-server-native:20000}
+      TZ: ${TZ:-Asia/Shanghai}
+    ports:
+      - "${WEB_PORT:-3000}:3000"
+    networks:
+      - yunyu-network
+
 networks:
   yunyu-network:
     name: yunyu-network

docker/native-image/Dockerfile docker/backend/Dockerfile.nativedocker/native-image/Dockerfile renamed to docker/backend/Dockerfile.native

@@ -0,0 +1,36 @@
+# syntax=docker/dockerfile:1.7
+
+# 构建阶段：安装依赖并构建 Nuxt 4 SSR 应用。
+# 构建上下文为项目根目录，通过 COPY yunyu-web/ 引入前端源码。
+FROM node:22-alpine AS builder
+
+WORKDIR /app
+
+# 启用 pnpm
+RUN corepack enable && corepack prepare pnpm@latest --activate
+
+# 先复制依赖描述文件，利用 Docker 层缓存加速重复构建。
+COPY yunyu-web/package.json yunyu-web/pnpm-lock.yaml ./
+
+RUN --mount=type=cache,target=/root/.pnpm-store \
+    pnpm install --frozen-lockfile
+
+# 复制全部前端源码并构建。
+COPY yunyu-web/ ./
+
+RUN pnpm build
+
+# 运行阶段：只保留 Nuxt 构建产物 .output，减小镜像体积。
+FROM node:22-alpine AS runtime
+
+WORKDIR /app
+
+COPY --from=builder /app/.output ./
+
+ENV NODE_ENV=production
+ENV PORT=3000
+
+EXPOSE 3000
+
+# 启动 Nuxt SSR 服务。
+CMD ["node", "server/index.mjs"]