[pull] master from betterde:master

.dockerignore

@@ -1,8 +1,8 @@
 .idea/
 out/
 builds/
-web/cert
-web/dist
-web/node_modules
-web/bindata.go
-web/docs
+spa/cert
+spa/dist
+spa/node_modules
+spa/bindata.go
+spa/docs

.github/workflows/ci.yml

@@ -1,24 +1,35 @@
 name: Build ECTS
 
 on:
-  push:
-    branches:
-      - master
-  pull-request:
-    branches:
-      - master
+  release:
+    types: [published]
 
 jobs:
-  build:
-    name: Build ECTS
+  docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Build assets
-        run: sudo apt-get -y nodejs && npm install && npm run build
-      - name: Packaging assets
-        run: cd ../ && go get -u github.com/shuLhan/go-bindata/... && go-bindata -pkg web -o web/bindata.go web/dist/...
-      - name: Build ECTS application
-        run: |
-          GO111MODULE=on go ge
-          GO111MODULE=on GOOS=darwin go build -ldflags "-s -w" -o "bin/ects_darwin" main.go
-          GO111MODULE=on GOOS=linux go build -ldflags "-s -w" -o "bin/ects_linux" main.go
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Get Release Version
+        run: echo "VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
+      - name: Get Current Time
+        run: echo "BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> $GITHUB_ENV
+      - name: Get Current Time
+        run: echo "GIT_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: betterde/ects:latest,betterde/ects:${{ env.VERSION }}
+          context: .
+          platforms: linux/amd64,linux/arm64
+          build-args: VERSION=${{ env.VERSION }} BUILD_TIME=${{ env.BUILD_TIME }} GIT_COMMIT=${{ env.GIT_COMMIT }}

Dockerfile

@@ -1,33 +1,48 @@
 # 构建前端静态资源
-FROM alpine:latest AS web
-ARG NODEJS_VERSION=10.16.3-r0
-ARG YARN_VERSION=1.17.3
+FROM alpine:3.18 AS web
+ARG YARN_VERSION=1.22.19-r0
+ARG NODEJS_VERSION=18.20.1-r0
 RUN apk update && \
-    apk add nodejs=${NODEJS_VERSION} nodejs-npm=${NODEJS_VERSION} && \
-    npm config set unsafe-perm true && \
-    npm install --global yarn@${YARN_VERSION}
-ADD web /web
+    apk add nodejs=${NODEJS_VERSION} yarn=${YARN_VERSION}
+ADD spa /web
 WORKDIR /web
 RUN yarn && yarn build
 
 # 构建后端可执行文件
-FROM golang:1.13.0-alpine3.10 AS binary
+FROM golang:1.22-alpine3.18 AS binary
+
+ARG VERSION=0.6.2
+
 ADD . /go/src/ects
 WORKDIR /go/src/ects
-COPY --from=web /web/dist /go/src/ects/web/dist
+COPY --from=web /spa/dist /go/src/ects/web/dist
 RUN apk update && \
-    apk add --no-cache git && \
-    cd $GOPATH/src && \
-    go get -u github.com/shuLhan/go-bindata/... && \
-    cd $GOPATH/src/ects && \
-    go-bindata -pkg web -o web/bindata.go web/dist/...
+    apk add --no-cache git
 RUN go mod tidy && \
-    GOOS=linux go build -ldflags "-s -w" -o "bin/ects_linux" main.go
+    BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") && \
+    GIT_COMMIT=$(git rev-parse HEAD) && \
+    CGO_ENABLED=0 GOOS=linux go build -ldflags "-s -w -X github.com/betterde/ects/internal/build.Version=${VERSION} -X github.com/betterde/ects/internal/build.Build=${BUILD_TIME} -X github.com/betterde/ects/internal/build.Commit=${GIT_COMMIT}" -o "bin/ects_linux" main.go
 
 # 构建运行环境
