diff --git a/.github/workflows/build-image-for-test.yml b/.github/workflows/build-image-for-test.yml new file mode 100644 index 00000000..73ecec71 --- /dev/null +++ b/.github/workflows/build-image-for-test.yml @@ -0,0 +1,79 @@ +name: build-image-for-test +on: + push: + branches: ['v2-dev'] + paths: + - "build-dev.trigger" + +# schedule: +# - # 国际时间 19:17 执行,北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间 +# - cron: '17 19 * * *' +permissions: + contents: read + +jobs: + build-certd-image: + runs-on: ubuntu-latest + steps: + - name: Checkout Code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: v2-dev + + - name: get_certd_version + id: get_certd_version + uses: actions/github-script@v6 + with: + result-encoding: string + script: | + const fs = require('fs'); + const path = require('path'); + const pnpmWorkspace = "./pnpm-workspace.yaml"; + fs.unlinkSync(pnpmWorkspace) + const jsonFilePath = "./packages/ui/certd-server/package.json"; + const jsonContent = fs.readFileSync(jsonFilePath, 'utf-8'); + const pkg = JSON.parse(jsonContent) + console.log("certd_version:",pkg.version); + return pkg.version +# - name: Use Node.js +# uses: actions/setup-node@v4 +# with: +# node-version: 18 +# cache: 'npm' +# working-directory: ./packages/ui/certd-client + - run: | + npm install -g pnpm@8.15.7 + pnpm install + npm run build + working-directory: ./packages/ui/certd-client + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to aliyun container Registry + uses: docker/login-action@v3 + with: + registry: registry.cn-shenzhen.aliyuncs.com + username: ${{ secrets.aliyun_cs_username }} + password: ${{ secrets.aliyun_cs_password }} + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.dockerhub_username }} + password: ${{ secrets.dockerhub_password }} + + - name: Build default platforms + uses: docker/build-push-action@v6 + with: + platforms: linux/amd64,linux/arm64 + push: true + context: ./packages/ui/ + tags: | + registry.cn-shenzhen.aliyuncs.com/handsfree/certd-dev:latest + greper/certd-dev:latest + diff --git a/build-dev.trigger b/build-dev.trigger new file mode 100644 index 00000000..aed7fe9a --- /dev/null +++ b/build-dev.trigger @@ -0,0 +1 @@ +21:59 diff --git a/docs/guide/index.md b/docs/guide/index.md index f12c888f..c1bcce58 100644 --- a/docs/guide/index.md +++ b/docs/guide/index.md @@ -30,5 +30,5 @@ Certd 是一款开源、免费、全自动申请和部署更新SSL证书的工 ## 三、证书颁发机构对比 * Let's Encrypt:申请最简单。 -* Google: 大厂光环,兼容性好,需要翻墙配置EAB。 -* ZeroSSL: 有数量限制,需要配置EAB但无需翻墙。 \ No newline at end of file +* Google: 大厂光环,兼容性好,需要翻墙获取EAB。 +* ZeroSSL: 有数量限制,获取EAB无需翻墙。 \ No newline at end of file diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts index 9c67d9cc..7e7155bb 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts @@ -55,12 +55,12 @@ export class CertApplyPlugin extends CertApplyBasePlugin { }, required: true, helper: - "DNS直接验证:适合域名是在阿里云、腾讯云、华为云、Cloudflare、西数注册的,需要提供Access授权信息。\nCNAME代理验证:支持任何注册商注册的域名,并且不需要提供Access授权信息,但第一次需要手动添加CNAME记录", + "DNS直接验证:域名是在阿里云、腾讯云、华为云、Cloudflare、西数注册的,选它。\nCNAME代理验证:支持任何注册商注册的域名,并且不需要提供Access授权信息,但第一次需要手动添加CNAME记录", }) challengeType!: string; @TaskInput({ - title: "DNS提供商", + title: "DNS解析服务商", component: { name: "dns-provider-selector", }, @@ -72,7 +72,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin { } `, required: true, - helper: "请选择dns解析提供商,您的域名是在哪里注册的,或者域名的dns解析服务器属于哪个平台\n如果这里没有您需要的dns解析提供商,请选择CNAME代理验证校验方式", + helper: "请选择dns解析服务商,您的域名是在哪里注册的,或者域名的dns解析服务器属于哪个平台\n如果这里没有您需要的dns解析服务商,请选择CNAME代理验证校验方式", }) dnsProviderType!: string; @@ -82,7 +82,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin { name: "access-selector", }, required: true, - helper: "请选择dns解析提供商授权", + helper: "请选择dns解析服务商授权", mergeScript: `return { component:{ type: ctx.compute(({form})=>{ @@ -134,7 +134,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin { { value: "zerossl", label: "ZeroSSL" }, ], }, - helper: "Let's Encrypt最简单,Google兼容性最好,如果使用ZeroSSL、Google证书,需要提供EAB授权", + helper: "Let's Encrypt:申请最简单\nGoogle:大厂光环,兼容性好,需要翻墙获取EAB授权\nZeroSSL:有数量限制,获取EAB授权无需翻墙", required: true, }) sslProvider!: SSLProvider;