diff --git a/Dockerfile b/Dockerfile index 5b63ed8..f99ad20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,54 +1,21 @@ -# 阶段1: 构建 -FROM golang:1.26-alpine AS builder - -RUN apk add --no-cache git ca-certificates tzdata - -ENV TZ=Asia/Shanghai -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - -ENV GO111MODULE=on -ENV GOPROXY=https://goproxy.cn,direct -ENV CGO_ENABLED=0 -ENV GOTOOLCHAIN=auto -ENV GOPRIVATE=gitea.com/red-future/common - -# 配置git使用私有Gitea仓库 -RUN git config --global url."http://116.204.74.41:3000/red-future/common.git".insteadOf "https://gitea.com/red-future/common.git" && \ - git config --global credential.helper store - -# 设置GIT凭据 -RUN echo "http://x-token-auth:9b31146aa8c10a7cb4f2e49dcee0934a223be1076289810e1ad98b968066c2bc@116.204.74.41:3000" > ~/.git-credentials - -WORKDIR /build - -COPY go.mod go.sum ./ -COPY main.go ./ -COPY config.yml ./ - -RUN go mod download && go mod tidy - -RUN go build -ldflags="-s -w" -o main ./main.go - -# 阶段2: 运行 -FROM alpine:3.19 - -RUN apk add --no-cache ca-certificates tzdata - -ENV TZ=Asia/Shanghai -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +# 最小化Docker镜像 +FROM busybox:uclibc WORKDIR /app -COPY --from=builder /build/main . -COPY --from=builder /build/config.yml ./ +# 复制时区数据(从本地复制) +COPY timezone/localtime /etc/localtime +COPY timezone/timezone /etc/timezone +COPY timezone/Shanghai /usr/share/zoneinfo/Asia/Shanghai -RUN mkdir -p /app/resource/log/run \ - /app/resource/log/server \ - && adduser -D -u 1000 appuser \ - && chown -R appuser:appuser /app +# 复制预构建的二进制文件和配置文件 +COPY gateway_binary ./main +COPY config.yml ./ -USER appuser +# 创建日志目录 +RUN mkdir -p /logs /app/resource/log/run /app/resource/log/server EXPOSE 8000 +# 使用root用户运行(避免权限问题) CMD ["./main"] diff --git a/go.mod b/go.mod index b57bea3..c04aab9 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,8 @@ require ( github.com/gogf/gf/v2 v2.10.0 ) +replace gitea.com/red-future/common v0.0.11 => ../common + require ( github.com/BurntSushi/toml v1.5.0 // indirect github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect diff --git a/go.sum b/go.sum index 1ba6f87..6cf82b0 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -gitea.com/red-future/common v0.0.11 h1:AV7W3G0uZ8aPpHHSHd4ZHmLWe5+2STPKe/AYPoPCWVc= -gitea.com/red-future/common v0.0.11/go.mod h1:B8syUI4XbLCDQSeRHURYxEwnWw8mEFgmqCxjC+lM+NU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=