-FROM alpine:3.10
-MAINTAINER George "george@betterde.com"
+FROM alpine:3.18
+
+ARG VERSION=0.6.2
+
+LABEL org.opencontainers.image.url="https://betterde.github.io/ects"
+LABEL org.opencontainers.image.titile="ECTS"
+LABEL org.opencontainers.image.vendor="Betterde Inc."
+LABEL org.opencontainers.image.source="https://github.com/betterde/ects"
+LABEL org.opencontainers.image.version="${VERSION}"
+LABEL org.opencontainers.image.authors="George <george@betterde.com>"
+LABEL org.opencontainers.image.created="2024-08-21 20:35:00"
+LABEL org.opencontainers.image.licenses="MIT"
+LABEL org.opencontainers.image.description="Elastic Crontab System"
+LABEL org.opencontainers.image.documentation="https://betterde.github.io/ects"
+
 COPY --from=binary /go/src/ects/bin/ects_linux /usr/local/bin/ects
+
+HEALTHCHECK --interval=60s CMD curl http://localhost/ || exit 1
+
 EXPOSE 9701
 CMD ["master"]
 ENTRYPOINT ["/usr/local/bin/ects"]

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017–2019 Betterde Inc.
+Copyright (c) 2017–2023 Betterde Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -13,14 +13,12 @@ test:
 
 build:
 	cd web && yarn build
-	go-bindata -pkg web -o web/bindata.go web/dist/...
 	GOOS=darwin go build -ldflags "-s -w" -o "bin/$(BINARY_NAME)_darwin" main.go
 	GOOS=linux go build -ldflags "-s -w" -o "bin/$(BINARY_NAME)_linux" main.go
 	GOOS=windows go build -ldflags "-s -w" -o "bin/$(BINARY_NAME)_windows" main.go
 
 install:
 	cd web && yarn install
-	go get -u github.com/shuLhan/go-bindata/...
 
 clean:
 	go clean -testcache

README.md

@@ -1,6 +1,6 @@
-![dashboard](web/docs/.vuepress/public/logo.png)
+![dashboard](spa/docs/.vuepress/public/logo.png)
 
-[![Build Status](https://www.travis-ci.org/betterde/ects.svg?branch=master)](https://www.travis-ci.org/betterde/ects)
+[![Build Status](https://github.com/betterde/ects/actions/workflows/ci.yml/badge.svg)](https://github.com/betterde/ects/actions/workflows/ci.yml/badge.svg)
 [![GitHub issues](https://img.shields.io/github/issues/betterde/ects)](https://github.com/betterde/ects/issues)
 [![GitHub forks](https://img.shields.io/github/forks/betterde/ects)](https://github.com/betterde/ects/network)
 [![GitHub stars](https://img.shields.io/github/stars/betterde/ects)](https://github.com/betterde/ects/stargazers)
@@ -10,7 +10,7 @@ Elastic Crontab System 是基于 ETCD 实现的分布式定时任务管理系统
 
 ## 架构设计
 
-![dashboard](web/docs/.vuepress/public/architecture.png)
+![dashboard](spa/docs/.vuepress/public/architecture.png)
 
 ## 源码安装
 
@@ -24,12 +24,6 @@ $ cd web && yarn install
 # 打包前端资源
 $ yarn build
 
-# 安装打包静态资源到二进制的工具
-$ cd ../ && go get -u github.com/shuLhan/go-bindata/...
-
-# 打包静态资源
-$ go-bindata -pkg web -o web/bindata.go web/dist/...
-
 # 编译
 $ go build -o ects main.go
 ```
@@ -49,18 +43,18 @@ $ go build -o ects main.go
 - [x] 基于 ETCD 的服务注册于发现；
 - [x] 基于 ETCD 的流水线发布于订阅；
 - [x] 基于 ETCD 实现的分布式锁，用于更新 Worker 节点的状态；
-- [x] 实现 Mail 任务执行器；
 - [x] 实现 HTTP 任务执行器；
 - [x] 实现 Hook 任务执行器；
-- [x] 集成单元测试；
 - [x] 集成 Docker 部署；
 - [x] 集成 CI；
 - [x] 项目文档；
-- [] 热重启；
-- [] 软件更新；
 - [] 角色权限管理模块。
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=betterde/ects&type=Date)](https://star-history.com/#betterde/ects&Date)
+
 ## 赞助商
 
-[![jetbrains](web/docs/.vuepress/public/jetbrains.svg)](https://www.jetbrains.com/?from=ects)
+[![jetbrains](spa/docs/.vuepress/public/jetbrains.svg)](https://www.jetbrains.com/?from=ects)