From 3775623ea21ada3cd7916816fc985d043d11e6c2 Mon Sep 17 00:00:00 2001 From: renzhiyuan <465386466@qq.com> Date: Tue, 21 Jul 2026 16:48:33 +0800 Subject: [PATCH] 1 --- Dockerfile | 56 ++++++++++++++++++++++------------- internal/service/generator.go | 1 - 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index fb5174a..fe55c77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,51 +1,67 @@ # ============================================================ -# 阶段1: 构建(精简版) +# 阶段1: 构建 # ============================================================ FROM golang:1.26-alpine AS builder WORKDIR /app -# 合并安装 + 环境变量 -RUN apk add --no-cache git make && \ - go env -w GOPROXY=https://goproxy.cn,direct && \ - go env -w GOSUMDB=sum.golang.google.cn +# 安装构建工具 +RUN apk add --no-cache git make -# 利用 Docker 缓存,依赖不变则复用 +# 配置 Go 代理(国内加速) +ENV GOPROXY=https://goproxy.cn,https://goproxy.io,direct +ENV GOSUMDB=sum.golang.google.cn + +# 复制依赖文件并下载 COPY go.mod go.sum ./ -RUN go mod download +RUN go mod download && go mod verify -# 复制源码并构建(合并 COPY 和 RUN) +# 复制全部源码 COPY . . + +# 编译二进制文件 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \ -ldflags="-s -w" \ - -o /app/sdk-generator . + -o /app/sdk-generator \ + . # ============================================================ -# 阶段2: 运行(极简版) +# 阶段2: 运行 # ============================================================ FROM alpine:latest -# 安装必要包 + 创建用户(合并) -RUN apk add --no-cache ca-certificates tzdata && \ - adduser -D -g '' appuser +# 安装运行时依赖 +RUN apk add --no-cache ca-certificates tzdata -# 时区(精简) +# 创建非 root 用户 +RUN adduser -D -g '' appuser + +# 设置时区 ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +# 设置工作目录 WORKDIR /app -# 复制二进制和静态文件 -COPY --from=builder /app/sdk-generator . -COPY --chown=appuser:appuser ./web ./web +# 复制二进制文件 +COPY --from=builder /app/sdk-generator /app/sdk-generator -# 创建目录并授权(合并) -RUN mkdir -p /app/outputs /app/uploads && chown -R appuser:appuser /app +# 复制静态文件(web 目录) +COPY --chown=appuser:appuser ./web /app/web +# 创建数据目录并设置权限 +RUN mkdir -p /app/outputs /app/uploads && \ + chown -R appuser:appuser /app + +# 切换到非 root 用户 USER appuser +# 暴露端口 EXPOSE 5002 +# 健康检查 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \ - CMD wget --no-verbose --tries=1 --spider http://localhost:8080/health || exit 1 + CMD wget --no-verbose --tries=1 --spider http://localhost:5002/health || exit 1 +# 启动应用 ENTRYPOINT ["/app/sdk-generator"] \ No newline at end of file diff --git a/internal/service/generator.go b/internal/service/generator.go index adaa567..b37994c 100644 --- a/internal/service/generator.go +++ b/internal/service/generator.go @@ -234,7 +234,6 @@ func (s *SDKGeneratorService) mkdir(ctx context.Context, task *models.Task) (err } } if err = os.MkdirAll(task.OutputDir, 0755); err != nil { - return fmt.Errorf("创建输出目录失败: %v", err) } task.SdkPackage = filepath.Join(task.OutputDir, task.SdkName)