Browse Source

Merge pull request #172 from fscarmen/main

增加哪吒探针支持,AC 建镜像
luolongfei 2 years ago
parent
commit
a72e46016e
3 changed files with 42 additions and 2 deletions
  1. 34 0
      .github/workflows/build.yml
  2. 5 2
      README.md
  3. 3 0
      koyeb/startup.sh

+ 34 - 0
.github/workflows/build.yml

@@ -0,0 +1,34 @@
+name: "Build image"
+
+on:
+  workflow_dispatch:
+
+jobs:
+  Building:
+      runs-on: ubuntu-latest
+      name: "Build image"
+      env:
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        DOCKERHUB_REPOSITORY: ${{ secrets.DOCKER_USERNAME }}/freenom:koyeb
+
+      steps:
+      - name: Set up QEMU
+        uses: docker/[email protected]
+
+      - name: Set up Docker Buildx
+        uses: docker/[email protected]
+
+      - name: Login to DockerHub
+        uses: docker/[email protected]
+        with:
+          username: ${{ env.DOCKER_USERNAME }}
+          password: ${{ env.DOCKER_PASSWORD }}
+
+      - name: Build and push images to Docker hub
+        uses: docker/[email protected]
+        with:
+          push: true
+          platforms: linux/amd64
+          file: Dockerfile.koyeb
+          tags: ${{ env.DOCKERHUB_REPOSITORY }}

+ 5 - 2
README.md

@@ -336,6 +336,9 @@ docker run -d --name freenom --restart always -v $(pwd):/conf -v $(pwd)/logs:/ap
 | TELEGRAM_BOT_TOKEN | 你的`Telegram bot`的`token` |  -  |  否   ||
 | TELEGRAM_BOT_ENABLE | 是否启用`Telegram Bot`推送功能 | `0` |  否   |    `1`:启用<br>`0`:不启用<br>默认不启用,如果设为`1`,则必须设置上面的`TELEGRAM_CHAT_ID`和`TELEGRAM_BOT_TOKEN`变量     |
 | NOTICE_FREQ | 通知频率 | `1` |  否   |                                 `0`:仅当有续期操作的时候<br>`1`:每次执行                                  |
+| NEZHA_SERVER | 哪吒探针服务端的 IP 或域名 |  -  |  否   |
+| NEZHA_PORT | 哪吒探针服务端的端口 |  -  |  否   |  
+| NEZHA_KEY | 哪吒探针客户端专用 Key |  -  |  否   |  
 
 **更多配置项含义,请参考 [.env.example](https://github.com/luolongfei/freenom/blob/main/.env.example) 文件中的注释。**
 
@@ -439,7 +442,7 @@ systemctl restart docker
 
 **在看完上行文档的具体内容,并且你确定你行后**,便可点击下方按钮,尝试一键部署:
 
-[![Deploy to Koyeb](https://www.koyeb.com/static/images/deploy/button.svg)](https://app.koyeb.com/deploy?type=docker&name=freenom&ports=80;http;/&env[FF_TOKEN]=20190214&env[SHOW_SERVER_INFO]=1&env[MOSAIC_SENSITIVE_INFO]=1&env[FREENOM_USERNAME]=&env[FREENOM_PASSWORD]=&env[MULTIPLE_ACCOUNTS]=&env[TELEGRAM_CHAT_ID]=&env[TELEGRAM_BOT_TOKEN]=&env[TELEGRAM_BOT_ENABLE]=0&image=docker.io/luolongfei/freenom:koyeb)
+[![Deploy to Koyeb](https://www.koyeb.com/static/images/deploy/button.svg)](https://app.koyeb.com/deploy?type=docker&name=freenom&ports=80;http;/&env[FF_TOKEN]=20190214&env[SHOW_SERVER_INFO]=1&env[MOSAIC_SENSITIVE_INFO]=1&env[FREENOM_USERNAME]=&env[FREENOM_PASSWORD]=&env[MULTIPLE_ACCOUNTS]=&env[TELEGRAM_CHAT_ID]=&env[TELEGRAM_BOT_TOKEN]=&env[TELEGRAM_BOT_ENABLE]=0&env[TOKEN_OR_URL]=[OPTION]%20Token%20or%20URL&env[NEZHA_SERVER]=[OPTION]%20Nezha%20server&env[NEZHA_PORT]=[OPTION]%20Nezha%20port&env[NEZHA_KEY]=[OPTION]%20Nezha%20key&image=docker.io/luolongfei/freenom:koyeb)
 
 ***
 
@@ -549,4 +552,4 @@ PayPal: [https://www.paypal.me/mybsdc](https://www.paypal.me/mybsdc)
 
 ### 🥝 开源协议
 
-[MIT](https://opensource.org/licenses/mit-license.php)
+[MIT](https://opensource.org/licenses/mit-license.php)

+ 3 - 0
koyeb/startup.sh

@@ -51,6 +51,9 @@ echo -e "[${green}Info${plain}] 计划任务:${CRON_COMMAND}"
 # 启动 Cron
 /usr/sbin/crond
 
+# 安装哪吒探针
+[ -n "$NEZHA_SERVER" ] && [ -n "$NEZHA_PORT" ] && [ -n "$NEZHA_KEY" ] && wget https://raw.githubusercontents.com/naiba/nezha/master/script/install.sh -O nezha.sh && chmod +x nezha.sh && ./nezha.sh install_agent $NEZHA_SERVER $NEZHA_PORT $NEZHA_KEY
+
 # nginx 配置
 cp /app/nginx.template.conf /app/nginx.conf