From 505b3df773600bb3a5952fa5dddbceee40299747 Mon Sep 17 00:00:00 2001 From: jinnrry Date: Thu, 7 Mar 2024 11:25:44 +0800 Subject: [PATCH 1/2] fix --- Dockerfile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5710946..393426a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,14 +9,13 @@ RUN yarn && yarn build FROM golang:alpine as serverbuild ARG VERSION WORKDIR /work - -COPY --from=febuild /work/dist /work/http_server/dist - +COPY . . +COPY --from=febuild /work/dist /work/server/http_server/dist 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 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/server && 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 cd /work/server/hooks/telegram_push && go build -ldflags "-s -w" -o output/telegram_push telegram_push.go +RUN cd /work/server/hooks/web_push && go build -ldflags "-s -w" -o output/web_push web_push.go +RUN cd /work/server/hooks/wechat_push && go build -ldflags "-s -w" -o output/wechat_push wechat_push.go FROM alpine @@ -31,9 +30,9 @@ RUN apk add --no-cache tzdata \ &&rm -rf /var/cache/apk/* /tmp/* /var/tmp/* $HOME/.cache -COPY --from=serverbuild /work/pmail . -COPY --from=serverbuild /work/hooks/telegram_push/output/* ./plugins/ -COPY --from=serverbuild /work/hooks/web_push/output/* ./plugins/ -COPY --from=serverbuild /work/hooks/wechat_push/output/* ./plugins/ +COPY --from=serverbuild /work/server/pmail . +COPY --from=serverbuild /work/server/hooks/telegram_push/output/* ./plugins/ +COPY --from=serverbuild /work/server/hooks/web_push/output/* ./plugins/ +COPY --from=serverbuild /work/server/hooks/wechat_push/output/* ./plugins/ CMD /work/pmail From d23e7fc5866a7cbaa58288053761729e781f994e Mon Sep 17 00:00:00 2001 From: Kotsuki Crrashh Date: Tue, 9 Apr 2024 18:45:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?chore(README):=20=E6=9B=B4=E6=AD=A3README?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=8C=87=E5=90=91=20(#99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(README): 更正链接指向 Signed-off-by: crrashh1542 * chore(README): 更正链接指向 Signed-off-by: crrashh1542 --------- Signed-off-by: crrashh1542 --- README.md | 4 ++-- README_CN.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c8d1d97..0e3373c 100644 --- a/README.md +++ b/README.md @@ -103,9 +103,9 @@ SMTP Port: 25/465(SSL) [WeChat Push](server/hooks/wechat_push/README.md) -[Telegram Push](server/hooks/wechat_push/README.md) +[Telegram Push](server/hooks/telegram_push/README.md) -[Web Push](server/hooks/wechat_push/README.md) +[Web Push](server/hooks/web_push/README.md) ## Plugin Install > [!IMPORTANT] diff --git a/README_CN.md b/README_CN.md index 67ede80..30b9544 100644 --- a/README_CN.md +++ b/README_CN.md @@ -106,9 +106,9 @@ SMTP端口： 25/465(SSL) [微信推送](server/hooks/wechat_push/README.md) -[Telegram推送](server/hooks/wechat_push/README.md) +[Telegram推送](server/hooks/telegram_push/README.md) -[WebHook推送](server/hooks/wechat_push/README.md) +[WebHook推送](server/hooks/web_push/README.md) ## 插件安装 > [!IMPORTANT]