From 98c1c6d31f91c9ed3c96cde6aa5cd74d5cd79873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Wed, 1 Apr 2026 13:04:57 +0800 Subject: [PATCH 1/6] Dockerfile --- Dockerfile | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..c7cc19a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,51 @@ +# 阶段1: 构建 +FROM golang:1.25-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://x-token-auth:9b31146aa8c10a7cb4f2e49dcee0934a223be1076289810e1ad98b968066c2bc@116.204.74.41:3000/red-future/common.git".insteadOf "https://gitea.com/red-future/common.git" && \ + git config --global credential.helper store + +WORKDIR /build + +# 复制父目录的 common 模块(因为 go.mod 中使用了本地 replace) +COPY ../common /build/common +COPY . . + +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 + +WORKDIR /app + +COPY --from=builder /build/main . +COPY --from=builder /build/config.yml ./ + +RUN mkdir -p /app/resource/log/run \ + /app/resource/log/server \ + && adduser -D -u 1000 appuser \ + && chown -R appuser:appuser /app + +USER appuser + +EXPOSE 8000 + +CMD ["./main"] diff --git a/go.mod b/go.mod index 724f007..5c8e4f6 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.25.7 //replace gitea.com/red-future/common => ../common require ( - gitea.com/red-future/common v0.0.4 + gitea.com/red-future/common v0.0.6 github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.0 github.com/gogf/gf/v2 v2.10.0 github.com/gorilla/websocket v1.5.3 diff --git a/go.sum b/go.sum index ea60525..08d0585 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -gitea.com/red-future/common v0.0.3/go.mod h1:mq4smQZFI5nYul6gvLH7ScnC/26bAOcTvR3hP625NYY= -gitea.com/red-future/common v0.0.4/go.mod h1:UI9N5UUjilbMPF7+/lypZSnqDVHigt14300oSRrAyZg= +gitea.com/red-future/common v0.0.6 h1:2Otksfcy5V5JCBcqd2eRKh4WwZ/iAiIhJZMr6uM1x+Q= +gitea.com/red-future/common v0.0.6/go.mod h1:UI9N5UUjilbMPF7+/lypZSnqDVHigt14300oSRrAyZg= 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= From 6008ddf6436d84130c6e74ea355e90d48e032b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Wed, 1 Apr 2026 13:16:31 +0800 Subject: [PATCH 2/6] Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c7cc19a..0488d2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,6 +46,6 @@ RUN mkdir -p /app/resource/log/run \ USER appuser -EXPOSE 8000 +EXPOSE 3000 CMD ["./main"] From 65dc04322c1b04062f75105c2e785597824e1c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Wed, 1 Apr 2026 13:49:13 +0800 Subject: [PATCH 3/6] Dockerfile --- Dockerfile | 2 -- go.mod | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0488d2d..c31d1da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,6 @@ RUN git config --global url."http://x-token-auth:9b31146aa8c10a7cb4f2e49dcee0934 WORKDIR /build -# 复制父目录的 common 模块(因为 go.mod 中使用了本地 replace) -COPY ../common /build/common COPY . . RUN go mod download && go mod tidy diff --git a/go.mod b/go.mod index 2a6e4a6..cf4844a 100644 --- a/go.mod +++ b/go.mod @@ -2,10 +2,10 @@ module customer-server go 1.25.7 -replace gitea.com/red-future/common v0.0.6 => ../common +replace gitea.com/red-future/common v0.0.7 => ../common require ( - gitea.com/red-future/common v0.0.6 + gitea.com/red-future/common v0.0.7 github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.0 github.com/gogf/gf/v2 v2.10.0 github.com/gorilla/websocket v1.5.3 From 425728b22f6346caba21351b1c8b55cebd246009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Fri, 3 Apr 2026 11:05:03 +0800 Subject: [PATCH 4/6] =?UTF-8?q?golang=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A71?= =?UTF-8?q?.26.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cf4844a..b16c0dc 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module customer-server -go 1.25.7 +go 1.26.0 -replace gitea.com/red-future/common v0.0.7 => ../common +replace gitea.com/red-future/common v0.0.9 => ../common require ( - gitea.com/red-future/common v0.0.7 + gitea.com/red-future/common v0.0.9 github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.0 github.com/gogf/gf/v2 v2.10.0 github.com/gorilla/websocket v1.5.3 From c87cde60d2a6a584d664b7a367ed67ae9ae90e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Fri, 3 Apr 2026 11:30:12 +0800 Subject: [PATCH 5/6] =?UTF-8?q?golang=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A71?= =?UTF-8?q?.26.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c31d1da..870551b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # 阶段1: 构建 -FROM golang:1.25-alpine AS builder +FROM golang:1.26-alpine AS builder RUN apk add --no-cache git ca-certificates tzdata From f38906579887e8f74e1c8389745eb266a9a53596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Fri, 3 Apr 2026 11:39:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?golang=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A71?= =?UTF-8?q?.26.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index b16c0dc..a046e75 100644 --- a/go.mod +++ b/go.mod @@ -2,10 +2,10 @@ module customer-server go 1.26.0 -replace gitea.com/red-future/common v0.0.9 => ../common +replace gitea.com/red-future/common v0.0.11 => ../common require ( - gitea.com/red-future/common v0.0.9 + gitea.com/red-future/common v0.0.11 github.com/gogf/gf/contrib/nosql/redis/v2 v2.10.0 github.com/gogf/gf/v2 v2.10.0 github.com/gorilla/websocket v1.5.3