jinnrry hace 2 años
padre
commit
4fcf18857e
Se han modificado 3 ficheros con 8 adiciones y 7 borrados
  1. 1 0
      .github/workflows/release.yml
  2. 4 4
      Dockerfile
  3. 3 3
      DockerfileGithubAction

+ 1 - 0
.github/workflows/release.yml

@@ -57,6 +57,7 @@ jobs:
             go build -ldflags "-s -w" -o ${{ env.TGFILENAME }} hooks/telegram_push/telegram_push.go 
             go build -ldflags "-s -w" -o ${{ env.WEBFILENAME }} hooks/web_push/web_push.go 
             go build -ldflags "-s -w" -o ${{ env.WCFILENAME }} hooks/wechat_push/wechat_push.go
+            ls -alh
       - name: Upload files to Artifacts
         uses: actions/upload-artifact@v3
         with:

+ 4 - 4
Dockerfile

@@ -14,10 +14,10 @@ COPY server .
 COPY --from=febuild /work/dist /work/http_server/dist
 
 RUN apk update && apk add git
-RUN go build -ldflags "-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 cd /work/hooks/telegram_push && go build -ldflags "-s -W" -o output/telegram_push main.go
-RUN cd /work/hooks/web_push && go build -ldflags "-s -W" -o output/web_push main.go
-RUN cd /work/hooks/wechat_push && go build -ldflags "-s -W" -o output/wechat_push main.go
+RUN go build -ldflags "-s -w -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 cd /work/hooks/telegram_push && go build -ldflags "-s -w" -o output/telegram_push main.go
+RUN cd /work/hooks/web_push && go build -ldflags "-s -w" -o output/web_push main.go
+RUN cd /work/hooks/wechat_push && go build -ldflags "-s -w" -o output/wechat_push main.go
 
 
 FROM alpine

+ 3 - 3
DockerfileGithubAction

@@ -6,9 +6,9 @@ COPY server .
 
 RUN apk update && apk add git
 RUN go build -ldflags "-s -w -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 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
+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
 
 
 FROM alpine