From 3917b2503aa61120b80a84b15ef42a7b945787e3 Mon Sep 17 00:00:00 2001 From: user123 Date: Mon, 26 Jan 2026 23:49:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 5 +++-- Dockerfile | 5 +++-- src/main.go | 5 ++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c4279e3..2336b24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,12 +62,13 @@ jobs: - name: 编译二进制文件 run: | cd src + VERSION=${{ steps.version.outputs.version }} # Linux AMD64 - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ../build/hubproxy/hubproxy-linux-amd64 . + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X main.Version=${VERSION}" -o ../build/hubproxy/hubproxy-linux-amd64 . # Linux ARM64 - CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="-s -w" -o ../build/hubproxy/hubproxy-linux-arm64 . + CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="-s -w -X main.Version=${VERSION}" -o ../build/hubproxy/hubproxy-linux-arm64 . # 压缩二进制文件 upx -9 ../build/hubproxy/hubproxy-linux-amd64 diff --git a/Dockerfile b/Dockerfile index e4f248e..704ddb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM golang:1.25-alpine AS builder ARG TARGETARCH +ARG VERSION=dev WORKDIR /app COPY src/go.mod src/go.sum ./ @@ -8,7 +9,7 @@ RUN go mod download && apk add upx COPY src/ . -RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} go build -ldflags="-s -w" -trimpath -o hubproxy . && upx -9 hubproxy +RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} go build -ldflags="-s -w -X main.Version=${VERSION}" -trimpath -o hubproxy . && upx -9 hubproxy FROM alpine @@ -17,4 +18,4 @@ WORKDIR /root/ COPY --from=builder /app/hubproxy . COPY --from=builder /app/config.toml . -CMD ["./hubproxy"] \ No newline at end of file +CMD ["./hubproxy"] diff --git a/src/main.go b/src/main.go index 07c25bc..04f016d 100644 --- a/src/main.go +++ b/src/main.go @@ -40,6 +40,8 @@ var ( serviceStartTime = time.Now() ) +var Version = "dev" + func buildRouter(cfg *config.AppConfig) *gin.Engine { gin.SetMode(gin.ReleaseMode) router := gin.Default() @@ -148,7 +150,7 @@ func main() { fmt.Printf("H2c: 已启用\n") } - fmt.Printf("版本号: v1.2.1\n") + fmt.Printf("版本号: %s\n", Version) fmt.Printf("项目地址: https://github.com/sky22333/hubproxy\n") // 创建HTTP2服务器 @@ -205,6 +207,7 @@ func initHealthRoutes(router *gin.Engine) { c.JSON(http.StatusOK, gin.H{ "ready": true, "service": "hubproxy", + "version": Version, "start_time_unix": serviceStartTime.Unix(), "uptime_sec": uptimeSec, "uptime_human": uptimeHuman,