From 8a3ee3808f11b5d8cebac2e7ccf6484131774644 Mon Sep 17 00:00:00 2001
From: jinnrry <ok@xjiangwei.cn>
Date: Mon, 4 Mar 2024 20:49:19 +0800
Subject: [PATCH] fix

---
 .github/workflows/docker_build.yml     | 5 ++++-
 .github/workflows/docker_build_pre.yml | 5 ++++-
 DockerfileGithubAction                 | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
index 0f516d6..d586b0c 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -22,6 +22,7 @@ jobs:
           echo "${GITHUB_REF/refs\/tags\//}"
           echo "${GITHUB_REF#refs/*/}"
           echo "${GITHUB_REF}"
+          echo "GITHASH=${git show -s --format=%H}" >> ${GITHASH}
       - uses: actions/checkout@v3
 
       - name: set lower case repository name
@@ -51,7 +52,9 @@ jobs:
       - name: Build and push Docker images
         uses: docker/build-push-action@v4
         with:
-          build-args: VERSION=${{ env.VERSION }}
+          build-args: |
+            VERSION=${{ env.VERSION }}
+            GITHASH=${{ env.GITHASH }}
           context: .
           file: ./DockerfileGithubAction
           platforms: |
diff --git a/.github/workflows/docker_build_pre.yml b/.github/workflows/docker_build_pre.yml
index 21799d5..bdf752e 100644
--- a/.github/workflows/docker_build_pre.yml
+++ b/.github/workflows/docker_build_pre.yml
@@ -22,6 +22,7 @@ jobs:
           echo "${GITHUB_REF/refs\/tags\//}"
           echo "${GITHUB_REF#refs/*/}"
           echo "${GITHUB_REF}"
+          echo "GITHASH=${git show -s --format=%H}" >> ${GITHASH}
       - uses: actions/checkout@v3
 
       - name: set lower case repository name
@@ -51,7 +52,9 @@ jobs:
       - name: Build and push Docker images
         uses: docker/build-push-action@v4
         with:
-          build-args: VERSION=${{ env.VERSION }}
+          build-args: |
+            VERSION=${{ env.VERSION }}
+            GITHASH=${{ env.GITHASH }}
           context: .
           file: ./DockerfileGithubAction
           platforms: |
diff --git a/DockerfileGithubAction b/DockerfileGithubAction
index 3150d01..ef08d69 100644
--- a/DockerfileGithubAction
+++ b/DockerfileGithubAction
@@ -1,11 +1,12 @@
 FROM golang:alpine as serverbuild
 ARG VERSION
+ARG GITHASH
 WORKDIR /work
 
 COPY server .
 
 RUN apk update && apk add git
-RUN go build -ldflags "-s -w -X 'main.version=${VERSION}' -X 'main.goVersion=$(go version)' -X 'main.gitHash=$(git show -s --format=%H)' -X 'main.buildTime=$(TZ=UTC-8 date +%Y-%m-%d" "%H:%M:%S)'" -o pmail main.go
+RUN go build -ldflags "-s -w -X 'main.version=${VERSION}' -X 'main.goVersion=$(go version)' -X 'main.gitHash=${GITHASH}' -X 'main.buildTime=$(TZ=UTC-8 date +%Y-%m-%d" "%H:%M:%S)'" -o pmail main.go
 RUN cd /work/hooks/telegram_push && go build -ldflags "-s -w" -o output/telegram_push telegram_push.go
 RUN cd /work/hooks/web_push && go build -ldflags "-s -w" -o output/web_push web_push.go
 RUN cd /work/hooks/wechat_push && go build -ldflags "-s -w" -o output/wechat_push wechat_push.go