From 7a46eb7e6370b5857310f0f3a34ceea73643d0bf Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Sat, 12 Jul 2025 10:11:08 +0800 Subject: [PATCH 01/56] =?UTF-8?q?=F0=9F=A4=97=E6=B7=BB=E5=8A=A0=E5=BA=94?= =?UTF-8?q?=E7=94=A8Forgejo=20Runner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/7.0.0/data.yml | 67 ++++++++++++++++++++++++ forgejo-runner/7.0.0/docker-compose.yml | 23 ++++++++ forgejo-runner/README.md | 66 +++++++++++++++++++++++ forgejo-runner/data.yml | 31 +++++++++++ forgejo-runner/logo.png | Bin 0 -> 9200 bytes 5 files changed, 187 insertions(+) create mode 100644 forgejo-runner/7.0.0/data.yml create mode 100644 forgejo-runner/7.0.0/docker-compose.yml create mode 100644 forgejo-runner/README.md create mode 100644 forgejo-runner/data.yml create mode 100644 forgejo-runner/logo.png diff --git a/forgejo-runner/7.0.0/data.yml b/forgejo-runner/7.0.0/data.yml new file mode 100644 index 000000000..690e9483f --- /dev/null +++ b/forgejo-runner/7.0.0/data.yml @@ -0,0 +1,67 @@ +additionalProperties: + formFields: + - default: http://1.2.3.4:3000 + edit: true + envKey: FORGEJO_INSTANCE_URL + labelEn: Forgejo Instance + labelZh: Forgejo 实例 + required: true + rule: paramExtUrl + type: text + label: + en: Forgejo Instance + ja: Forgejo インスタンス + ms: Instans Forgejo + pt-br: Instância Forgejo + ru: Экземпляр Forgejo + ko: Forgejo 인스턴스 + zh-Hant: Forgejo 實例 + zh: Forgejo 实例 + - default: '' + edit: true + envKey: RUNNER_REGISTRATION_TOKEN + labelEn: Registration Token + labelZh: Registration Token + required: true + type: text + label: + en: Registration Token + ja: 登録トークン + ms: Token Pendaftaran + pt-br: Token de Registro + ru: Токен регистрации + ko: 등록 토큰 + zh-Hant: 註冊令牌 + zh: 注册令牌 + - default: '' + edit: true + envKey: RUNNER_NAME + labelEn: Runner Name + labelZh: Runner Name + required: true + type: text + label: + en: Runner Name + ja: ランナー名 + ms: Nama Pelari + pt-br: Nome do Runner + ru: Имя бегуна + ko: 러너 이름 + zh-Hant: 執行器名稱 + zh: 运行器名称 + - default: '' + edit: true + envKey: RUNNER_LABELS + labelEn: Runner Labels + labelZh: Runner Labels + required: true + type: text + label: + en: Runner Labels + ja: ランナータグ + ms: Label Pelari + pt-br: Rótulos do Runner + ru: Метки бегуна + ko: 러너 레이블 + zh-Hant: 執行器標籤 + zh: 运行器标签 diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml new file mode 100644 index 000000000..dc8e81f08 --- /dev/null +++ b/forgejo-runner/7.0.0/docker-compose.yml @@ -0,0 +1,23 @@ +services: + forgejo_runner: + image: code.forgejo.org/forgejo/runner:7.0.0 + container_name: ${CONTAINER_NAME} + restart: always + networks: + - 1panel-network + volumes: + #- ./data/config.yaml:/config.yaml # 可选配置 + - ./data/data:/data + - /var/run/docker.sock:/var/run/docker.sock + environment: + #- CONFIG_FILE=/config.yaml + - FORGEJO_INSTANCE_URL=${FORGEJO_INSTANCE_URL} + - FORGEJO_RUNNER_REGISTRATION_TOKEN=${RUNNER_REGISTRATION_TOKEN} + - FORGEJO_RUNNER_NAME=${RUNNER_NAME} + - FORGEJO_RUNNER_LABELS=${RUNNER_LABELS} + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true diff --git a/forgejo-runner/README.md b/forgejo-runner/README.md new file mode 100644 index 000000000..da6622eb7 --- /dev/null +++ b/forgejo-runner/README.md @@ -0,0 +1,66 @@ +# Forgejo Actions Runner + +**Forgejo Actions Runner** 是 Forgejo 的官方运行器组件,用于执行 CI/CD 工作流中的各类任务。它与 Forgejo Actions 系统集成,支持本地或远程运行任务,帮助用户构建自动化 DevOps 流程。 + +适合希望**完全自托管** CI/CD 流水线的个人或组织部署使用。 + +## ✨ 特性 + +- 与 Forgejo Actions 完全集成 +- 支持自定义容器或直接在主机运行 +- 多 Runner 支持并行执行 +- 支持 amd64 / arm64 等架构 +- 简单易用,部署轻量 + +## ⚙️ 快速开始(Docker 部署) + +### 1. 启动 Forgejo 主服务(略) + +确保 Forgejo 主程序已部署并启用了 Actions 功能。 + +### 2. 运行 Action Runner 容器 + +```bash +docker run -d --name forgejo-runner \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -v /opt/runner:/data \ + codeberg.org/forgejo/runner:latest +``` + +### 3. 初始化注册 + +首次运行后,进入容器进行注册: + +```bash +docker exec -it forgejo-runner forgejo-runner register +``` + +你需要提供: + +- **Forgejo 实例 URL**(例如 `https://git.example.com`) +- **Runner Token**(从仓库或组织设置中获取) +- **运行模式**(Docker / shell 等) +- **标签**(可选,便于任务调度) + +## 🔄 自动启动示例(Docker Compose) + +```yaml +version: '3' +services: + forgejo-runner: + image: codeberg.org/forgejo/runner:latest + container_name: forgejo-runner + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - ./runner-data:/data + restart: unless-stopped +``` + +## 📘 文档与资源 + +- 项目主页:https://forgejo.org/docs/latest/admin/actions/ +- 源码仓库:https://code.forgejo.org/forgejo/runner + +## 🧑‍🤝‍🧑 关于 Forgejo Runner + +Forgejo Runner 是社区主导的 CI 执行器,致力于提供安全、可控、可扩展的构建环境。它是 Forgejo 构建完整 DevOps 生态的重要组成部分。 diff --git a/forgejo-runner/data.yml b/forgejo-runner/data.yml new file mode 100644 index 000000000..cf716a6f2 --- /dev/null +++ b/forgejo-runner/data.yml @@ -0,0 +1,31 @@ +name: Forgejo Runner +tags: + - DevOps +title: Forgejo Actions 的 Runner +description: Forgejo Actions 的 Runner +additionalProperties: + key: forgejo-runner + name: Forgejo Runner + tags: + - DevOps + shortDescZh: Forgejo Actions 的 Runner + shortDescEn: A runner for Forgejo based on Forgejo fork of act + description: + en: A runner for Forgejo based on Forgejo fork of act + ja: act の Forgejo フォークに基づいた Forgejo 用ランナー + ms: Penjalank untuk Forgejo berdasarkan fork Forgejo dari act + pt-br: Um runner para Forgejo baseado no fork do Forgejo do act + ru: Раннер для Forgejo на основе форка Forgejo от act + ko: act의 Forgejo 포크를 기반으로 한 Forgejo용 러너 + zh-Hant: 基於 Forgejo fork 的 act 的 Forgejo 執行器 + zh: 基于 Forgejo fork 的 act 的 Forgejo 运行器 + type: tool + crossVersionUpdate: true + limit: 0 + recommend: 0 + website: https://forgejo.org/docs/latest/admin/actions/ + github: https://code.forgejo.org/forgejo/runner + document: https://forgejo.org/docs/latest/admin/actions/ + architectures: + - amd64 + - arm64 diff --git a/forgejo-runner/logo.png b/forgejo-runner/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4e5f549489427adf7c4cc57d92480a5762a71886 GIT binary patch literal 9200 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 Date: Sat, 12 Jul 2025 11:40:06 +0800 Subject: [PATCH 02/56] =?UTF-8?q?=F0=9F=98=A3=E5=87=BA=E4=BA=86=E7=82=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E7=BB=A7=E7=BB=AD=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?runner=E7=9A=84compose=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/7.0.0/docker-compose.yml | 27 ++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml index dc8e81f08..fcbaa9c43 100644 --- a/forgejo-runner/7.0.0/docker-compose.yml +++ b/forgejo-runner/7.0.0/docker-compose.yml @@ -1,3 +1,5 @@ +version: "3.9" + services: forgejo_runner: image: code.forgejo.org/forgejo/runner:7.0.0 @@ -5,19 +7,30 @@ services: restart: always networks: - 1panel-network + command: >- + bash -c ' + if [ ! -f /data/.runner ]; then + forgejo-runner create-runner-file --connect \ + --instance ${FORGEJO_INSTANCE_URL} \ + --name ${RUNNER_NAME} \ + --secret ${RUNNER_SHARED_SECRET} ; + sed -i -e "s|\"labels\": null|\"labels\": [\"${RUNNER_LABELS}\"]|" /data/.runner ; + forgejo-runner generate-config --config /data/config.yml ; + sed -i -e "s| level: info| level: debug|" /data/config.yml ; + fi ; + forgejo-runner --config /data/config.yml daemon + ' volumes: - #- ./data/config.yaml:/config.yaml # 可选配置 - - ./data/data:/data + - ./data:/data - /var/run/docker.sock:/var/run/docker.sock environment: - #- CONFIG_FILE=/config.yaml - FORGEJO_INSTANCE_URL=${FORGEJO_INSTANCE_URL} - - FORGEJO_RUNNER_REGISTRATION_TOKEN=${RUNNER_REGISTRATION_TOKEN} - - FORGEJO_RUNNER_NAME=${RUNNER_NAME} - - FORGEJO_RUNNER_LABELS=${RUNNER_LABELS} + - RUNNER_NAME=${RUNNER_NAME} + - RUNNER_LABELS=${RUNNER_LABELS} + - RUNNER_SHARED_SECRET=${RUNNER_SHARED_SECRET} labels: createdBy: "Apps" -networks: +networks: 1panel-network: external: true From f27f49311381c9b3fe9c3f722e9bfef8169640c5 Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Sat, 12 Jul 2025 15:38:47 +0800 Subject: [PATCH 03/56] =?UTF-8?q?=F0=9F=98=8E=E5=AE=8C=E6=88=90forgejo-run?= =?UTF-8?q?ner=E7=9A=84=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/7.0.0/docker-compose.yml | 39 ++++++++++++----------- forgejo-runner/7.0.0/scripts/init.sh | 32 +++++++++++++++++++ forgejo-runner/7.0.0/scripts/uninstall.sh | 21 ++++++++++++ 3 files changed, 74 insertions(+), 18 deletions(-) create mode 100644 forgejo-runner/7.0.0/scripts/init.sh create mode 100644 forgejo-runner/7.0.0/scripts/uninstall.sh diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml index fcbaa9c43..f14192466 100644 --- a/forgejo-runner/7.0.0/docker-compose.yml +++ b/forgejo-runner/7.0.0/docker-compose.yml @@ -3,34 +3,37 @@ version: "3.9" services: forgejo_runner: image: code.forgejo.org/forgejo/runner:7.0.0 - container_name: ${CONTAINER_NAME} + container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always - networks: - - 1panel-network + user: "1000:1000" # 非 root 用户运行容器 command: >- - bash -c ' - if [ ! -f /data/.runner ]; then - forgejo-runner create-runner-file --connect \ + /bin/sh -c ' + cd /data && + if [ ! -s .runner ]; then + echo ">>> Registering runner..." + forgejo-runner register --no-interactive \ --instance ${FORGEJO_INSTANCE_URL} \ + --token ${RUNNER_REGISTRATION_TOKEN} \ --name ${RUNNER_NAME} \ - --secret ${RUNNER_SHARED_SECRET} ; - sed -i -e "s|\"labels\": null|\"labels\": [\"${RUNNER_LABELS}\"]|" /data/.runner ; - forgejo-runner generate-config --config /data/config.yml ; - sed -i -e "s| level: info| level: debug|" /data/config.yml ; - fi ; - forgejo-runner --config /data/config.yml daemon + --labels ${RUNNER_LABELS}; + forgejo-runner generate-config > config.yml + fi; + echo ">>> Starting daemon..." + forgejo-runner --config config.yml daemon ' volumes: - ./data:/data - - /var/run/docker.sock:/var/run/docker.sock + - /var/run/docker.sock:/var/run/docker-forgejo-runner.sock environment: - FORGEJO_INSTANCE_URL=${FORGEJO_INSTANCE_URL} - - RUNNER_NAME=${RUNNER_NAME} - - RUNNER_LABELS=${RUNNER_LABELS} - - RUNNER_SHARED_SECRET=${RUNNER_SHARED_SECRET} - labels: + - RUNNER_REGISTRATION_TOKEN=${RUNNER_REGISTRATION_TOKEN} + - RUNNER_NAME=${RUNNER_NAME:-default-runner} + - RUNNER_LABELS=${RUNNER_LABELS:-docker:docker://node:20-bookworm} + networks: + - 1panel-network + labels: createdBy: "Apps" networks: 1panel-network: - external: true + external: true \ No newline at end of file diff --git a/forgejo-runner/7.0.0/scripts/init.sh b/forgejo-runner/7.0.0/scripts/init.sh new file mode 100644 index 000000000..76edf8ba9 --- /dev/null +++ b/forgejo-runner/7.0.0/scripts/init.sh @@ -0,0 +1,32 @@ +#!/bin/bash +set -e + +# 创建数据目录并设置权限 +mkdir -p data +touch data/.runner +touch data/config.yml +mkdir -p data/.cache + +# 设置为 forgejo-runner 镜像中的默认非 root 用户 +chown -R 1000:1000 data +chmod 775 data/.runner +chmod 775 data/.cache +chmod g+s data/.runner +chmod g+s data/.cache + +# 创建自定义 docker context 指向 /var/run/docker-forgejo-runner.sock +SOCK_PATH="/var/run/docker-forgejo-runner.sock" +CONTEXT_NAME="forgejo-runner-context" + +# 如果 context 已存在,则先删除 +if docker context inspect "$CONTEXT_NAME" >/dev/null 2>&1; then + docker context rm -f "$CONTEXT_NAME" + echo "已删除旧的 Docker context: $CONTEXT_NAME" +fi + +docker context create "$CONTEXT_NAME" \ + --docker "host=unix://$SOCK_PATH" + +echo "✅ 初始化完成:" +echo " - 已创建 ./data 并配置权限" +echo " - 已创建 Docker context: $CONTEXT_NAME -> $SOCK_PATH" diff --git a/forgejo-runner/7.0.0/scripts/uninstall.sh b/forgejo-runner/7.0.0/scripts/uninstall.sh new file mode 100644 index 000000000..cfdd4632b --- /dev/null +++ b/forgejo-runner/7.0.0/scripts/uninstall.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -e + +CONTEXT_NAME="forgejo-runner-context" +SOCK_PATH="/var/run/docker-forgejo-runner.sock" + +# 删除 Docker context +if docker context inspect "$CONTEXT_NAME" >/dev/null 2>&1; then + docker context rm -f "$CONTEXT_NAME" + echo "🗑️ 已删除 Docker context: $CONTEXT_NAME" +else + echo "⚠️ Docker context $CONTEXT_NAME 不存在,跳过删除。" +fi + +# 删除 socket 文件(如果存在) +if [ -S "$SOCK_PATH" ]; then + rm -f "$SOCK_PATH" + echo "🗑️ 已删除 socket 文件: $SOCK_PATH" +else + echo "⚠️ Socket 文件 $SOCK_PATH 不存在,跳过删除。" +fi \ No newline at end of file From 917a71b2e061e6f1501c6d1d1f0166a40c7bd4ae Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Sat, 12 Jul 2025 15:58:42 +0800 Subject: [PATCH 04/56] =?UTF-8?q?=F0=9F=98=B6=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=AE=9E=E7=8E=B0=E5=AE=B9=E5=99=A8=E5=86=85?= =?UTF-8?q?=E9=83=A8=E6=93=8D=E4=BD=9C=EF=BC=8C=E9=98=B2=E6=AD=A2=E8=A2=AB?= =?UTF-8?q?=E5=88=A0=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/7.0.0/docker-compose.yml | 17 ++--------------- forgejo-runner/7.0.0/scripts/register.sh | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 forgejo-runner/7.0.0/scripts/register.sh diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml index f14192466..bbe82ad12 100644 --- a/forgejo-runner/7.0.0/docker-compose.yml +++ b/forgejo-runner/7.0.0/docker-compose.yml @@ -6,23 +6,10 @@ services: container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always user: "1000:1000" # 非 root 用户运行容器 - command: >- - /bin/sh -c ' - cd /data && - if [ ! -s .runner ]; then - echo ">>> Registering runner..." - forgejo-runner register --no-interactive \ - --instance ${FORGEJO_INSTANCE_URL} \ - --token ${RUNNER_REGISTRATION_TOKEN} \ - --name ${RUNNER_NAME} \ - --labels ${RUNNER_LABELS}; - forgejo-runner generate-config > config.yml - fi; - echo ">>> Starting daemon..." - forgejo-runner --config config.yml daemon - ' + command: "command: chmod +x /data/scripts/register.sh && /data/scripts/register.sh" volumes: - ./data:/data + - ./scripts/register.sh:/data/scripts/register.sh:ro - /var/run/docker.sock:/var/run/docker-forgejo-runner.sock environment: - FORGEJO_INSTANCE_URL=${FORGEJO_INSTANCE_URL} diff --git a/forgejo-runner/7.0.0/scripts/register.sh b/forgejo-runner/7.0.0/scripts/register.sh new file mode 100644 index 000000000..1f4a73f27 --- /dev/null +++ b/forgejo-runner/7.0.0/scripts/register.sh @@ -0,0 +1,17 @@ +#!/bin/sh +set -e + +cd /data + +if [ ! -s .runner ]; then + echo ">>> Registering runner..." + forgejo-runner register --no-interactive \ + --instance "$FORGEJO_INSTANCE_URL" \ + --token "$RUNNER_REGISTRATION_TOKEN" \ + --name "$RUNNER_NAME" \ + --labels "$RUNNER_LABELS" + forgejo-runner generate-config > config.yml +fi + +echo ">>> Starting daemon..." +exec forgejo-runner --config config.yml daemon From 36b6d9e9dc9139c0c600d698501d34252962022a Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Sat, 12 Jul 2025 16:10:00 +0800 Subject: [PATCH 05/56] =?UTF-8?q?=F0=9F=A4=97=E4=BF=AE=E6=94=B9=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=B8=BA=E5=A4=96=E9=83=A8=E6=93=8D=E4=BD=9C=EF=BC=8C?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E5=86=85=E9=83=A8=E8=BF=9B=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/7.0.0/docker-compose.yml | 5 ++--- forgejo-runner/7.0.0/scripts/init.sh | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml index bbe82ad12..1b4b9d4d6 100644 --- a/forgejo-runner/7.0.0/docker-compose.yml +++ b/forgejo-runner/7.0.0/docker-compose.yml @@ -1,15 +1,14 @@ version: "3.9" - services: forgejo_runner: image: code.forgejo.org/forgejo/runner:7.0.0 container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always user: "1000:1000" # 非 root 用户运行容器 - command: "command: chmod +x /data/scripts/register.sh && /data/scripts/register.sh" + command: "/data/scripts/register.sh" volumes: - ./data:/data - - ./scripts/register.sh:/data/scripts/register.sh:ro + - ./scripts/register.sh:/data/scripts/register.sh - /var/run/docker.sock:/var/run/docker-forgejo-runner.sock environment: - FORGEJO_INSTANCE_URL=${FORGEJO_INSTANCE_URL} diff --git a/forgejo-runner/7.0.0/scripts/init.sh b/forgejo-runner/7.0.0/scripts/init.sh index 76edf8ba9..ff459c1a6 100644 --- a/forgejo-runner/7.0.0/scripts/init.sh +++ b/forgejo-runner/7.0.0/scripts/init.sh @@ -14,6 +14,8 @@ chmod 775 data/.cache chmod g+s data/.runner chmod g+s data/.cache +chmod +x ./scripts/register.sh + # 创建自定义 docker context 指向 /var/run/docker-forgejo-runner.sock SOCK_PATH="/var/run/docker-forgejo-runner.sock" CONTEXT_NAME="forgejo-runner-context" @@ -29,4 +31,5 @@ docker context create "$CONTEXT_NAME" \ echo "✅ 初始化完成:" echo " - 已创建 ./data 并配置权限" +echo " - 已创建 ./scripts/register.sh 并配置权限" echo " - 已创建 Docker context: $CONTEXT_NAME -> $SOCK_PATH" From 12f1cd55268f7b56a3069d7f6e4de9deece5ca4b Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Sat, 12 Jul 2025 17:15:03 +0800 Subject: [PATCH 06/56] =?UTF-8?q?=F0=9F=98=98=E4=BF=AE=E6=94=B9=E4=B8=BAdi?= =?UTF-8?q?nd=E6=96=B9=E5=BC=8F=E8=BF=9B=E8=A1=8C=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/7.0.0/docker-compose.yml | 20 +++++++++++-- forgejo-runner/7.0.0/scripts/init.sh | 22 +++++++------- forgejo-runner/7.0.0/scripts/uninstall.sh | 36 +++++++++++------------ 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml index 1b4b9d4d6..431e3ee99 100644 --- a/forgejo-runner/7.0.0/docker-compose.yml +++ b/forgejo-runner/7.0.0/docker-compose.yml @@ -1,16 +1,32 @@ version: "3.9" services: + dind: + image: docker:dind + container_name: forgejo-dind + privileged: true + restart: 'unless-stopped' + command: ['dockerd', '-H', 'tcp://0.0.0.0:2375', '--tls=false'] + environment: + DOCKER_TLS_CERTDIR: "" + networks: + - 1panel-network forgejo_runner: image: code.forgejo.org/forgejo/runner:7.0.0 container_name: ${CONTAINER_NAME:-forgejo-runner} + depends_on: + dind: + condition: service_started + links: + - dind restart: always user: "1000:1000" # 非 root 用户运行容器 command: "/data/scripts/register.sh" volumes: - ./data:/data - - ./scripts/register.sh:/data/scripts/register.sh - - /var/run/docker.sock:/var/run/docker-forgejo-runner.sock + - ./scripts/register.sh:/data/scripts/register.sh:ro + # - /var/run/docker.sock:/var/run/docker-forgejo-runner.sock environment: + - DOCKER_HOST=tcp://dind:2375 - FORGEJO_INSTANCE_URL=${FORGEJO_INSTANCE_URL} - RUNNER_REGISTRATION_TOKEN=${RUNNER_REGISTRATION_TOKEN} - RUNNER_NAME=${RUNNER_NAME:-default-runner} diff --git a/forgejo-runner/7.0.0/scripts/init.sh b/forgejo-runner/7.0.0/scripts/init.sh index ff459c1a6..fab55c447 100644 --- a/forgejo-runner/7.0.0/scripts/init.sh +++ b/forgejo-runner/7.0.0/scripts/init.sh @@ -16,20 +16,20 @@ chmod g+s data/.cache chmod +x ./scripts/register.sh -# 创建自定义 docker context 指向 /var/run/docker-forgejo-runner.sock -SOCK_PATH="/var/run/docker-forgejo-runner.sock" -CONTEXT_NAME="forgejo-runner-context" +# # 创建自定义 docker context 指向 /var/run/docker-forgejo-runner.sock +# SOCK_PATH="/var/run/docker-forgejo-runner.sock" +# CONTEXT_NAME="forgejo-runner-context" -# 如果 context 已存在,则先删除 -if docker context inspect "$CONTEXT_NAME" >/dev/null 2>&1; then - docker context rm -f "$CONTEXT_NAME" - echo "已删除旧的 Docker context: $CONTEXT_NAME" -fi +# # 如果 context 已存在,则先删除 +# if docker context inspect "$CONTEXT_NAME" >/dev/null 2>&1; then +# docker context rm -f "$CONTEXT_NAME" +# echo "已删除旧的 Docker context: $CONTEXT_NAME" +# fi -docker context create "$CONTEXT_NAME" \ - --docker "host=unix://$SOCK_PATH" +# docker context create "$CONTEXT_NAME" \ +# --docker "host=unix://$SOCK_PATH" echo "✅ 初始化完成:" echo " - 已创建 ./data 并配置权限" echo " - 已创建 ./scripts/register.sh 并配置权限" -echo " - 已创建 Docker context: $CONTEXT_NAME -> $SOCK_PATH" +# echo " - 已创建 Docker context: $CONTEXT_NAME -> $SOCK_PATH" diff --git a/forgejo-runner/7.0.0/scripts/uninstall.sh b/forgejo-runner/7.0.0/scripts/uninstall.sh index cfdd4632b..5f09780b9 100644 --- a/forgejo-runner/7.0.0/scripts/uninstall.sh +++ b/forgejo-runner/7.0.0/scripts/uninstall.sh @@ -1,21 +1,21 @@ -#!/bin/bash -set -e +# #!/bin/bash +# set -e -CONTEXT_NAME="forgejo-runner-context" -SOCK_PATH="/var/run/docker-forgejo-runner.sock" +# CONTEXT_NAME="forgejo-runner-context" +# SOCK_PATH="/var/run/docker-forgejo-runner.sock" -# 删除 Docker context -if docker context inspect "$CONTEXT_NAME" >/dev/null 2>&1; then - docker context rm -f "$CONTEXT_NAME" - echo "🗑️ 已删除 Docker context: $CONTEXT_NAME" -else - echo "⚠️ Docker context $CONTEXT_NAME 不存在,跳过删除。" -fi +# # 删除 Docker context +# if docker context inspect "$CONTEXT_NAME" >/dev/null 2>&1; then +# docker context rm -f "$CONTEXT_NAME" +# echo "🗑️ 已删除 Docker context: $CONTEXT_NAME" +# else +# echo "⚠️ Docker context $CONTEXT_NAME 不存在,跳过删除。" +# fi -# 删除 socket 文件(如果存在) -if [ -S "$SOCK_PATH" ]; then - rm -f "$SOCK_PATH" - echo "🗑️ 已删除 socket 文件: $SOCK_PATH" -else - echo "⚠️ Socket 文件 $SOCK_PATH 不存在,跳过删除。" -fi \ No newline at end of file +# # 删除 socket 文件(如果存在) +# if [ -S "$SOCK_PATH" ]; then +# rm -f "$SOCK_PATH" +# echo "🗑️ 已删除 socket 文件: $SOCK_PATH" +# else +# echo "⚠️ Socket 文件 $SOCK_PATH 不存在,跳过删除。" +# fi \ No newline at end of file From f5a97c24c5c9b57366594d4cbe676f9f60351d46 Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Sun, 13 Jul 2025 09:44:10 +0800 Subject: [PATCH 07/56] =?UTF-8?q?=F0=9F=98=8E=E4=BF=AE=E6=94=B9=E6=88=90ro?= =?UTF-8?q?ot=E6=9D=83=E9=99=90=E7=9B=B4=E6=8E=A5=E8=B7=91=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=80=83=E8=99=91=E9=83=A8=E5=88=86=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/7.0.0/docker-compose.yml | 26 +++++------------------ forgejo-runner/7.0.0/scripts/init.sh | 14 ------------ forgejo-runner/7.0.0/scripts/uninstall.sh | 21 ------------------ 3 files changed, 5 insertions(+), 56 deletions(-) delete mode 100644 forgejo-runner/7.0.0/scripts/uninstall.sh diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml index 431e3ee99..b7d507ddd 100644 --- a/forgejo-runner/7.0.0/docker-compose.yml +++ b/forgejo-runner/7.0.0/docker-compose.yml @@ -1,36 +1,20 @@ version: "3.9" services: - dind: - image: docker:dind - container_name: forgejo-dind - privileged: true - restart: 'unless-stopped' - command: ['dockerd', '-H', 'tcp://0.0.0.0:2375', '--tls=false'] - environment: - DOCKER_TLS_CERTDIR: "" - networks: - - 1panel-network forgejo_runner: image: code.forgejo.org/forgejo/runner:7.0.0 container_name: ${CONTAINER_NAME:-forgejo-runner} - depends_on: - dind: - condition: service_started - links: - - dind restart: always - user: "1000:1000" # 非 root 用户运行容器 command: "/data/scripts/register.sh" volumes: - ./data:/data - ./scripts/register.sh:/data/scripts/register.sh:ro - # - /var/run/docker.sock:/var/run/docker-forgejo-runner.sock + - /var/run/docker.sock:/var/run/docker.sock # 使用宿主机 Docker environment: - - DOCKER_HOST=tcp://dind:2375 + - DOCKER_HOST=unix:///var/run/docker.sock # 指定宿主机 socket - FORGEJO_INSTANCE_URL=${FORGEJO_INSTANCE_URL} - RUNNER_REGISTRATION_TOKEN=${RUNNER_REGISTRATION_TOKEN} - - RUNNER_NAME=${RUNNER_NAME:-default-runner} - - RUNNER_LABELS=${RUNNER_LABELS:-docker:docker://node:20-bookworm} + - RUNNER_NAME=${RUNNER_NAME} + - RUNNER_LABELS=${RUNNER_LABELS} networks: - 1panel-network labels: @@ -38,4 +22,4 @@ services: networks: 1panel-network: - external: true \ No newline at end of file + external: true diff --git a/forgejo-runner/7.0.0/scripts/init.sh b/forgejo-runner/7.0.0/scripts/init.sh index fab55c447..7bb9c32f2 100644 --- a/forgejo-runner/7.0.0/scripts/init.sh +++ b/forgejo-runner/7.0.0/scripts/init.sh @@ -16,20 +16,6 @@ chmod g+s data/.cache chmod +x ./scripts/register.sh -# # 创建自定义 docker context 指向 /var/run/docker-forgejo-runner.sock -# SOCK_PATH="/var/run/docker-forgejo-runner.sock" -# CONTEXT_NAME="forgejo-runner-context" - -# # 如果 context 已存在,则先删除 -# if docker context inspect "$CONTEXT_NAME" >/dev/null 2>&1; then -# docker context rm -f "$CONTEXT_NAME" -# echo "已删除旧的 Docker context: $CONTEXT_NAME" -# fi - -# docker context create "$CONTEXT_NAME" \ -# --docker "host=unix://$SOCK_PATH" - echo "✅ 初始化完成:" echo " - 已创建 ./data 并配置权限" echo " - 已创建 ./scripts/register.sh 并配置权限" -# echo " - 已创建 Docker context: $CONTEXT_NAME -> $SOCK_PATH" diff --git a/forgejo-runner/7.0.0/scripts/uninstall.sh b/forgejo-runner/7.0.0/scripts/uninstall.sh deleted file mode 100644 index 5f09780b9..000000000 --- a/forgejo-runner/7.0.0/scripts/uninstall.sh +++ /dev/null @@ -1,21 +0,0 @@ -# #!/bin/bash -# set -e - -# CONTEXT_NAME="forgejo-runner-context" -# SOCK_PATH="/var/run/docker-forgejo-runner.sock" - -# # 删除 Docker context -# if docker context inspect "$CONTEXT_NAME" >/dev/null 2>&1; then -# docker context rm -f "$CONTEXT_NAME" -# echo "🗑️ 已删除 Docker context: $CONTEXT_NAME" -# else -# echo "⚠️ Docker context $CONTEXT_NAME 不存在,跳过删除。" -# fi - -# # 删除 socket 文件(如果存在) -# if [ -S "$SOCK_PATH" ]; then -# rm -f "$SOCK_PATH" -# echo "🗑️ 已删除 socket 文件: $SOCK_PATH" -# else -# echo "⚠️ Socket 文件 $SOCK_PATH 不存在,跳过删除。" -# fi \ No newline at end of file From 5cd791bdb2db0e2c0943cfafafba97eb93c4eb13 Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Sun, 13 Jul 2025 11:43:53 +0800 Subject: [PATCH 08/56] =?UTF-8?q?=F0=9F=98=97=E4=BD=BF=E7=94=A8root?= =?UTF-8?q?=E6=9D=83=E9=99=90=E8=BF=9B=E8=A1=8Caction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/7.0.0/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml index b7d507ddd..eab170c58 100644 --- a/forgejo-runner/7.0.0/docker-compose.yml +++ b/forgejo-runner/7.0.0/docker-compose.yml @@ -4,6 +4,7 @@ services: image: code.forgejo.org/forgejo/runner:7.0.0 container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always + user: root command: "/data/scripts/register.sh" volumes: - ./data:/data From ca06eda6322e19c0a981da027a73df5b3a7a805b Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Sun, 13 Jul 2025 13:41:59 +0800 Subject: [PATCH 09/56] =?UTF-8?q?=F0=9F=98=8E=E5=88=86=E5=BC=80=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=EF=BC=8Cdind=E4=BB=A5=E5=8F=8A=E5=AE=BF=E4=B8=BB?= =?UTF-8?q?=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/7.0.0/data.yml | 67 +++++++++++++++++ forgejo-runner-dind/7.0.0/docker-compose.yml | 45 ++++++++++++ forgejo-runner-dind/7.0.0/scripts/init.sh | 62 ++++++++++++++++ forgejo-runner-dind/7.0.0/scripts/register.sh | 24 +++++++ forgejo-runner-dind/README.md | 68 ++++++++++++++++++ forgejo-runner-dind/data.yml | 31 ++++++++ forgejo-runner-dind/logo.png | Bin 0 -> 9200 bytes 7 files changed, 297 insertions(+) create mode 100644 forgejo-runner-dind/7.0.0/data.yml create mode 100644 forgejo-runner-dind/7.0.0/docker-compose.yml create mode 100644 forgejo-runner-dind/7.0.0/scripts/init.sh create mode 100644 forgejo-runner-dind/7.0.0/scripts/register.sh create mode 100644 forgejo-runner-dind/README.md create mode 100644 forgejo-runner-dind/data.yml create mode 100644 forgejo-runner-dind/logo.png diff --git a/forgejo-runner-dind/7.0.0/data.yml b/forgejo-runner-dind/7.0.0/data.yml new file mode 100644 index 000000000..690e9483f --- /dev/null +++ b/forgejo-runner-dind/7.0.0/data.yml @@ -0,0 +1,67 @@ +additionalProperties: + formFields: + - default: http://1.2.3.4:3000 + edit: true + envKey: FORGEJO_INSTANCE_URL + labelEn: Forgejo Instance + labelZh: Forgejo 实例 + required: true + rule: paramExtUrl + type: text + label: + en: Forgejo Instance + ja: Forgejo インスタンス + ms: Instans Forgejo + pt-br: Instância Forgejo + ru: Экземпляр Forgejo + ko: Forgejo 인스턴스 + zh-Hant: Forgejo 實例 + zh: Forgejo 实例 + - default: '' + edit: true + envKey: RUNNER_REGISTRATION_TOKEN + labelEn: Registration Token + labelZh: Registration Token + required: true + type: text + label: + en: Registration Token + ja: 登録トークン + ms: Token Pendaftaran + pt-br: Token de Registro + ru: Токен регистрации + ko: 등록 토큰 + zh-Hant: 註冊令牌 + zh: 注册令牌 + - default: '' + edit: true + envKey: RUNNER_NAME + labelEn: Runner Name + labelZh: Runner Name + required: true + type: text + label: + en: Runner Name + ja: ランナー名 + ms: Nama Pelari + pt-br: Nome do Runner + ru: Имя бегуна + ko: 러너 이름 + zh-Hant: 執行器名稱 + zh: 运行器名称 + - default: '' + edit: true + envKey: RUNNER_LABELS + labelEn: Runner Labels + labelZh: Runner Labels + required: true + type: text + label: + en: Runner Labels + ja: ランナータグ + ms: Label Pelari + pt-br: Rótulos do Runner + ru: Метки бегуна + ko: 러너 레이블 + zh-Hant: 執行器標籤 + zh: 运行器标签 diff --git a/forgejo-runner-dind/7.0.0/docker-compose.yml b/forgejo-runner-dind/7.0.0/docker-compose.yml new file mode 100644 index 000000000..8dac2d5b0 --- /dev/null +++ b/forgejo-runner-dind/7.0.0/docker-compose.yml @@ -0,0 +1,45 @@ +version: "3.9" +services: + dind: + image: docker:dind + container_name: forgejo-dind + privileged: true + restart: 'unless-stopped' + command: ['dockerd', '-H', 'tcp://0.0.0.0:2375', '--tls=false'] + environment: + DOCKER_TLS_CERTDIR: "" + volumes: + - ./data/dind-data:/var/lib/docker + - ./data/daemon.json:/etc/docker/daemon.json:ro + networks: + - 1panel-network + labels: + createdBy: "Apps" + forgejo_runner: + image: code.forgejo.org/forgejo/runner:7.0.0 + container_name: ${CONTAINER_NAME:-forgejo-runner} + depends_on: + dind: + condition: service_started + links: + - dind + restart: always + user: "1000:1000" # 非 root 用户运行容器 + command: "/data/scripts/register.sh" + volumes: + - ./data/runner-data:/data + - ./scripts/register.sh:/data/scripts/register.sh:ro + environment: + - DOCKER_HOST=tcp://dind:2375 + - FORGEJO_INSTANCE_URL=${FORGEJO_INSTANCE_URL} + - RUNNER_REGISTRATION_TOKEN=${RUNNER_REGISTRATION_TOKEN} + - RUNNER_NAME=${RUNNER_NAME} + - RUNNER_LABELS=${RUNNER_LABELS} + networks: + - 1panel-network + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true \ No newline at end of file diff --git a/forgejo-runner-dind/7.0.0/scripts/init.sh b/forgejo-runner-dind/7.0.0/scripts/init.sh new file mode 100644 index 000000000..4135dc574 --- /dev/null +++ b/forgejo-runner-dind/7.0.0/scripts/init.sh @@ -0,0 +1,62 @@ +#!/bin/bash +set -e + +echo "🚀 正在初始化 Forgejo Runner 所需目录..." + +# 进入项目目录 +mkdir -p data +cd data + +## ---------------------------- +## Runner 数据目录及权限设置 +## ---------------------------- + +mkdir -p runner-data +touch runner-data/.runner +touch runner-data/config.yml +mkdir -p runner-data/.cache + +# 设置权限为 forgejo-runner 镜像中默认用户(UID 1000) +chown -R 1000:1000 runner-data +chmod 775 runner-data/.runner +chmod 775 runner-data/.cache +chmod g+s runner-data/.runner +chmod g+s runner-data/.cache + +## ---------------------------- +## Docker-in-Docker 数据目录 +## ---------------------------- + +mkdir -p dind-data +echo "📦 已创建 ./data/dind-data 目录(用于持久化 dind 镜像和元数据)" + +## ---------------------------- +## daemon.json 镜像加速配置 +## ---------------------------- + +if [ -f /etc/docker/daemon.json ]; then + echo "📥 检测到宿主机的 /etc/docker/daemon.json,正在复制..." + cp /etc/docker/daemon.json ./daemon.json +else + echo "📄 未检测到宿主机 daemon.json,正在生成默认镜像加速配置..." + cat > ./daemon.json <>> Registering runner..." + forgejo-runner register --no-interactive \ + --instance "$FORGEJO_INSTANCE_URL" \ + --token "$RUNNER_REGISTRATION_TOKEN" \ + --name "$RUNNER_NAME" \ + --labels "$RUNNER_LABELS" + forgejo-runner generate-config > config.yml +fi + +echo ">>> Starting daemon..." +exec forgejo-runner --config config.yml daemon diff --git a/forgejo-runner-dind/README.md b/forgejo-runner-dind/README.md new file mode 100644 index 000000000..e57248e1c --- /dev/null +++ b/forgejo-runner-dind/README.md @@ -0,0 +1,68 @@ +# Forgejo Actions Runner + +**Forgejo Actions Runner** 是 Forgejo 的官方运行器组件,用于执行 CI/CD 工作流中的各类任务。它与 Forgejo Actions 系统集成,支持本地或远程运行任务,帮助用户构建自动化 DevOps 流程。 + +> 该容器基于Dind,安全性更强,与宿主机完全独立,基本没有越权,适合组织使用 + +适合希望**完全自托管** CI/CD 流水线的个人或组织部署使用。 + +## ✨ 特性 + +- 与 Forgejo Actions 完全集成 +- 支持自定义容器或直接在主机运行 +- 多 Runner 支持并行执行 +- 支持 amd64 / arm64 等架构 +- 简单易用,部署轻量 + +## ⚙️ 快速开始(Docker 部署) + +### 1. 启动 Forgejo 主服务(略) + +确保 Forgejo 主程序已部署并启用了 Actions 功能。 + +### 2. 运行 Action Runner 容器 + +```bash +docker run -d --name forgejo-runner \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -v /opt/runner:/data \ + codeberg.org/forgejo/runner:latest +``` + +### 3. 初始化注册 + +首次运行后,进入容器进行注册: + +```bash +docker exec -it forgejo-runner forgejo-runner register +``` + +你需要提供: + +- **Forgejo 实例 URL**(例如 `https://git.example.com`) +- **Runner Token**(从仓库或组织设置中获取) +- **运行模式**(Docker / shell 等) +- **标签**(可选,便于任务调度) + +## 🔄 自动启动示例(Docker Compose) + +```yaml +version: '3' +services: + forgejo-runner: + image: codeberg.org/forgejo/runner:latest + container_name: forgejo-runner + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - ./runner-data:/data + restart: unless-stopped +``` + +## 📘 文档与资源 + +- 项目主页:https://forgejo.org/docs/latest/admin/actions/ +- 源码仓库:https://code.forgejo.org/forgejo/runner + +## 🧑‍🤝‍🧑 关于 Forgejo Runner + +Forgejo Runner 是社区主导的 CI 执行器,致力于提供安全、可控、可扩展的构建环境。它是 Forgejo 构建完整 DevOps 生态的重要组成部分。 diff --git a/forgejo-runner-dind/data.yml b/forgejo-runner-dind/data.yml new file mode 100644 index 000000000..dc193293a --- /dev/null +++ b/forgejo-runner-dind/data.yml @@ -0,0 +1,31 @@ +name: Forgejo Runner Docker in Docker +tags: + - DevOps +title: Forgejo Actions 的 Runner 基于 Dind +description: Forgejo Actions 的 Runner +additionalProperties: + key: forgejo-runner-dind + name: Forgejo Runner Docker in Docker + tags: + - DevOps + shortDescZh: Forgejo Actions 的 Runner + shortDescEn: A runner for Forgejo based on Forgejo fork of act + description: + en: A runner for Forgejo based on Forgejo fork of act + ja: act の Forgejo フォークに基づいた Forgejo 用ランナー + ms: Penjalank untuk Forgejo berdasarkan fork Forgejo dari act + pt-br: Um runner para Forgejo baseado no fork do Forgejo do act + ru: Раннер для Forgejo на основе форка Forgejo от act + ko: act의 Forgejo 포크를 기반으로 한 Forgejo용 러너 + zh-Hant: 基於 Forgejo fork 的 act 的 Forgejo 執行器 + zh: 基于 Forgejo fork 的 act 的 Forgejo 运行器 + type: tool + crossVersionUpdate: true + limit: 0 + recommend: 0 + website: https://forgejo.org/docs/latest/admin/actions/ + github: https://code.forgejo.org/forgejo/runner + document: https://forgejo.org/docs/latest/admin/actions/ + architectures: + - amd64 + - arm64 diff --git a/forgejo-runner-dind/logo.png b/forgejo-runner-dind/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4e5f549489427adf7c4cc57d92480a5762a71886 GIT binary patch literal 9200 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 Date: Sat, 26 Jul 2025 16:46:50 +0000 Subject: [PATCH 10/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v8 --- forgejo-runner-dind/7.0.0/docker-compose.yml | 2 +- forgejo-runner/7.0.0/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forgejo-runner-dind/7.0.0/docker-compose.yml b/forgejo-runner-dind/7.0.0/docker-compose.yml index 8dac2d5b0..297f5de35 100644 --- a/forgejo-runner-dind/7.0.0/docker-compose.yml +++ b/forgejo-runner-dind/7.0.0/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:7.0.0 + image: code.forgejo.org/forgejo/runner:8.0.0 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/7.0.0/docker-compose.yml index eab170c58..316159638 100644 --- a/forgejo-runner/7.0.0/docker-compose.yml +++ b/forgejo-runner/7.0.0/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.9" services: forgejo_runner: - image: code.forgejo.org/forgejo/runner:7.0.0 + image: code.forgejo.org/forgejo/runner:8.0.0 container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always user: root From a6d20aec7968628444c7d34734022d4b0dc4b4c6 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 26 Jul 2025 16:47:02 +0000 Subject: [PATCH 11/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E=207.0.?= =?UTF-8?q?0=20=E5=8D=87=E7=BA=A7=E5=88=B0=208.0.0=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/{7.0.0 => 8.0.0}/data.yml | 0 forgejo-runner/{7.0.0 => 8.0.0}/docker-compose.yml | 0 forgejo-runner/{7.0.0 => 8.0.0}/scripts/init.sh | 0 forgejo-runner/{7.0.0 => 8.0.0}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner/{7.0.0 => 8.0.0}/data.yml (100%) rename forgejo-runner/{7.0.0 => 8.0.0}/docker-compose.yml (100%) rename forgejo-runner/{7.0.0 => 8.0.0}/scripts/init.sh (100%) rename forgejo-runner/{7.0.0 => 8.0.0}/scripts/register.sh (100%) diff --git a/forgejo-runner/7.0.0/data.yml b/forgejo-runner/8.0.0/data.yml similarity index 100% rename from forgejo-runner/7.0.0/data.yml rename to forgejo-runner/8.0.0/data.yml diff --git a/forgejo-runner/7.0.0/docker-compose.yml b/forgejo-runner/8.0.0/docker-compose.yml similarity index 100% rename from forgejo-runner/7.0.0/docker-compose.yml rename to forgejo-runner/8.0.0/docker-compose.yml diff --git a/forgejo-runner/7.0.0/scripts/init.sh b/forgejo-runner/8.0.0/scripts/init.sh similarity index 100% rename from forgejo-runner/7.0.0/scripts/init.sh rename to forgejo-runner/8.0.0/scripts/init.sh diff --git a/forgejo-runner/7.0.0/scripts/register.sh b/forgejo-runner/8.0.0/scripts/register.sh similarity index 100% rename from forgejo-runner/7.0.0/scripts/register.sh rename to forgejo-runner/8.0.0/scripts/register.sh From 796b6a1ff9f7fdbbd6d125147c116878cae9c0ae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 27 Jul 2025 18:34:50 +0000 Subject: [PATCH 12/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v8.0.1 --- forgejo-runner-dind/7.0.0/docker-compose.yml | 2 +- forgejo-runner/8.0.0/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forgejo-runner-dind/7.0.0/docker-compose.yml b/forgejo-runner-dind/7.0.0/docker-compose.yml index 297f5de35..9cbb6ed0c 100644 --- a/forgejo-runner-dind/7.0.0/docker-compose.yml +++ b/forgejo-runner-dind/7.0.0/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:8.0.0 + image: code.forgejo.org/forgejo/runner:8.0.1 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: diff --git a/forgejo-runner/8.0.0/docker-compose.yml b/forgejo-runner/8.0.0/docker-compose.yml index 316159638..2d35bf3f9 100644 --- a/forgejo-runner/8.0.0/docker-compose.yml +++ b/forgejo-runner/8.0.0/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.9" services: forgejo_runner: - image: code.forgejo.org/forgejo/runner:8.0.0 + image: code.forgejo.org/forgejo/runner:8.0.1 container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always user: root From 29f74d2a4a5e942375284f3a3270c50ee7573b6e Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sun, 27 Jul 2025 18:35:01 +0000 Subject: [PATCH 13/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E=208.0.?= =?UTF-8?q?0=20=E5=8D=87=E7=BA=A7=E5=88=B0=208.0.1=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/{8.0.0 => 8.0.1}/data.yml | 0 forgejo-runner/{8.0.0 => 8.0.1}/docker-compose.yml | 0 forgejo-runner/{8.0.0 => 8.0.1}/scripts/init.sh | 0 forgejo-runner/{8.0.0 => 8.0.1}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner/{8.0.0 => 8.0.1}/data.yml (100%) rename forgejo-runner/{8.0.0 => 8.0.1}/docker-compose.yml (100%) rename forgejo-runner/{8.0.0 => 8.0.1}/scripts/init.sh (100%) rename forgejo-runner/{8.0.0 => 8.0.1}/scripts/register.sh (100%) diff --git a/forgejo-runner/8.0.0/data.yml b/forgejo-runner/8.0.1/data.yml similarity index 100% rename from forgejo-runner/8.0.0/data.yml rename to forgejo-runner/8.0.1/data.yml diff --git a/forgejo-runner/8.0.0/docker-compose.yml b/forgejo-runner/8.0.1/docker-compose.yml similarity index 100% rename from forgejo-runner/8.0.0/docker-compose.yml rename to forgejo-runner/8.0.1/docker-compose.yml diff --git a/forgejo-runner/8.0.0/scripts/init.sh b/forgejo-runner/8.0.1/scripts/init.sh similarity index 100% rename from forgejo-runner/8.0.0/scripts/init.sh rename to forgejo-runner/8.0.1/scripts/init.sh diff --git a/forgejo-runner/8.0.0/scripts/register.sh b/forgejo-runner/8.0.1/scripts/register.sh similarity index 100% rename from forgejo-runner/8.0.0/scripts/register.sh rename to forgejo-runner/8.0.1/scripts/register.sh From 8be253b3df343514a9b2ebd3ab41d102a16a9355 Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Wed, 30 Jul 2025 11:03:59 +0800 Subject: [PATCH 14/56] =?UTF-8?q?=F0=9F=98=8B=E6=B7=BB=E5=8A=A0=E5=BA=94?= =?UTF-8?q?=E7=94=A8message-pusher?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- message-pusher/README.md | 93 ++++++++++++++++++++++ message-pusher/data.yml | 19 +++++ message-pusher/logo.png | Bin 0 -> 14469 bytes message-pusher/v0.4.12/data.yml | 10 +++ message-pusher/v0.4.12/docker-compose.yml | 21 +++++ 5 files changed, 143 insertions(+) create mode 100644 message-pusher/README.md create mode 100644 message-pusher/data.yml create mode 100644 message-pusher/logo.png create mode 100644 message-pusher/v0.4.12/data.yml create mode 100644 message-pusher/v0.4.12/docker-compose.yml diff --git a/message-pusher/README.md b/message-pusher/README.md new file mode 100644 index 000000000..559febaa3 --- /dev/null +++ b/message-pusher/README.md @@ -0,0 +1,93 @@ +# Message Pusher + + > 自托管消息推送服务,支持 Web UI + 多平台推送通道。 + + 本项目使用 [songquanpeng/message-pusher](https://github.com/songquanpeng/message-pusher) 镜像通过 Docker Compose 快速部署,支持通过网页管理和 API 接口进行消息推送。 + + ## ✨ 项目特点 + + - 支持 Telegram、Bark、企业微信、Server 酱等消息推送方式 + - 提供简洁易用的 Web UI 管理界面 + - 支持用户注册、Token 管理 + - 提供 RESTful API 接口,适合自动化集成 + +--- + + ## 📦 快速部署 + + ### 1. 拉取项目 + + ```bash + git clone https://github.com/your-username/message-pusher-docker.git + cd message-pusher-docker + ~~~ + + ### 2. 启动服务 + + ```bash + docker compose up -d + ``` + + 启动成功后访问: + + ``` + http://localhost:3000 + ``` + + 若部署在服务器,请替换为服务器的 IP 或域名。 + + ### 3. 默认配置说明 + + Docker Compose 配置中: + + - **端口映射**:`3000:3000` + - **数据挂载目录**:`./data:/data` + - **时区设置**:`Asia/Shanghai` + +------ + + ## 🧾 Docker Compose 文件示例 + + ```yaml + version: '3' + + services: + message-pusher: + image: songquanpeng/message-pusher + container_name: message-pusher + restart: always + ports: + - "3000:3000" + environment: + - TZ=Asia/Shanghai + volumes: + - ./data:/data + ``` + +------ + + ## 🛠 更新与维护 + + 更新镜像并重启服务: + + ```bash + docker compose pull + docker compose up -d + ``` + +------ + + ## 🔗 官方链接 + + - 官方项目主页: https://github.com/songquanpeng/message-pusher + - 在线体验地址: [https://push.sbs](https://push.sbs/) + - Docker Hub 镜像: https://hub.docker.com/r/songquanpeng/message-pusher + +------ + + ## 📄 License + + MIT License + + 由 [@songquanpeng](https://github.com/songquanpeng) 开发维护。 + diff --git a/message-pusher/data.yml b/message-pusher/data.yml new file mode 100644 index 000000000..9e3c1ffda --- /dev/null +++ b/message-pusher/data.yml @@ -0,0 +1,19 @@ +name: Message-Pusher +tags: + - 实用工具 +title: 自托管消息推送服务 +description: 一款支持多平台的自托管消息推送服务,支持 Web UI 和 API 接口。 +additionalProperties: + key: message-pusher + name: Message-Pusher + tags: + - Tool + shortDescZh: 一款支持多平台的自托管消息推送服务 + shortDescEn: A self-hosted multi-platform message pushing service + type: tool + crossVersionUpdate: true + limit: 0 + recommend: 0 + website: https://github.com/songquanpeng/message-pusher + github: https://github.com/songquanpeng/message-pusher + document: https://github.com/songquanpeng/message-pusher#readme diff --git a/message-pusher/logo.png b/message-pusher/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..e418146a9438ceeea1be975b81cd0c171c25efa1 GIT binary patch literal 14469 zcmdU0g;N~O(*}-kNH`z_NN|D%5AMMwa6o|Imf-GkSa5>7b2waZ3GVIzj>8GA2f-Zz ze7yDj6~C>TotfI%ov!Mh?%t=K4p&u{!^I}WMnOTrRgjlfd+vw+YnT|%_X_RG?B@>M zMN&Zn^ZD|@H2v{BM|Dw?lSHW;CrAGG&_V(%fr3&Ki}Ua6i|09(qr8p_3JNj(e+^YZ zjqU^mMF3ktT0+Cq@X!}4%~a0GT;q$!$~70@%0-Q(BRe$pF360AlRBWzSetXT z*7JA9#C*;n-t6ke=4>qrjVTs>59x9S{6j`OPeHS{ z`CWM{-{Vk}*5`#PLyw7~((He&n`WlcrX4=%Z#lSEzce!hy?gggE&lqew6rvKevq`Z zDYcNiv^2*5(C`s`2}?G}=Dt}lU(_rg@FiaX1hbYVN=YSC&KV`ZJt-;6IUI!iD&E_B zUHmKTN5qR%t-ez^*SO8#TOoLFSa@~@jh9!7B~IAV!UuDml|fJ(u!chNk)#6&5!Vax zmCcgvWkzt4<@ComcUwjpax3#-#6}1d{{T5hIp#`U%=5t8fj^Eiw+I3^f9h!12Y8ES zq0z{O(W7ETvuSUIT{tGSz(`HYg9^YG1nus;aNdKg-YhO^1=<)ixI_$^x1#iQHMfr) z2^^HoOkoQ1Cw!f5YAQZqwx!ye4Ybv`<<$2FVgKMwA_xs5owTL|E0fWAA>K>RaY4I% z`pyU_wlGhk+og>b6fOi*GK(P(oP9QE>3lWpe|sB@Y-DKdAt8&47;w)w%tHMi=zB5M zH{Kh>xg}1`R0RaKm$Ne zJ6*GG5p8y5r(p8=JH(MV+Wz&Uvw|AG)Pe-5cY4QSz4=- z;Mb4W(mHo;Dlm zzl~ZCY^z|v%G=hGYfh6(QZbZv)y(pu{{i~uPq4{7@fCZfP$FAy+vhk@8ARExy|#50 zyKe$0k+qlydBzm~Y7>t>6w}x`EQF-VX=u+=AK?;CptUJOzz8nm8(04y?J?Kt_FF%D zD9@`PAD&KeoNJptE)Y-zI~_kVJnXW8Gq(D#wR2iY={bGD#`kYg1WmtMel@f5dg1C{ z|Dvak51ke7r)X{iG%f)|i%opq#C%P)pkOa1$`X_uo46>k|A)*E31?V#LDBMX9^O`Q z4X;+4G9}Ji8TjRDWTE#zoCw zhHG_%VuO7|;tLJ66osEE8)J391K%hP^7*C1h_=dt#t8~>dWIz%wU-jhLn7ajHv>NgR;4 z(#p6Z1klUP%yz{ji+f?d(&!e*D!PQa(LuAA+bl|aoadi?2MB= zzeO?i>*}N@qu``@FIj6P<{?TnOF1rnG1eh!G7MP(lHcS7Gp>Alf3+4MB&?9!`kRe} zVA*kTq=UF^gJSDS6nxi52;SeM0i?2vd z%rgdD?_B+jVrx`5^WtZznK+8kVfj25HY4)A7A|!bW6qE^yO^^-@k3-zFU7BciUr$kkn5n z-xB>U;S5l&+*rpZP_BHWUhr@7MF8`!7M{2Mo{Yh_XkW$nI$0^@5jsC9j4#7Qx!vo~ zZ4Iq%^MMpUd5{HvsdJNqiFTPP*!{ zFQ*oc3k~&Kqi7GHI zrp{?+wmC|Fwm7q#l$>HfN=C!1qgK;V2ZPFHQ^QKHHUa1i9(HhX*e*@$Ssf9J0nP`~ zGlDq)wo(jyO3aNkZ`K6^Rfz-wHiB`OVwtYCUo~vJDqR^xJ@HR26XgqM<4zEJnHMO^ zZ5>(7mhY~FW=>b>+?S4(KzC(bAc<9ds_L5%)+oa{C^bCrA-}U3?OL813BLG8kv;Ko zwNTjom&;nXJ`X67N4twwX|p1lr!qWDh(5WDeN=XvuhJ(?Y&y&*P36tv151hFdzSW4 z9V^6HL*AKG8^~u1AI`|{QWyqD&<-IG;Fen;?*4V8vsKfHX)=QzbDcR)`;OW9-#)o<0;6iIRjzDu0jLPj5uEPeLKhf!>?UC$!> z)nYIlGez=Q)@NzKUMGy$!)Dipk`u}`eh;S@qQbjk5uq%MC(cbR2}9zBF-^%Qe*)8G zB5-aEl6}NfXsz;{@+r>}Pe-C1Blfv=T=u<7SvH(RF+@PI79GtUzia}W?0Ye+=Qr|R{Ea$#MLa*lsfH@ zZM%ZjY6$j~R)xq^40W^Eu~ahZbIh5);M33+oE+w3frk3m18qsgw~4Kg0h|uvn_quw zvx2mBQpD;2CrsEYvj6U8AVL;>IIZNOyn+876Tul}+xmH*Z$F8w%h1Y8?V-<)Ru~@6 zG_Xa_=}hr_eY0=(i0L#Aul_xr2!@?biYb|Fr%02K=Zx@xGYz-MEr{cMe12|gPF+Av zt-OBIE~Ih*F}Ya;h8@IEB^+`sWbw-dSMJ({_{Hz{Q1=qGMgTv`{_G>F)BHXJBV%1V z<#c1}Ts0Zm{sdZNmjUT}XG$>G7o0>UBKLg6j*q4kBWUHCjJi@Px?gmuaQ$0Oe&Kal zTCluyDmNi8^xdocs8atD5`aodZTs?CoN|=+!V6W2XXGE+1J~DUJWG+JF#PuHufIm} zw(Ga~hECtNw!bxClYbT8svQL5kM@EVkAAV%wAKg?s&<)n_T}Lc5`TCIsr$PG&wI(- zI2h#|U{^+#@_R1Bbzz^}_cY?jsNy;}h`gK!S=zckJ&`=h*m8j}A_wv>Zd2v_Kh-MWwk5I}%%kK_JHH}b&tLS`k#_z|47mP>K)p*n z!;c1$2x_HTEQ$rF+Dna$~12?!#YtlSm<8c9r0mI_DOLsFvi`DrMl}$X_$Q z*D3t_m{xm0qa!=jPRhQPHT-UE=tOp;9uIDF(dZsYI0ZChu# zxAbxi#K5>SqggId5{Gf={SEH_9>c+-y{woB`F^H7HcwYeM;6-Z%5k zq5PHY!VgGqk?MRobe_MrFD(EcH!7LgK7C5h8 zI$cjq(z+$nR_+~2=PqU~UUo4nE-TdS4x5-{6t||vyBf*t_nD$~R~K&6bE}M?DIrb_ z&)7oTv_i1-NE^vWjiY5Eb51DWInQ~FKr>h>GKx9ge?M!{z-v{$${Rdg_gzDSbYRr^ z$EI^fYNUa2YCh! zCx-H7Oa4BUukm)ya7J*u9%_f!x4H)(wL>U;|3zTwawj=U?O~oy9zmF|wu{L9lNc+? ztqL0yhQ4cdVqTt3-@<#ri$(+4t#}3p)SiVDHh694u{yb9=*_ZvA{l*1kxc-MNkh~qDvrlbSr-mGPjLSk2>cy(sjw+Pdu-q4jC^CcJJWn@o%r_F z$FKJ3frVvr`)zBLCp@K}3Zl6l{;~j(t63kFNXq*I?{7BGI{$p~4r8>m{TAiiq%hRQ zCt@C{Iy+1$f?wR&rNXRVpR!kFICzd^mzonAIyf$!T6wi1?_z)zGCd-u#+o9>=$qlQ zupMtLi%qg2_|v&r8Nq!%ZB#auseDlI-Fuz7eVv@ONrn7MITcyjxgt?Nb71M|GsHIe z!OqlR_B6zc3=cxh!okX>c*$VrZF4Osucchma5jzYqE?qY&6&u4l~mYCK|9sfq7Oq^58*)b-i*}@s8DMN3W~7OQ_$$2AUn@Sm^HWrA=(Oi?NnB3+`gH z%%4{$J?qRATQ9t5ZeOTZUNqFg2xC?$%PI<#FXzK2#~c&xLE@7Jd!K;ayWc=ss&H)= zM+$cqCmrDto~@Ls^93jSN~L?y_~-Kzo_064WcyD0s3X5!p}Ui!GRuE&eBIDK%ADLN zK^w;Twywuh1AqH4F!SF3?6M)#GE~1Jl%A)FxPREAR_tvDp1h}W#}}&~VoH!?9!$nh zcH7_u@qtris})8$z~-9*-XrKCPc|ZMJ=+VS_r;d^JmBxHIsts`Hn=Mo~o*^ zC`BE64~G|oM1KdTjwq82A#|h^Z5Ho6#^GJml|}d1sgwuWqQxfy$+e4e??(rAqOUp} zYVXMlS>~uymp>Q0wYL<}VHTgvOUhSk=LhD{)d=MbqEQ$_sDIe-@BpaQ*(e{FzLfFs zs^@(xQaTo`lK(g}PLTT4kEpY8B#Ks!I%iT_ zYjKsMHP$Rv6WhnDbCJ>3_O-Ox7}*$^W1S#%|1)oJ5Lf9Er<0B6(ANGb=+A~OK5Pzrsb=_g?+h&O&C>8}~s)bEG>F?yyv-v?YLTRctNB@;4=0AOUN7*SDO0aB` z-Jf}H$OqkOT*6%HNMRdh#+OvKd8Y`z$*#R>5B%}b-Ee)qxuuwwYDQ64BGfaYb*|p? zaH{r>Si@Nvs&+#|yKEHO?4Ab{qZ)k`XsAUpEjm&a7p=-Ux(sBxol>rJ+rYEOzSa!P z^LfLzGx}xG+c@-$8*wr2#@n)cxaqnJKA0CA@ZB)M5!mEz8<-c;N}bcH0VZwt#Q&>> znw%f$SQFndO~eEMdK*t)WR*~QYinuFg-Z%=!QWTxi{A_^NVPrwWpFJDS{q$M88@}8 zZQzV9Xa8N9Xb8bFfH|bT&2A_D8ib=|F_@Ok4$pgzW$DoT)ebt9>(#o@$BRYYi_*&` zkAT^aSMx?zlfCM0LK-%7xM8ApLCIzgr4Jioj5}0%#UE@ zPPA16X1#OR926Xr{+;K(bT=z85Yj#(Rs@bJNyXjXSWux~J)6(cnu=QniD$H82FU5= zw(`~a6v}eIv-$3t8_4kbI)EjMLw5;E^>1FcVz6=kNxR*zd?u+?cIu#J~YdS3>|A5i@0@_%S@6hHV+P)bG-x4g^ z#L5cD+5HSqFXc*w`L}d^O4+{obSM2ihMiQ<3%Ja0Q0&ajp;bxeT|yr^n}|iE1{SmL z<PTGh7gr@TzwEKxGP1C;oEP0gK)Ji<`Pu*D@Pi zn9WFg3<8LAab|K8p5<+nws|>-BAoZVFZf^?%+c)EY)^OLG_5sw$A6iAG9Y{Y%RK{D zuN8QIoV^Q9%`GE0eTByq2**CRAUaVf@-mzdcz4aG@Ft-V{6j9<3s=3w%IiLZRPF!a*A@_PDx}7l6H<`h1Lw(1z9@%lfO#yHmk1x=ANwOE!o$^n64gNsHe1_IO44QJ5 zwY@PCDIikWu4k8E$ll81I>`r^n1(i@!|CP}8voloBTTb|dj&H<3wvWeH-WGjSL)0v ziL)ppy<+Ovz_9S?p_q5@@IxG{M)ONgKkNIp`-~sutzDkEQ3BoB9}{41G6ez{Oj=|Y zeWuY74@dMRh4xK^!r3tWI9UArZ5;pjN?%3AK7Ak0_<07U>7iiES>Jn2;96#dzs82s zyE?QE#mrrTt=`l%`|I$*N9Q2Q?fLA1ImmqjQgV(1e#8PRoeINxi7CMF0BOK$I|IesZ*b{EQTD>jp6K z-E-I5xsv%__;VNi;%{y@FLz3lpw@L5g6u^WfZ{42j#i<&Q$VZO-#+nMHDHcPBqzw@ zjP&(&dsbW!Q8T6Ei^%KfJJiA$CEq*=+lO%IS@m|`t2=?pP;GBP=D1Xw){y7T z)9;1-20Qd!lY`bm-;@qFlFq^KdYf?7P1Be$9k!J={Bau-^Sa-OawWpJpKMtk?ivjX zfks)~*|CBregh^5x5dxaQz#yO&8`P-*hx6FgVY}LiUX%M)p`9j{hMu%dsJQ5Vs0OQ zQh|Deg2>xq8<$_cUV+tIm1?O`NRGmW)1Hy6gBJz?mCpD+G>LNFNKQ#s8=TLnc_MXi z)!~5|N{YBAxlo{GvBM9)-8`L^GnWbYz(>D8zfCfZ$p%2vIOb?UFHY0?pnB;n?#C+5 zu4y!WltIrv&zUs+EwRe^iGx^@n#Z*lEz?1>k+?LnKWkNU`ol~Sx?$P^rzv>P*A^5v%`QUKp8!SNj8KRhW#f(QA@5I(R ziHui1oK#f~lkE~kaZN%ay1RoIiiz9I#=!eZY%CRv@|ZTo+P0mMO6i0MYvpM4ksP3RSXv3TO8!;T(j9M^008rF;BSBoeY4 zf-cymO1xK}=uu+UBqM)C-0f`20Pd+p`$*)U8KO}!j5o$}nh(_df#4~uH^zVjjTABe zo;a6RE1gVl^MCB0tALU5R~DboHD>RK>f4RXy#KSh#{*T%^|4jneYu0wC?*WQep+_9 zxc0uc{PuvpeOFk>l|V;?l*00)-6aTF#H>!TuP5Bs)hNBTGCQo`6iQ{ne0zV=D>QeF z=qFruIyzzoqTW3^ge&(0flWdAQ?%cKzM!2R_@n9FYh7mDsMLv-i47|?j2pVkZJfl$nhLOw?- z_5x^w>b#Z(hz16&&h@E$w`_#5<~kiA4G3MS^&=;I=qRIqYL6gjT+=cE_`6M{a>7hT zbj=m6$-zPK)vG=frZsrF{L8H1fP8DaK(O?5n4AJEl&P7kjuX6#dolT*!$j!(olAKz zRtZJ^*qR{Szm_s3-jjvz?h!s8CnioYF{%`**$D)*dWB=#I)BGZ@e7C-Z1(b`9>ZXU zS&80cI+O7Lew4Yj?SoVlmA`Co+k!3}*J~4~+DFW8%TvK=FYs3OtMpVwgW|YC3*t5~ zpm_?-d)9=_nOUVO^`<|cFz`8@(Ta*|`w*t$GLo|*FZn0>eE-wWsW5gR`}(JD1k^ z*HO^zc{3rDl-EBVeLN6P%0xPV)|d{-AprAFd`;0EAU&H3>kMbK|z_C2$?J|y1v zbk)q{1*vEZKMF}Npmnz-c+SQtOYNlq+y3ZW>@49EuMWo4ox1RlYAn}7@EE>nb>f8> z$8ayK=6eDa=51HXB`-*Y%=x;v<%NO9>#*~|6A<4VSuBQEZ`D`NXxQnejM;=mD{@hE zFr8E1*7N`rNFz(+`YzjR*i{iz%TFM9vnyO6dzZl6*wX*;cA@tSN873^ouI?zmRZb& zgKLD`!N+1LsxxSOJC2)AQj0$&_3ndHnYy6-!7Ed@3^65GgEg?ZzMt#lr8|BdxH0!x zeKSp70hBn@7b5!vmnp#m7;QrY?@pZJX)1-7l2u$|B$&8B5Z-lJBC#dLgV##EX=|^! zwtF<9pk~IFsw)-ZJ7S}Jxg3@&@mfHhssnq9U;Nr3GygFO zNl14SbMXK?xOf;&J^C=?Rj-^_l;s_$6-)3{4S19W{WFTMrPi#L@{-2EwnIF>(R9l( zZgh?dA+sk0Y&IU7Atko;i`chTg(wcHG>AS9IPB}(~_YS=W&GgX- zN41^rIk1mt;6&cW)7n(4P^An0S}m{OEpd{D zGsb#(B7+K}$E*@!IGt67LHvjA887{KH)MDkr#(k5p?e+mt~*9BqinkG4_a8jXe!Fe zn?BkHBNIl57l!C&-+DI5&U=1N>f>A-&iqgF>AG%HE5r?zNgjE>5G{(oemSv}o#-G% zvJE?f=Q!2YZOU35mqXD!=qkl4k5ePIqDWpf(gCxZ=%1mRgtg&$#;Y$@Pqtuoe4Q={ z$7I<%)Uk9a#-=CZ=p*3(^-8J^0Tr3@kE)pDz%ZPcV@%9snu7Ltwh&2gpW&^H%jG$W z)+vcf!{gBJ&BMnmj?K8arUog z3GtyOrOeU1I@s{FaQ4l5HW%*NV+@BJ>@L_RuX0<-3aMLb+sfKger{BO@H(V?{(sP~ z6;iPYJ9!~dDN^}sQ%)eUcsNyDUl{_&gj5H;JQ3O&w=mx-O@3kMB7gAIR326Jj`A7e zKJd1775S*(?U^mtSi(Sbw~RT({5=&vH3Z9f#&;y}$qEBvIxVibpr}MhFo-6(!Kj~JoCKi-@ zelZlIvwuzbE_#Atgwa3hMU!>Z`-S80zAU~jqdX6(t=EX(-!BWj9naouRNA>nOUbM- z9&2E4;F!hs$0aXtf-Bpi%ao)Pt!f1;3$L@5W$=vOx>f|~f7cC=h2+Ov*DVLWQU^$} zdf=|G+x)7DnI2|{yqFkr&8amyveU<|l<{yVba3_WcP~E+$`0g2T zQCrIu*_g)yWOZo3WcNM6%9s50K1b6t;R z;6>|uRw?fH#tqOW2moEX*`kUC1 z(S)}V9t0#AvVlr=_@&Wd+o&~j3bmLT47QT~e}janj!GRC4f1>uUvwhHqjpDpK%gwl z>$kvWt$%l`_Ida2npU2dZ(_v(NgTvhroZ2a8XUnCpZ+S`^>qF{4UZv5ob!6!sY35g zS<_R{2iNdWOp=pUrDFBW^0kCHw8(ykJ?WWlj`R}W(o~FebAR=9$Ef13(w&1E)Ywp< zdmb-{{4RAe`!-%4JR-wZ(9e^duQD`(_{()+`CB>$Kcr`1p4ydv;OtCwGfy_#ui7^v zBJKG6`xni_0=3#v*lLW#Ryvx2|0ZB3y+Im!~P(A~g&(;)oSZP?(uv7^C zAoibO9FYj0+dKtB!p#_<@DC0lA%%E6^9KE*Sf3-T#pkp?erEFsXq&Lxy2dmPzZ1+^ zN6bx;G$ienulmL{jE2#r#2$+X_qqsDLOuHuOtz;SKNqTc{f*I=SeDAf)bpx{tP?`j z5vGrZEtG%`BTjZXo{3q~Oeb~QFv#olUZ%kDlD?J(Pf|AXUr8d8pA-Ra8wIlC`pLgL zdd403*((?GS^7Xe$J=2nd}V-*UW|&o`&)VqA1eL)lJQI=)%yvZ7IWh-XH!*R7!5?1 zr_DXe@F(6Bi^H;#(Vx11$DY34!ooxN9o+}s3?!u6vU!U!0CXoNVbX+u|9&J%HVJxO zzJ~}olzX>+)e^=$VX69CfQ{FyTXKZ)jzy$I-;5@QIJD3zY06Zx92;Rt4#kVjTeC7E zCC~5teuF~fgot|z>l6HR0q3yKdx(CA8y#J%-UJIcMJdD=4iWkAlCk^Ui!x7jxHqZNs#b(V>57K#Hw-etAogRfN$=|eeLTl*HeqyOwzu!8N~a1=tZ*QJ&q z_H#KOJH4NkdO)#N%L@^5X}h!~wr^9ADOmY6l&SM}iVmr5iyxzX^~ArBmt9 znKFa$;A<^kE;=c*@<+ukF_TLpKNbg44GXGv+yCLO=A3Ho|G?6_>Cd`-LpJhVl! z6A(#a6ZT`}H+QhT?3`~M4X%+_rSfqHOmg!ZMSaCDxb>9l;OABiZD%VBh$ z_86t>L9g7b1Fc2uY^E*ktz#_RQ#u|yT#yx2y0on-y>t9j`HfG#Vx*$JqC_Y3GEj3G z%+b!*rbSq8Rt>W5O@9iX{2)}mwzN5{EpJ5Esk;P?-osbaxFIf8>cWDijmjBU@^M>1 z(OK*ey7d_SstrO3v(ltbXWL1Sr~<*ApF#*w)tTN(aJKhso)2}UV&0yJsEIM*hBfF3JetA~IKbmWR6c$n&3=>m856-8kTh2#?o3V* zKrp3ax+KV&LPdr8TSH(1Z|ES%0N2Q5IaZJTumIA`_B$99{4p5n$&%P)V}8<8k4!nS zI264lUw$3w9js)u)|JM5DjxvzxtGJ(I+Sw4RB{ury=x@AjCvOTw#DbqZ#j??39fR; zC`1ge+$cf{prJ3U+$hE=Q}vKI_^_)+0UFalj;MT;;Lw1y@M|QAz)iNHPJgAYcb^jO zraL*uzgH6ommxgG?c7PdC>;tWG{`QCb%U$-!c9=40l~m*Jj>o(G50E$H=?2pc#fnw<%3v2RYjfPuyF*oM@CYi z&%Z6QI;aLc0vEOQegjpZ`RXeO5%A;k+!cJ#sDJwa^&%+<#i6Z0>H2S3>*~a0#2l?S zxepA#nk#aWUD^^axFLa(B14!>@~EkD&J$+btRdCe?J$OxoQTN!?xy^P4 z*4W!ubDvlbesP|ou~ja1GQoui$V^o+A03+RMSid->2Du z0V!{+>iBvLPgk|Rye)f1jF>JP5wN|PB+8Z-$555k$*G+OvdJiW-Fk$CMvy&{pkYQ+ zR+sJ&zX6kMkoM(moGw!Ll+HBC)A}-1i^O|e&_A0(!aw#gSF+K*60Qn&YdaC26kA^y z`zGj|Ns{YDcH9SuEc!(gR}9o`Xxm=LrcH^W{Kr@T%oR5CkolvWYO3_Vip)GQtZ@mpf1sukA}^1U4$1`&F}+uAaCjyM6*FDs%b6u?o2uyB9+>pD*d+g;@NMCoSYu zjQ;zOew`f^il3RyZ}FIhKb%ZoIi6`)=$_`K61z{n3Sxfv>`#uyQz>FEYsi~_&AlI-|p2c4W1G@fwv`E7SGfO~&i|t*Aib z+1>*0kBzod5#P&2)Y7r(qT#}1k>R(|D(y`RJEoY)H>*oJZzU}p!k5gxGc#Q2BR+||4I z$87g!o0G%u=Xj`A%JC|f4U!S_&O2=*2Ld|~5~Y=9vA^;&@pb0^p=4V8RM&1^EWoq6 zUEE?opSn@SFf9U1O`&A4<9;=?a%a}kdttiG1#cZcEa+@6=AWY=W*Lz1=l}jo+T(9I z0!3N(kMopgc;m^}5p-yPIKyvD0t;D52J@`MH$N&;Jv+d`ulcCN&tD1u{@vHVQcP4I z1ZQ;5nk+Iw-Lmgp6QD{ZFD|_H${8=Y^`v7bz`BI+l2|||7}x2moy=WVzwMu+w_!8Q zWja^wr)TPZbX*+O{tOC~x`jV!6@%~B>85HIvlW_NYcFvc==woz)#8hlhF#x7bagTe zYhDW{d(`40inal}^PEYr3VvMo83!m8uI962c|i+0EFX6KGP7UMj(w;j7b& zAjdpRLC<++90z-e+u34jlTp{H7xo7zLl%5qJI1V|!8iFqaKQr6&N^`Q2040Hs=KDI zlP0A@btlCeKA+hD7}D+ze^#sxA%Kz|4bV(U0eX_5S#eRDAiDdUotvtna7)m8u~uT3oH)Y+Oq$9+gDQR6C)w8hIR)?F0M@*tEOyDpX| zr|j%3Q^xKv(HlGxXITcH0ne8LMVn5L4y7 zW_ZV?E%Ywb5rV)0+=w~#Y1`iwEE_TA%JiD(Uv&sbI494c+)jT2x7;L&*m*6jDLx`* z2gw+tgHWivb0s@FOL|zY^{spJ)!oXY=`X6sE}~R97T6MY)I z^tOtB+!*xQOkODHSJve!7o3Hx>H3;81|r|_)@w7qy!-(eY{54eBXGTT8%HnRR4JbMyz8T|Mwb1=TD2m2pFe&w zK!MN>IU_Fyn@PHkCDw@VzOXw3y)6tUe9NsJHFs<3JWxvhupEmwnS9`V5Z(1G3z9nG z*;gtxij9?leHu!8p+-wOQ$pILDYpB#so!$U5DFfJx25GV*9W80#~sz;Ms4QR2Y> z(rbn8_-h@$ZY=?FiN5OkxQ|l!l~ikgknAsMrK{rKhwY&_R_niM(ZJrG#>m>|JyH{7 zt($wzMkbH%K{_ue#x|HzglH)5YCQY$)@6+Ev=#R+!P8A5;36dzDxzMB&)6QsWDohN z)Om|CLH|au*YHGVztlTGye zMjpEZ_bxBm_aapbPtrw=R_I6f(Je;%Q#SVUt%ypiqg4)U34#=>jHtG|WJ~tICd$Z9 zZs8^V37X`=IphtA5%!O4t*i z1PZ&)?xh}AP3{2x*vucu%F29nZX;-fG0B7EqHs3_@1}_W z7e_A2D@YB}{2z!p=FL6TJZ+!|uR zy0v78+YTp$4x7H=tc+I2Yp$to3=PWAqf3LB0Av#fiNgwSyM$Bt+hic6U{b141lZyl zUS;q{jwB{W|C&4I^>ghH3cVQMyNed|(N!_|5uy^bv(tqAkZ&mLc)+WNr#D)vmVULP znvG#YI6vy(;tyQ6er+BaBzOm}7rfgW@bg+4y|a9+Oi^Ph4HWz|c9MQOPGWP>T!Gti z7(zPZ^n}72;l~8ptopFvhqTd$S^mH|4vRN6HJ&Pe)s+Ge)*WI(4a0vy$dR<-tQoNK z6oK}zW##KSqN)cX7!`MoGl^n^?7QtA2?>Lt9lv18iNFt?Uya>35H+tqbrJL#R1FTG zmdg^nQw-L&Jb&6N6=`3e4xCisG-%+eE5gY?&n^KUup9$M)?2h)nX Date: Wed, 30 Jul 2025 11:06:19 +0800 Subject: [PATCH 15/56] =?UTF-8?q?=F0=9F=98=97=E4=BF=AE=E6=94=B9=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E4=BD=9C=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- message-pusher/v0.4.12/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/message-pusher/v0.4.12/docker-compose.yml b/message-pusher/v0.4.12/docker-compose.yml index d911faa52..b10530949 100644 --- a/message-pusher/v0.4.12/docker-compose.yml +++ b/message-pusher/v0.4.12/docker-compose.yml @@ -8,7 +8,7 @@ services: - 1panel-network ports: - "${PANEL_APP_PORT_HTTP}:3000" - image: songquanpeng/message-pusher:v0.4.12 + image: justsong/message-pusher:v0.4.12 volumes: - ./data:/data environment: From c46c0a7f0a52cb0b7e1bec71c1976e9d341081a2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 31 Jul 2025 09:42:08 +0000 Subject: [PATCH 16/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v9 --- forgejo-runner-dind/7.0.0/docker-compose.yml | 2 +- forgejo-runner/8.0.1/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forgejo-runner-dind/7.0.0/docker-compose.yml b/forgejo-runner-dind/7.0.0/docker-compose.yml index 9cbb6ed0c..eb967d193 100644 --- a/forgejo-runner-dind/7.0.0/docker-compose.yml +++ b/forgejo-runner-dind/7.0.0/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:8.0.1 + image: code.forgejo.org/forgejo/runner:9.0.0 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: diff --git a/forgejo-runner/8.0.1/docker-compose.yml b/forgejo-runner/8.0.1/docker-compose.yml index 2d35bf3f9..95c4f59f8 100644 --- a/forgejo-runner/8.0.1/docker-compose.yml +++ b/forgejo-runner/8.0.1/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.9" services: forgejo_runner: - image: code.forgejo.org/forgejo/runner:8.0.1 + image: code.forgejo.org/forgejo/runner:9.0.0 container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always user: root From 94db398b84f5fdc6f364fb829e2839e58dfbe9f0 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 31 Jul 2025 09:42:20 +0000 Subject: [PATCH 17/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E=208.0.?= =?UTF-8?q?1=20=E5=8D=87=E7=BA=A7=E5=88=B0=209.0.0=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/{8.0.1 => 9.0.0}/data.yml | 0 forgejo-runner/{8.0.1 => 9.0.0}/docker-compose.yml | 0 forgejo-runner/{8.0.1 => 9.0.0}/scripts/init.sh | 0 forgejo-runner/{8.0.1 => 9.0.0}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner/{8.0.1 => 9.0.0}/data.yml (100%) rename forgejo-runner/{8.0.1 => 9.0.0}/docker-compose.yml (100%) rename forgejo-runner/{8.0.1 => 9.0.0}/scripts/init.sh (100%) rename forgejo-runner/{8.0.1 => 9.0.0}/scripts/register.sh (100%) diff --git a/forgejo-runner/8.0.1/data.yml b/forgejo-runner/9.0.0/data.yml similarity index 100% rename from forgejo-runner/8.0.1/data.yml rename to forgejo-runner/9.0.0/data.yml diff --git a/forgejo-runner/8.0.1/docker-compose.yml b/forgejo-runner/9.0.0/docker-compose.yml similarity index 100% rename from forgejo-runner/8.0.1/docker-compose.yml rename to forgejo-runner/9.0.0/docker-compose.yml diff --git a/forgejo-runner/8.0.1/scripts/init.sh b/forgejo-runner/9.0.0/scripts/init.sh similarity index 100% rename from forgejo-runner/8.0.1/scripts/init.sh rename to forgejo-runner/9.0.0/scripts/init.sh diff --git a/forgejo-runner/8.0.1/scripts/register.sh b/forgejo-runner/9.0.0/scripts/register.sh similarity index 100% rename from forgejo-runner/8.0.1/scripts/register.sh rename to forgejo-runner/9.0.0/scripts/register.sh From 5a103487e6e417c9977af20ae66448ac3b02254d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 31 Jul 2025 15:03:27 +0000 Subject: [PATCH 18/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v9.0.1 --- forgejo-runner-dind/7.0.0/docker-compose.yml | 2 +- forgejo-runner/9.0.0/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forgejo-runner-dind/7.0.0/docker-compose.yml b/forgejo-runner-dind/7.0.0/docker-compose.yml index eb967d193..fc049ee31 100644 --- a/forgejo-runner-dind/7.0.0/docker-compose.yml +++ b/forgejo-runner-dind/7.0.0/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.0 + image: code.forgejo.org/forgejo/runner:9.0.1 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: diff --git a/forgejo-runner/9.0.0/docker-compose.yml b/forgejo-runner/9.0.0/docker-compose.yml index 95c4f59f8..9da768d40 100644 --- a/forgejo-runner/9.0.0/docker-compose.yml +++ b/forgejo-runner/9.0.0/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.9" services: forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.0 + image: code.forgejo.org/forgejo/runner:9.0.1 container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always user: root From bb50b92874713c8367884ea4488e841a3a3c6042 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 31 Jul 2025 15:03:39 +0000 Subject: [PATCH 19/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E=209.0.?= =?UTF-8?q?0=20=E5=8D=87=E7=BA=A7=E5=88=B0=209.0.1=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/{9.0.0 => 9.0.1}/data.yml | 0 forgejo-runner/{9.0.0 => 9.0.1}/docker-compose.yml | 0 forgejo-runner/{9.0.0 => 9.0.1}/scripts/init.sh | 0 forgejo-runner/{9.0.0 => 9.0.1}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner/{9.0.0 => 9.0.1}/data.yml (100%) rename forgejo-runner/{9.0.0 => 9.0.1}/docker-compose.yml (100%) rename forgejo-runner/{9.0.0 => 9.0.1}/scripts/init.sh (100%) rename forgejo-runner/{9.0.0 => 9.0.1}/scripts/register.sh (100%) diff --git a/forgejo-runner/9.0.0/data.yml b/forgejo-runner/9.0.1/data.yml similarity index 100% rename from forgejo-runner/9.0.0/data.yml rename to forgejo-runner/9.0.1/data.yml diff --git a/forgejo-runner/9.0.0/docker-compose.yml b/forgejo-runner/9.0.1/docker-compose.yml similarity index 100% rename from forgejo-runner/9.0.0/docker-compose.yml rename to forgejo-runner/9.0.1/docker-compose.yml diff --git a/forgejo-runner/9.0.0/scripts/init.sh b/forgejo-runner/9.0.1/scripts/init.sh similarity index 100% rename from forgejo-runner/9.0.0/scripts/init.sh rename to forgejo-runner/9.0.1/scripts/init.sh diff --git a/forgejo-runner/9.0.0/scripts/register.sh b/forgejo-runner/9.0.1/scripts/register.sh similarity index 100% rename from forgejo-runner/9.0.0/scripts/register.sh rename to forgejo-runner/9.0.1/scripts/register.sh From 5da9f56317aa10817a15d79760fbd304847fa794 Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Fri, 1 Aug 2025 11:18:25 +0800 Subject: [PATCH 20/56] =?UTF-8?q?=F0=9F=98=B6=E5=B0=9D=E8=AF=95=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=A4=9A=E4=B8=AA=E6=96=87=E4=BB=B6=E7=9A=84=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/{7.0.0 => 9.0.1}/data.yml | 0 forgejo-runner-dind/{7.0.0 => 9.0.1}/docker-compose.yml | 0 forgejo-runner-dind/{7.0.0 => 9.0.1}/scripts/init.sh | 0 forgejo-runner-dind/{7.0.0 => 9.0.1}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner-dind/{7.0.0 => 9.0.1}/data.yml (100%) rename forgejo-runner-dind/{7.0.0 => 9.0.1}/docker-compose.yml (100%) rename forgejo-runner-dind/{7.0.0 => 9.0.1}/scripts/init.sh (100%) rename forgejo-runner-dind/{7.0.0 => 9.0.1}/scripts/register.sh (100%) diff --git a/forgejo-runner-dind/7.0.0/data.yml b/forgejo-runner-dind/9.0.1/data.yml similarity index 100% rename from forgejo-runner-dind/7.0.0/data.yml rename to forgejo-runner-dind/9.0.1/data.yml diff --git a/forgejo-runner-dind/7.0.0/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml similarity index 100% rename from forgejo-runner-dind/7.0.0/docker-compose.yml rename to forgejo-runner-dind/9.0.1/docker-compose.yml diff --git a/forgejo-runner-dind/7.0.0/scripts/init.sh b/forgejo-runner-dind/9.0.1/scripts/init.sh similarity index 100% rename from forgejo-runner-dind/7.0.0/scripts/init.sh rename to forgejo-runner-dind/9.0.1/scripts/init.sh diff --git a/forgejo-runner-dind/7.0.0/scripts/register.sh b/forgejo-runner-dind/9.0.1/scripts/register.sh similarity index 100% rename from forgejo-runner-dind/7.0.0/scripts/register.sh rename to forgejo-runner-dind/9.0.1/scripts/register.sh From 9591f33771a3fd8d197f7103e69fb583bea9441e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 2 Aug 2025 10:42:23 +0000 Subject: [PATCH 21/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v9.0.2 --- forgejo-runner-dind/9.0.1/docker-compose.yml | 2 +- forgejo-runner/9.0.1/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml index fc049ee31..7340c72e6 100644 --- a/forgejo-runner-dind/9.0.1/docker-compose.yml +++ b/forgejo-runner-dind/9.0.1/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.1 + image: code.forgejo.org/forgejo/runner:9.0.2 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: diff --git a/forgejo-runner/9.0.1/docker-compose.yml b/forgejo-runner/9.0.1/docker-compose.yml index 9da768d40..87c7ef918 100644 --- a/forgejo-runner/9.0.1/docker-compose.yml +++ b/forgejo-runner/9.0.1/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.9" services: forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.1 + image: code.forgejo.org/forgejo/runner:9.0.2 container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always user: root From 7c4e696aaf509c1c0ed27f6e00f6e1511880b382 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 2 Aug 2025 10:42:34 +0000 Subject: [PATCH 22/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner-dind=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E?= =?UTF-8?q?=209.0.1=20=E5=8D=87=E7=BA=A7=E5=88=B0=20dind=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/{9.0.1 => dind}/data.yml | 0 forgejo-runner-dind/{9.0.1 => dind}/docker-compose.yml | 0 forgejo-runner-dind/{9.0.1 => dind}/scripts/init.sh | 0 forgejo-runner-dind/{9.0.1 => dind}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner-dind/{9.0.1 => dind}/data.yml (100%) rename forgejo-runner-dind/{9.0.1 => dind}/docker-compose.yml (100%) rename forgejo-runner-dind/{9.0.1 => dind}/scripts/init.sh (100%) rename forgejo-runner-dind/{9.0.1 => dind}/scripts/register.sh (100%) diff --git a/forgejo-runner-dind/9.0.1/data.yml b/forgejo-runner-dind/dind/data.yml similarity index 100% rename from forgejo-runner-dind/9.0.1/data.yml rename to forgejo-runner-dind/dind/data.yml diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/dind/docker-compose.yml similarity index 100% rename from forgejo-runner-dind/9.0.1/docker-compose.yml rename to forgejo-runner-dind/dind/docker-compose.yml diff --git a/forgejo-runner-dind/9.0.1/scripts/init.sh b/forgejo-runner-dind/dind/scripts/init.sh similarity index 100% rename from forgejo-runner-dind/9.0.1/scripts/init.sh rename to forgejo-runner-dind/dind/scripts/init.sh diff --git a/forgejo-runner-dind/9.0.1/scripts/register.sh b/forgejo-runner-dind/dind/scripts/register.sh similarity index 100% rename from forgejo-runner-dind/9.0.1/scripts/register.sh rename to forgejo-runner-dind/dind/scripts/register.sh From de0f987034d9f43306fb5171b272627d7914e62d Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sat, 2 Aug 2025 10:42:34 +0000 Subject: [PATCH 23/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E=209.0.?= =?UTF-8?q?1=20=E5=8D=87=E7=BA=A7=E5=88=B0=209.0.2=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/{9.0.1 => 9.0.2}/data.yml | 0 forgejo-runner/{9.0.1 => 9.0.2}/docker-compose.yml | 0 forgejo-runner/{9.0.1 => 9.0.2}/scripts/init.sh | 0 forgejo-runner/{9.0.1 => 9.0.2}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner/{9.0.1 => 9.0.2}/data.yml (100%) rename forgejo-runner/{9.0.1 => 9.0.2}/docker-compose.yml (100%) rename forgejo-runner/{9.0.1 => 9.0.2}/scripts/init.sh (100%) rename forgejo-runner/{9.0.1 => 9.0.2}/scripts/register.sh (100%) diff --git a/forgejo-runner/9.0.1/data.yml b/forgejo-runner/9.0.2/data.yml similarity index 100% rename from forgejo-runner/9.0.1/data.yml rename to forgejo-runner/9.0.2/data.yml diff --git a/forgejo-runner/9.0.1/docker-compose.yml b/forgejo-runner/9.0.2/docker-compose.yml similarity index 100% rename from forgejo-runner/9.0.1/docker-compose.yml rename to forgejo-runner/9.0.2/docker-compose.yml diff --git a/forgejo-runner/9.0.1/scripts/init.sh b/forgejo-runner/9.0.2/scripts/init.sh similarity index 100% rename from forgejo-runner/9.0.1/scripts/init.sh rename to forgejo-runner/9.0.2/scripts/init.sh diff --git a/forgejo-runner/9.0.1/scripts/register.sh b/forgejo-runner/9.0.2/scripts/register.sh similarity index 100% rename from forgejo-runner/9.0.1/scripts/register.sh rename to forgejo-runner/9.0.2/scripts/register.sh From 083014154162365646bf8b2337feff7813f4ba4c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 13:37:17 +0000 Subject: [PATCH 24/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v9.0.3 --- forgejo-runner-dind/dind/docker-compose.yml | 2 +- forgejo-runner/9.0.2/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forgejo-runner-dind/dind/docker-compose.yml b/forgejo-runner-dind/dind/docker-compose.yml index 7340c72e6..412a5d01e 100644 --- a/forgejo-runner-dind/dind/docker-compose.yml +++ b/forgejo-runner-dind/dind/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.2 + image: code.forgejo.org/forgejo/runner:9.0.3 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: diff --git a/forgejo-runner/9.0.2/docker-compose.yml b/forgejo-runner/9.0.2/docker-compose.yml index 87c7ef918..94a28f0ad 100644 --- a/forgejo-runner/9.0.2/docker-compose.yml +++ b/forgejo-runner/9.0.2/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.9" services: forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.2 + image: code.forgejo.org/forgejo/runner:9.0.3 container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always user: root From f667972c931a3620db2bf37bd6119923c4f992c6 Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Thu, 7 Aug 2025 13:01:18 +0800 Subject: [PATCH 25/56] =?UTF-8?q?=F0=9F=98=A3=E5=81=9C=E6=8E=89dind?= =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/{dind => 9.0.1}/data.yml | 0 forgejo-runner-dind/{dind => 9.0.1}/docker-compose.yml | 2 +- forgejo-runner-dind/{dind => 9.0.1}/scripts/init.sh | 0 forgejo-runner-dind/{dind => 9.0.1}/scripts/register.sh | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename forgejo-runner-dind/{dind => 9.0.1}/data.yml (100%) rename forgejo-runner-dind/{dind => 9.0.1}/docker-compose.yml (94%) rename forgejo-runner-dind/{dind => 9.0.1}/scripts/init.sh (100%) rename forgejo-runner-dind/{dind => 9.0.1}/scripts/register.sh (100%) diff --git a/forgejo-runner-dind/dind/data.yml b/forgejo-runner-dind/9.0.1/data.yml similarity index 100% rename from forgejo-runner-dind/dind/data.yml rename to forgejo-runner-dind/9.0.1/data.yml diff --git a/forgejo-runner-dind/dind/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml similarity index 94% rename from forgejo-runner-dind/dind/docker-compose.yml rename to forgejo-runner-dind/9.0.1/docker-compose.yml index 412a5d01e..fc049ee31 100644 --- a/forgejo-runner-dind/dind/docker-compose.yml +++ b/forgejo-runner-dind/9.0.1/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.3 + image: code.forgejo.org/forgejo/runner:9.0.1 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: diff --git a/forgejo-runner-dind/dind/scripts/init.sh b/forgejo-runner-dind/9.0.1/scripts/init.sh similarity index 100% rename from forgejo-runner-dind/dind/scripts/init.sh rename to forgejo-runner-dind/9.0.1/scripts/init.sh diff --git a/forgejo-runner-dind/dind/scripts/register.sh b/forgejo-runner-dind/9.0.1/scripts/register.sh similarity index 100% rename from forgejo-runner-dind/dind/scripts/register.sh rename to forgejo-runner-dind/9.0.1/scripts/register.sh From bf1fb31e6d3ec9f18fc2b840248b4df45b47d8e4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 05:01:41 +0000 Subject: [PATCH 26/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v9.0.3 --- forgejo-runner-dind/9.0.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml index fc049ee31..412a5d01e 100644 --- a/forgejo-runner-dind/9.0.1/docker-compose.yml +++ b/forgejo-runner-dind/9.0.1/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.1 + image: code.forgejo.org/forgejo/runner:9.0.3 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: From a543c7bd88459eef6343c87889e74fb7a82f4ca0 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 7 Aug 2025 05:01:50 +0000 Subject: [PATCH 27/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner-dind=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E?= =?UTF-8?q?=209.0.1=20=E5=8D=87=E7=BA=A7=E5=88=B0=20dind=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/{9.0.1 => dind}/data.yml | 0 forgejo-runner-dind/{9.0.1 => dind}/docker-compose.yml | 0 forgejo-runner-dind/{9.0.1 => dind}/scripts/init.sh | 0 forgejo-runner-dind/{9.0.1 => dind}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner-dind/{9.0.1 => dind}/data.yml (100%) rename forgejo-runner-dind/{9.0.1 => dind}/docker-compose.yml (100%) rename forgejo-runner-dind/{9.0.1 => dind}/scripts/init.sh (100%) rename forgejo-runner-dind/{9.0.1 => dind}/scripts/register.sh (100%) diff --git a/forgejo-runner-dind/9.0.1/data.yml b/forgejo-runner-dind/dind/data.yml similarity index 100% rename from forgejo-runner-dind/9.0.1/data.yml rename to forgejo-runner-dind/dind/data.yml diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/dind/docker-compose.yml similarity index 100% rename from forgejo-runner-dind/9.0.1/docker-compose.yml rename to forgejo-runner-dind/dind/docker-compose.yml diff --git a/forgejo-runner-dind/9.0.1/scripts/init.sh b/forgejo-runner-dind/dind/scripts/init.sh similarity index 100% rename from forgejo-runner-dind/9.0.1/scripts/init.sh rename to forgejo-runner-dind/dind/scripts/init.sh diff --git a/forgejo-runner-dind/9.0.1/scripts/register.sh b/forgejo-runner-dind/dind/scripts/register.sh similarity index 100% rename from forgejo-runner-dind/9.0.1/scripts/register.sh rename to forgejo-runner-dind/dind/scripts/register.sh From 44a13b64e1f957d9cf1f90e0ce46ce3a4fdbda27 Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Thu, 7 Aug 2025 13:16:36 +0800 Subject: [PATCH 28/56] =?UTF-8?q?=F0=9F=98=98=E6=B7=BB=E5=8A=A0=E6=A0=87?= =?UTF-8?q?=E7=AD=BEignore=EF=BC=8C=E9=98=B2=E6=AD=A2dind=E8=A2=AB?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/{dind => 9.0.1}/data.yml | 0 forgejo-runner-dind/{dind => 9.0.1}/docker-compose.yml | 4 ++-- forgejo-runner-dind/{dind => 9.0.1}/scripts/init.sh | 0 forgejo-runner-dind/{dind => 9.0.1}/scripts/register.sh | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename forgejo-runner-dind/{dind => 9.0.1}/data.yml (100%) rename forgejo-runner-dind/{dind => 9.0.1}/docker-compose.yml (91%) rename forgejo-runner-dind/{dind => 9.0.1}/scripts/init.sh (100%) rename forgejo-runner-dind/{dind => 9.0.1}/scripts/register.sh (100%) diff --git a/forgejo-runner-dind/dind/data.yml b/forgejo-runner-dind/9.0.1/data.yml similarity index 100% rename from forgejo-runner-dind/dind/data.yml rename to forgejo-runner-dind/9.0.1/data.yml diff --git a/forgejo-runner-dind/dind/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml similarity index 91% rename from forgejo-runner-dind/dind/docker-compose.yml rename to forgejo-runner-dind/9.0.1/docker-compose.yml index 412a5d01e..ffaa2b783 100644 --- a/forgejo-runner-dind/dind/docker-compose.yml +++ b/forgejo-runner-dind/9.0.1/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.9" services: dind: - image: docker:dind + image: docker:dind # [ignore] container_name: forgejo-dind privileged: true restart: 'unless-stopped' @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.3 + image: code.forgejo.org/forgejo/runner:9.0.1 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: diff --git a/forgejo-runner-dind/dind/scripts/init.sh b/forgejo-runner-dind/9.0.1/scripts/init.sh similarity index 100% rename from forgejo-runner-dind/dind/scripts/init.sh rename to forgejo-runner-dind/9.0.1/scripts/init.sh diff --git a/forgejo-runner-dind/dind/scripts/register.sh b/forgejo-runner-dind/9.0.1/scripts/register.sh similarity index 100% rename from forgejo-runner-dind/dind/scripts/register.sh rename to forgejo-runner-dind/9.0.1/scripts/register.sh From 921ec3307e017d60a2c51ae56f1a3476c84bf01b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 05:17:08 +0000 Subject: [PATCH 29/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v9.0.3 --- forgejo-runner-dind/9.0.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml index ffaa2b783..713637188 100644 --- a/forgejo-runner-dind/9.0.1/docker-compose.yml +++ b/forgejo-runner-dind/9.0.1/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.1 + image: code.forgejo.org/forgejo/runner:9.0.3 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: From 1803479ecee1efdecf5430481f8bd701cdb25ca1 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 7 Aug 2025 05:17:22 +0000 Subject: [PATCH 30/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner-dind=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E?= =?UTF-8?q?=209.0.1=20=E5=8D=87=E7=BA=A7=E5=88=B0=20dind=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/{9.0.1 => dind}/data.yml | 0 forgejo-runner-dind/{9.0.1 => dind}/docker-compose.yml | 0 forgejo-runner-dind/{9.0.1 => dind}/scripts/init.sh | 0 forgejo-runner-dind/{9.0.1 => dind}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner-dind/{9.0.1 => dind}/data.yml (100%) rename forgejo-runner-dind/{9.0.1 => dind}/docker-compose.yml (100%) rename forgejo-runner-dind/{9.0.1 => dind}/scripts/init.sh (100%) rename forgejo-runner-dind/{9.0.1 => dind}/scripts/register.sh (100%) diff --git a/forgejo-runner-dind/9.0.1/data.yml b/forgejo-runner-dind/dind/data.yml similarity index 100% rename from forgejo-runner-dind/9.0.1/data.yml rename to forgejo-runner-dind/dind/data.yml diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/dind/docker-compose.yml similarity index 100% rename from forgejo-runner-dind/9.0.1/docker-compose.yml rename to forgejo-runner-dind/dind/docker-compose.yml diff --git a/forgejo-runner-dind/9.0.1/scripts/init.sh b/forgejo-runner-dind/dind/scripts/init.sh similarity index 100% rename from forgejo-runner-dind/9.0.1/scripts/init.sh rename to forgejo-runner-dind/dind/scripts/init.sh diff --git a/forgejo-runner-dind/9.0.1/scripts/register.sh b/forgejo-runner-dind/dind/scripts/register.sh similarity index 100% rename from forgejo-runner-dind/9.0.1/scripts/register.sh rename to forgejo-runner-dind/dind/scripts/register.sh From 360e9ecb7f86ba0ebd7c61d6e15afcdaa8e6446e Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Thu, 7 Aug 2025 13:23:35 +0800 Subject: [PATCH 31/56] =?UTF-8?q?=F0=9F=99=84=E5=B0=9D=E8=AF=95=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=9B=B4=E6=96=B0=E7=9A=84=E8=84=9A=E6=9C=AC=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/{dind => 9.0.1}/data.yml | 0 forgejo-runner-dind/{dind => 9.0.1}/docker-compose.yml | 2 +- forgejo-runner-dind/{dind => 9.0.1}/scripts/init.sh | 0 forgejo-runner-dind/{dind => 9.0.1}/scripts/register.sh | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename forgejo-runner-dind/{dind => 9.0.1}/data.yml (100%) rename forgejo-runner-dind/{dind => 9.0.1}/docker-compose.yml (94%) rename forgejo-runner-dind/{dind => 9.0.1}/scripts/init.sh (100%) rename forgejo-runner-dind/{dind => 9.0.1}/scripts/register.sh (100%) diff --git a/forgejo-runner-dind/dind/data.yml b/forgejo-runner-dind/9.0.1/data.yml similarity index 100% rename from forgejo-runner-dind/dind/data.yml rename to forgejo-runner-dind/9.0.1/data.yml diff --git a/forgejo-runner-dind/dind/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml similarity index 94% rename from forgejo-runner-dind/dind/docker-compose.yml rename to forgejo-runner-dind/9.0.1/docker-compose.yml index 713637188..ffaa2b783 100644 --- a/forgejo-runner-dind/dind/docker-compose.yml +++ b/forgejo-runner-dind/9.0.1/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.3 + image: code.forgejo.org/forgejo/runner:9.0.1 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: diff --git a/forgejo-runner-dind/dind/scripts/init.sh b/forgejo-runner-dind/9.0.1/scripts/init.sh similarity index 100% rename from forgejo-runner-dind/dind/scripts/init.sh rename to forgejo-runner-dind/9.0.1/scripts/init.sh diff --git a/forgejo-runner-dind/dind/scripts/register.sh b/forgejo-runner-dind/9.0.1/scripts/register.sh similarity index 100% rename from forgejo-runner-dind/dind/scripts/register.sh rename to forgejo-runner-dind/9.0.1/scripts/register.sh From e952a3d23f66cd72cd58ce42726025597844c416 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 05:29:03 +0000 Subject: [PATCH 32/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v9.0.3 --- forgejo-runner-dind/9.0.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml index ffaa2b783..713637188 100644 --- a/forgejo-runner-dind/9.0.1/docker-compose.yml +++ b/forgejo-runner-dind/9.0.1/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.1 + image: code.forgejo.org/forgejo/runner:9.0.3 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: From 0b3679b4e173bca90cb28dd8f737a398e538db6b Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Thu, 7 Aug 2025 13:36:25 +0800 Subject: [PATCH 33/56] =?UTF-8?q?=F0=9F=A4=94=E7=BB=A7=E7=BB=AD=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=EF=BC=8C=E5=B0=9D=E8=AF=95=E5=AE=9E=E7=8E=B0=E6=83=B3?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/9.0.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml index 713637188..ffaa2b783 100644 --- a/forgejo-runner-dind/9.0.1/docker-compose.yml +++ b/forgejo-runner-dind/9.0.1/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.3 + image: code.forgejo.org/forgejo/runner:9.0.1 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: From 46d4b855f8b0a003874429d7e787a7cecd716498 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 05:37:21 +0000 Subject: [PATCH 34/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v9.0.3 --- forgejo-runner-dind/9.0.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml index ffaa2b783..713637188 100644 --- a/forgejo-runner-dind/9.0.1/docker-compose.yml +++ b/forgejo-runner-dind/9.0.1/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.1 + image: code.forgejo.org/forgejo/runner:9.0.3 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: From 18029a6f70ac967036270e4629d4805f70d089e9 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 7 Aug 2025 05:37:33 +0000 Subject: [PATCH 35/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner-dind=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E?= =?UTF-8?q?=209.0.1=20=E5=8D=87=E7=BA=A7=E5=88=B0=209.0.3=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/{9.0.1 => dind}/data.yml | 0 forgejo-runner-dind/{9.0.1 => dind}/docker-compose.yml | 0 forgejo-runner-dind/{9.0.1 => dind}/scripts/init.sh | 0 forgejo-runner-dind/{9.0.1 => dind}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner-dind/{9.0.1 => dind}/data.yml (100%) rename forgejo-runner-dind/{9.0.1 => dind}/docker-compose.yml (100%) rename forgejo-runner-dind/{9.0.1 => dind}/scripts/init.sh (100%) rename forgejo-runner-dind/{9.0.1 => dind}/scripts/register.sh (100%) diff --git a/forgejo-runner-dind/9.0.1/data.yml b/forgejo-runner-dind/dind/data.yml similarity index 100% rename from forgejo-runner-dind/9.0.1/data.yml rename to forgejo-runner-dind/dind/data.yml diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/dind/docker-compose.yml similarity index 100% rename from forgejo-runner-dind/9.0.1/docker-compose.yml rename to forgejo-runner-dind/dind/docker-compose.yml diff --git a/forgejo-runner-dind/9.0.1/scripts/init.sh b/forgejo-runner-dind/dind/scripts/init.sh similarity index 100% rename from forgejo-runner-dind/9.0.1/scripts/init.sh rename to forgejo-runner-dind/dind/scripts/init.sh diff --git a/forgejo-runner-dind/9.0.1/scripts/register.sh b/forgejo-runner-dind/dind/scripts/register.sh similarity index 100% rename from forgejo-runner-dind/9.0.1/scripts/register.sh rename to forgejo-runner-dind/dind/scripts/register.sh From 04409e8958c54081c7413f94015c6bf6a4554657 Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Thu, 7 Aug 2025 13:59:33 +0800 Subject: [PATCH 36/56] =?UTF-8?q?=F0=9F=A5=B1=E6=9B=B4=E6=96=B0=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E4=B8=89=E4=B8=AA=E5=8F=82=E6=95=B0=E7=9A=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/{dind => 9.0.1}/data.yml | 0 forgejo-runner-dind/{dind => 9.0.1}/docker-compose.yml | 0 forgejo-runner-dind/{dind => 9.0.1}/scripts/init.sh | 0 forgejo-runner-dind/{dind => 9.0.1}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner-dind/{dind => 9.0.1}/data.yml (100%) rename forgejo-runner-dind/{dind => 9.0.1}/docker-compose.yml (100%) rename forgejo-runner-dind/{dind => 9.0.1}/scripts/init.sh (100%) rename forgejo-runner-dind/{dind => 9.0.1}/scripts/register.sh (100%) diff --git a/forgejo-runner-dind/dind/data.yml b/forgejo-runner-dind/9.0.1/data.yml similarity index 100% rename from forgejo-runner-dind/dind/data.yml rename to forgejo-runner-dind/9.0.1/data.yml diff --git a/forgejo-runner-dind/dind/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml similarity index 100% rename from forgejo-runner-dind/dind/docker-compose.yml rename to forgejo-runner-dind/9.0.1/docker-compose.yml diff --git a/forgejo-runner-dind/dind/scripts/init.sh b/forgejo-runner-dind/9.0.1/scripts/init.sh similarity index 100% rename from forgejo-runner-dind/dind/scripts/init.sh rename to forgejo-runner-dind/9.0.1/scripts/init.sh diff --git a/forgejo-runner-dind/dind/scripts/register.sh b/forgejo-runner-dind/9.0.1/scripts/register.sh similarity index 100% rename from forgejo-runner-dind/dind/scripts/register.sh rename to forgejo-runner-dind/9.0.1/scripts/register.sh From c30d33fe543ef5264d138a016e949104060dea13 Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Thu, 7 Aug 2025 14:00:09 +0800 Subject: [PATCH 37/56] =?UTF-8?q?=F0=9F=A5=B1=E4=BF=AE=E6=94=B9=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=B5=8B=E8=AF=95=E6=98=AF=E5=90=A6=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/9.0.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml index 713637188..ffaa2b783 100644 --- a/forgejo-runner-dind/9.0.1/docker-compose.yml +++ b/forgejo-runner-dind/9.0.1/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.3 + image: code.forgejo.org/forgejo/runner:9.0.1 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: From 2548d4ff355b76140c31ff9be3c97b5cbb1a830f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 06:00:29 +0000 Subject: [PATCH 38/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v9.0.3 --- forgejo-runner-dind/9.0.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/9.0.1/docker-compose.yml index ffaa2b783..713637188 100644 --- a/forgejo-runner-dind/9.0.1/docker-compose.yml +++ b/forgejo-runner-dind/9.0.1/docker-compose.yml @@ -16,7 +16,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.1 + image: code.forgejo.org/forgejo/runner:9.0.3 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: From 388015b2d471aefec9f401d336522dbd88be7158 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 7 Aug 2025 06:00:41 +0000 Subject: [PATCH 39/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner-dind=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E?= =?UTF-8?q?=209.0.1=20=E5=8D=87=E7=BA=A7=E5=88=B0=209.0.3=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/{9.0.1 => 9.0.3}/data.yml | 0 forgejo-runner-dind/{9.0.1 => 9.0.3}/docker-compose.yml | 0 forgejo-runner-dind/{9.0.1 => 9.0.3}/scripts/init.sh | 0 forgejo-runner-dind/{9.0.1 => 9.0.3}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner-dind/{9.0.1 => 9.0.3}/data.yml (100%) rename forgejo-runner-dind/{9.0.1 => 9.0.3}/docker-compose.yml (100%) rename forgejo-runner-dind/{9.0.1 => 9.0.3}/scripts/init.sh (100%) rename forgejo-runner-dind/{9.0.1 => 9.0.3}/scripts/register.sh (100%) diff --git a/forgejo-runner-dind/9.0.1/data.yml b/forgejo-runner-dind/9.0.3/data.yml similarity index 100% rename from forgejo-runner-dind/9.0.1/data.yml rename to forgejo-runner-dind/9.0.3/data.yml diff --git a/forgejo-runner-dind/9.0.1/docker-compose.yml b/forgejo-runner-dind/9.0.3/docker-compose.yml similarity index 100% rename from forgejo-runner-dind/9.0.1/docker-compose.yml rename to forgejo-runner-dind/9.0.3/docker-compose.yml diff --git a/forgejo-runner-dind/9.0.1/scripts/init.sh b/forgejo-runner-dind/9.0.3/scripts/init.sh similarity index 100% rename from forgejo-runner-dind/9.0.1/scripts/init.sh rename to forgejo-runner-dind/9.0.3/scripts/init.sh diff --git a/forgejo-runner-dind/9.0.1/scripts/register.sh b/forgejo-runner-dind/9.0.3/scripts/register.sh similarity index 100% rename from forgejo-runner-dind/9.0.1/scripts/register.sh rename to forgejo-runner-dind/9.0.3/scripts/register.sh From 1403c43c33e5a0094328d809b8b484ae9d1c245a Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Sat, 9 Aug 2025 22:43:30 +0800 Subject: [PATCH 40/56] =?UTF-8?q?=F0=9F=A4=97=E6=B7=BB=E5=8A=A0sun-panel?= =?UTF-8?q?=E5=92=8Cwewe-rss=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/9.0.3/docker-compose.yml | 1 - forgejo-runner/9.0.2/docker-compose.yml | 1 - message-pusher/v0.4.12/docker-compose.yml | 2 -- 3 files changed, 4 deletions(-) diff --git a/forgejo-runner-dind/9.0.3/docker-compose.yml b/forgejo-runner-dind/9.0.3/docker-compose.yml index 713637188..060b6c8de 100644 --- a/forgejo-runner-dind/9.0.3/docker-compose.yml +++ b/forgejo-runner-dind/9.0.3/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.9" services: dind: image: docker:dind # [ignore] diff --git a/forgejo-runner/9.0.2/docker-compose.yml b/forgejo-runner/9.0.2/docker-compose.yml index 94a28f0ad..bb15f80e2 100644 --- a/forgejo-runner/9.0.2/docker-compose.yml +++ b/forgejo-runner/9.0.2/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.9" services: forgejo_runner: image: code.forgejo.org/forgejo/runner:9.0.3 diff --git a/message-pusher/v0.4.12/docker-compose.yml b/message-pusher/v0.4.12/docker-compose.yml index b10530949..c5bb32636 100644 --- a/message-pusher/v0.4.12/docker-compose.yml +++ b/message-pusher/v0.4.12/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.9" - services: message-pusher: container_name: ${CONTAINER_NAME} From aeab3b998b515fbd6221d0ca79c002159eb5fe29 Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Wed, 13 Aug 2025 00:26:57 +0800 Subject: [PATCH 41/56] =?UTF-8?q?=E2=98=BA=E6=8F=90=E4=BA=A4=E7=9B=98?= =?UTF-8?q?=E6=90=9C=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pansou/README.md | 55 +++++++++++ pansou/data.yml | 33 +++++++ pansou/logo.png | Bin 0 -> 7822 bytes pansou/sha-c1292b2/data.yml | 133 ++++++++++++++++++++++++++ pansou/sha-c1292b2/docker-compose.yml | 26 +++++ pansou/sha-c1292b2/scripts/init.sh | 10 ++ pansou/sha-c1292b2/scripts/upgrade.sh | 10 ++ 7 files changed, 267 insertions(+) create mode 100644 pansou/README.md create mode 100644 pansou/data.yml create mode 100644 pansou/logo.png create mode 100644 pansou/sha-c1292b2/data.yml create mode 100644 pansou/sha-c1292b2/docker-compose.yml create mode 100644 pansou/sha-c1292b2/scripts/init.sh create mode 100644 pansou/sha-c1292b2/scripts/upgrade.sh diff --git a/pansou/README.md b/pansou/README.md new file mode 100644 index 000000000..af395e89a --- /dev/null +++ b/pansou/README.md @@ -0,0 +1,55 @@ +# PanSou 网盘搜索 API + +PanSou 是一个高性能的网盘资源搜索 API 服务,支持 Telegram 搜索和自定义插件扩展,系统以性能和可扩展性为核心,支持并发搜索、结果智能排序和多网盘类型分类。 + +## ✨ 特性 +- **高性能搜索**:并发执行多个 Telegram 频道及插件搜索,显著提升搜索速度 +- **多网盘类型分类**:自动识别百度网盘、阿里云盘、夸克网盘等多种链接 +- **智能排序**:基于插件等级、时间新鲜度和关键词权重的综合排序 +- **异步插件系统**:支持“尽快响应,持续处理”的搜索模式 +- **二级缓存**:内存 + 磁盘分片缓存机制,大幅提升重复查询性能 + +## 🛠 支持的网盘类型 +百度网盘、阿里云盘、夸克网盘、天翼云盘、UC网盘、移动云盘、115网盘、PikPak、迅雷网盘、123网盘、磁力链接、电驴链接等。 + +## 🚀 快速开始 + +### 使用 Docker 部署(前后端一体) +```bash +docker run -d --name pansou -p 80:80 ghcr.io/fish2018/pansou-web +``` + +### 使用 Docker Compose(推荐) + +```bash +curl -o docker-compose.yml https://raw.githubusercontent.com/fish2018/pansou-web/refs/heads/main/docker-compose.yml +docker-compose up -d +``` + +### 仅后端 API + +```bash +docker run -d --name pansou -p 8888:8888 -v pansou-cache:/app/cache -e CHANNELS="tgsearchers2,xxx" ghcr.io/fish2018/pansou:latest +``` + +## 📚 API 文档 + +### 搜索 API + +- 接口:`/api/search` +- 方法:`POST` / `GET` +- 参数: + - `kw`:搜索关键词 + - `channels`:搜索的频道 + - `cloud_types`:网盘类型过滤 + - 更多详见[项目文档](https://github.com/fish2018/pansou) + +### 健康检查 API + +- 接口:`/api/health` +- 方法:`GET` + +## 🔗 项目地址 + +- GitHub: https://github.com/fish2018/pansou +- 文档: https://github.com/fish2018/pansou \ No newline at end of file diff --git a/pansou/data.yml b/pansou/data.yml new file mode 100644 index 000000000..3e764e8fc --- /dev/null +++ b/pansou/data.yml @@ -0,0 +1,33 @@ +name: PanSou +tags: + - 网盘 + - 搜索 + - 自托管 +title: 高性能网盘搜索 API 服务 +description: PanSou 是一个支持 Telegram 搜索和插件扩展的高性能网盘搜索 API 系统,支持多网盘类型分类、智能排序、异步插件扩展与二级缓存。 +additionalProperties: + key: pansou + name: PanSou + tags: + - WebSite + - Tool + shortDescZh: 高性能网盘搜索 API 服务 + shortDescEn: High-performance cloud drive search API service + type: website + crossVersionUpdate: true + limit: 0 + website: https://github.com/fish2018/pansou + github: https://github.com/fish2018/pansou + document: https://github.com/fish2018/pansou + description: + en: High-performance cloud drive search API service supporting Telegram search and plugin extensions, with intelligent sorting and multi-cloud categorization. + zh: 高性能网盘搜索 API 系统,支持 Telegram 搜索与插件扩展,具备智能排序和多网盘类型分类。 + zh-Hant: 高效能網盤搜索 API 系統,支援 Telegram 搜索與插件擴展,具有智能排序和多網盤分類。 + ja: Telegram検索とプラグイン拡張に対応した高性能クラウドドライブ検索APIシステムです。 + ms: Perkhidmatan API carian storan awan berprestasi tinggi yang menyokong carian Telegram dan peluasan pemalam. + pt-br: Serviço de API de pesquisa de armazenamento em nuvem de alto desempenho com suporte a pesquisa no Telegram e extensões de plugins. + ru: Высокопроизводительный API поиска по облачным хранилищам с поддержкой поиска в Telegram и расширений плагинов. + ko: 텔레그램 검색과 플러그인 확장을 지원하는 고성능 클라우드 드라이브 검색 API 시스템입니다. + architectures: + - amd64 + - arm64 diff --git a/pansou/logo.png b/pansou/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..9b76f12bf2935fa0bc901a461d06b145372d7a3e GIT binary patch literal 7822 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 nmEixQo%z4{uxX#<&mYMO8wqiPDt Date: Wed, 13 Aug 2025 04:17:51 +0000 Subject: [PATCH 42/56] chore(deps): pin ghcr.io/fish2018/pansou-web docker tag to a9e1750 --- pansou/sha-c1292b2/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pansou/sha-c1292b2/docker-compose.yml b/pansou/sha-c1292b2/docker-compose.yml index f5536f1fc..ea6b9c8c8 100644 --- a/pansou/sha-c1292b2/docker-compose.yml +++ b/pansou/sha-c1292b2/docker-compose.yml @@ -1,6 +1,6 @@ services: pansou: - image: ghcr.io/fish2018/pansou-web:sha-c1292b2 + image: ghcr.io/fish2018/pansou-web:sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59 container_name: ${CONTAINER_NAME} restart: always labels: From 4c58b9a7e7073d0feb6221fb50a0fc8035eb70c1 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 13 Aug 2025 04:18:02 +0000 Subject: [PATCH 43/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20pansou=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E=20sha-c1292b2?= =?UTF-8?q?=20=E5=8D=87=E7=BA=A7=E5=88=B0=20sha-c1292b2@sha256=20[skip=20c?= =?UTF-8?q?i]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data.yml | 0 .../docker-compose.yml | 0 .../scripts/init.sh | 0 .../scripts/upgrade.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename pansou/{sha-c1292b2 => sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59}/data.yml (100%) rename pansou/{sha-c1292b2 => sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59}/docker-compose.yml (100%) rename pansou/{sha-c1292b2 => sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59}/scripts/init.sh (100%) rename pansou/{sha-c1292b2 => sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59}/scripts/upgrade.sh (100%) diff --git a/pansou/sha-c1292b2/data.yml b/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/data.yml similarity index 100% rename from pansou/sha-c1292b2/data.yml rename to pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/data.yml diff --git a/pansou/sha-c1292b2/docker-compose.yml b/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/docker-compose.yml similarity index 100% rename from pansou/sha-c1292b2/docker-compose.yml rename to pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/docker-compose.yml diff --git a/pansou/sha-c1292b2/scripts/init.sh b/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/scripts/init.sh similarity index 100% rename from pansou/sha-c1292b2/scripts/init.sh rename to pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/scripts/init.sh diff --git a/pansou/sha-c1292b2/scripts/upgrade.sh b/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/scripts/upgrade.sh similarity index 100% rename from pansou/sha-c1292b2/scripts/upgrade.sh rename to pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/scripts/upgrade.sh From 307a62beb81b422141115d206bf16c3612e27331 Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Wed, 13 Aug 2025 12:22:27 +0800 Subject: [PATCH 44/56] =?UTF-8?q?=F0=9F=98=85=E4=BD=BF=E7=94=A8=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E7=9A=84=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pansou/{sha-c1292b2 => latest}/data.yml | 0 pansou/{sha-c1292b2 => latest}/docker-compose.yml | 2 +- pansou/{sha-c1292b2 => latest}/scripts/init.sh | 0 pansou/{sha-c1292b2 => latest}/scripts/upgrade.sh | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename pansou/{sha-c1292b2 => latest}/data.yml (100%) rename pansou/{sha-c1292b2 => latest}/docker-compose.yml (91%) rename pansou/{sha-c1292b2 => latest}/scripts/init.sh (100%) rename pansou/{sha-c1292b2 => latest}/scripts/upgrade.sh (100%) diff --git a/pansou/sha-c1292b2/data.yml b/pansou/latest/data.yml similarity index 100% rename from pansou/sha-c1292b2/data.yml rename to pansou/latest/data.yml diff --git a/pansou/sha-c1292b2/docker-compose.yml b/pansou/latest/docker-compose.yml similarity index 91% rename from pansou/sha-c1292b2/docker-compose.yml rename to pansou/latest/docker-compose.yml index f5536f1fc..3f4cf46cf 100644 --- a/pansou/sha-c1292b2/docker-compose.yml +++ b/pansou/latest/docker-compose.yml @@ -1,6 +1,6 @@ services: pansou: - image: ghcr.io/fish2018/pansou-web:sha-c1292b2 + image: ghcr.io/fish2018/pansou-web:latest container_name: ${CONTAINER_NAME} restart: always labels: diff --git a/pansou/sha-c1292b2/scripts/init.sh b/pansou/latest/scripts/init.sh similarity index 100% rename from pansou/sha-c1292b2/scripts/init.sh rename to pansou/latest/scripts/init.sh diff --git a/pansou/sha-c1292b2/scripts/upgrade.sh b/pansou/latest/scripts/upgrade.sh similarity index 100% rename from pansou/sha-c1292b2/scripts/upgrade.sh rename to pansou/latest/scripts/upgrade.sh From 425823fd75503aa3e3f252fd56ab45f93e9b5322 Mon Sep 17 00:00:00 2001 From: Qinyang Liu <93815242+willow-god@users.noreply.github.com> Date: Wed, 13 Aug 2025 12:26:37 +0800 Subject: [PATCH 45/56] =?UTF-8?q?=F0=9F=99=84=E5=85=88=E8=A1=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data.yml | 133 ------------------ .../docker-compose.yml | 26 ---- .../scripts/init.sh | 10 -- .../scripts/upgrade.sh | 10 -- 4 files changed, 179 deletions(-) delete mode 100644 pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/data.yml delete mode 100644 pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/docker-compose.yml delete mode 100644 pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/scripts/init.sh delete mode 100644 pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/scripts/upgrade.sh diff --git a/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/data.yml b/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/data.yml deleted file mode 100644 index 717e51c28..000000000 --- a/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/data.yml +++ /dev/null @@ -1,133 +0,0 @@ -additionalProperties: - formFields: - - default: 45963 - envKey: PANEL_APP_PORT_HTTP - labelEn: HTTP Port - labelZh: HTTP 端口 - label: - en: HTTP Port - ja: ポート - ms: Port - pt-br: Porta - ru: Порт - ko: 포트 - zh: HTTP 端口 - zh-Hant: HTTP 連接埠 - required: true - rule: paramPort - type: number - - - default: "" - envKey: SOCKS5_PROXY - labelEn: SOCKS5 Proxy - labelZh: SOCKS5 代理 - label: - en: SOCKS5 Proxy - ja: SOCKS5プロキシ - ms: Proksi SOCKS5 - pt-br: Proxy SOCKS5 - ru: SOCKS5 прокси - ko: SOCKS5 프록시 - zh: SOCKS5 代理 - zh-Hant: SOCKS5 代理 - required: false - type: text - - - default: "" - envKey: HTTP_PROXY - labelEn: HTTP Proxy - labelZh: HTTP 代理 - label: - en: HTTP Proxy - ja: HTTPプロキシ - ms: Proksi HTTP - pt-br: Proxy HTTP - ru: HTTP прокси - ko: HTTP 프록시 - zh: HTTP 代理 - zh-Hant: HTTP 代理 - required: false - type: text - - - default: "" - envKey: HTTPS_PROXY - labelEn: HTTPS Proxy - labelZh: HTTPS 代理 - label: - en: HTTPS Proxy - ja: HTTPSプロキシ - ms: Proksi HTTPS - pt-br: Proxy HTTPS - ru: HTTPS прокси - ko: HTTPS 프록시 - zh: HTTPS 代理 - zh-Hant: HTTPS 代理 - required: false - type: text - - - default: true - envKey: MOONTV_ENABLE_REGISTER - required: true - type: select - label: - en: Enable Registration - ja: 登録を有効にする - ms: Dayakan Pendaftaran - pt-br: Habilitar Registro - ru: Включить регистрацию - ko: 회원가입 활성화 - zh: 启用注册 - zh-Hant: 啟用註冊 - values: - - label: 启用 - value: "true" - - label: 禁用 - value: "false" - - - default: "3600" - envKey: CACHE_TTL - labelEn: Cache TTL (seconds) - labelZh: 缓存有效期(秒) - label: - en: Cache TTL (seconds) - ja: キャッシュTTL(秒) - ms: Cache TTL (saat) - pt-br: TTL de Cache (segundos) - ru: TTL кэша (сек) - ko: 캐시 TTL(초) - zh: 缓存有效期(秒) - zh-Hant: 快取有效期(秒) - required: true - type: number - - - default: "200" - envKey: MAX_CONCURRENCY - labelEn: Max Concurrency - labelZh: 最大并发数 - label: - en: Max Concurrency - ja: 最大同時実行数 - ms: Keupayaan Serentak Maks - pt-br: Concorrência Máxima - ru: Макс. количество потоков - ko: 최대 동시 실행 수 - zh: 最大并发数 - zh-Hant: 最大並行數 - required: true - type: number - - - default: "30" - envKey: MAX_PAGES - labelEn: Max Pages - labelZh: 最大页面数 - label: - en: Max Pages - ja: 最大ページ数 - ms: Bilangan Halaman Maks - pt-br: Páginas Máximas - ru: Макс. количество страниц - ko: 최대 페이지 수 - zh: 最大页面数 - zh-Hant: 最大頁數 - required: true - type: number diff --git a/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/docker-compose.yml b/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/docker-compose.yml deleted file mode 100644 index ea6b9c8c8..000000000 --- a/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/docker-compose.yml +++ /dev/null @@ -1,26 +0,0 @@ -services: - pansou: - image: ghcr.io/fish2018/pansou-web:sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59 - container_name: ${CONTAINER_NAME} - restart: always - labels: - createdBy: "Apps" - ports: - - "${PANEL_APP_PORT_HTTP}:80" - environment: - SOCKS5_PROXY: ${SOCKS5_PROXY} - HTTP_PROXY: ${HTTP_PROXY} - HTTPS_PROXY: ${HTTPS_PROXY} - CACHE_ENABLED: ${CACHE_ENABLED} - CACHE_TTL: ${CACHE_TTL} - MAX_CONCURRENCY: ${MAX_CONCURRENCY} - MAX_PAGES: ${MAX_PAGES} - volumes: - - ./data/data:/app/data - - ./data/logs:/app/logs - networks: - - 1panel-network - -networks: - 1panel-network: - external: true diff --git a/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/scripts/init.sh b/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/scripts/init.sh deleted file mode 100644 index 390cc1d23..000000000 --- a/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/scripts/init.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# 替换docker-compose.yml中的ghcr.io为ghcr.nju.edu.cn -echo "开始替换镜像源地址..." -if sed -i 's/ghcr.io/ghcr.nju.edu.cn/g' ./docker-compose.yml; then - echo "成功: 已将ghcr.io替换为ghcr.nju.edu.cn" -else - echo "错误: 替换镜像源地址失败" - exit 1 -fi diff --git a/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/scripts/upgrade.sh b/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/scripts/upgrade.sh deleted file mode 100644 index 390cc1d23..000000000 --- a/pansou/sha-c1292b2@sha256:a9e17506c3010e0aa6b5781366ec55c29099967f2a28097ee2bf1c138fba3e59/scripts/upgrade.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# 替换docker-compose.yml中的ghcr.io为ghcr.nju.edu.cn -echo "开始替换镜像源地址..." -if sed -i 's/ghcr.io/ghcr.nju.edu.cn/g' ./docker-compose.yml; then - echo "成功: 已将ghcr.io替换为ghcr.nju.edu.cn" -else - echo "错误: 替换镜像源地址失败" - exit 1 -fi From cad4cd2759ec12ded669b29e2417eaa2165a45cd Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Wed, 13 Aug 2025 23:46:01 +0800 Subject: [PATCH 46/56] =?UTF-8?q?=F0=9F=98=83=E5=AE=9E=E7=8E=B0=E8=BE=83?= =?UTF-8?q?=E4=B8=BA=E5=AE=8C=E5=96=84=E7=9A=84=E9=95=9C=E5=83=8F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD=EF=BC=8C=E7=9B=AE=E5=89=8D=E6=AD=A3?= =?UTF-8?q?=E5=9C=A8=E6=B5=8B=E8=AF=95=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pansou/latest/scripts/init.sh | 80 +++++++++++++++++++++++++++++--- pansou/latest/scripts/upgrade.sh | 80 +++++++++++++++++++++++++++++--- 2 files changed, 148 insertions(+), 12 deletions(-) diff --git a/pansou/latest/scripts/init.sh b/pansou/latest/scripts/init.sh index 390cc1d23..435cd4c8c 100644 --- a/pansou/latest/scripts/init.sh +++ b/pansou/latest/scripts/init.sh @@ -1,10 +1,78 @@ #!/bin/bash -# 替换docker-compose.yml中的ghcr.io为ghcr.nju.edu.cn -echo "开始替换镜像源地址..." -if sed -i 's/ghcr.io/ghcr.nju.edu.cn/g' ./docker-compose.yml; then - echo "成功: 已将ghcr.io替换为ghcr.nju.edu.cn" +# ===== 1. 定义当前应用的镜像类别 ===== +# 可选值:ghcr / quay / gcr / k8s_gcr / k8s_reg +MIRROR_TYPE="ghcr" + +# ===== 2. 配置文件路径 ===== +CONFIG_FILE="/opt/mirror-config.env" + +# ===== 3. 检查配置文件是否存在 ===== +if [ ! -f "$CONFIG_FILE" ]; then + echo "未找到配置文件 $CONFIG_FILE,跳过镜像替换步骤。" else - echo "错误: 替换镜像源地址失败" - exit 1 + # ===== 4. 加载配置文件 ===== + set -a + source "$CONFIG_FILE" + set +a + + # ===== 5. 根据镜像类别获取变量 ===== + case "$MIRROR_TYPE" in + ghcr) + ENABLE_VAR="$GHCR_ENABLE" + OLD_DOMAIN="ghcr.io" + NEW_DOMAIN="$GHCR_MIRROR" + ;; + quay) + ENABLE_VAR="$QUAY_ENABLE" + OLD_DOMAIN="quay.io" + NEW_DOMAIN="$QUAY_MIRROR" + ;; + gcr) + ENABLE_VAR="$GCR_ENABLE" + OLD_DOMAIN="gcr.io" + NEW_DOMAIN="$GCR_MIRROR" + ;; + k8s_gcr) + ENABLE_VAR="$K8S_GCR_ENABLE" + OLD_DOMAIN="k8s.gcr.io" + NEW_DOMAIN="$K8S_GCR_MIRROR" + ;; + k8s_reg) + ENABLE_VAR="$K8S_REG_ENABLE" + OLD_DOMAIN="registry.k8s.io" + NEW_DOMAIN="$K8S_REG_MIRROR" + ;; + *) + echo "未知的 MIRROR_TYPE: $MIRROR_TYPE" + ;; + esac + + # ===== 6. 检查是否启用镜像替换 ===== + if [ "$ENABLE_VAR" == "true" ]; then + # ===== 7. 检查 docker-compose 文件 ===== + if [ -f "./docker-compose.yml" ]; then + COMPOSE_FILE="./docker-compose.yml" + elif [ -f "./docker-compose.yaml" ]; then + COMPOSE_FILE="./docker-compose.yaml" + else + echo "未找到 docker-compose 文件,跳过替换。" + COMPOSE_FILE="" + fi + + # ===== 8. 执行替换 ===== + if [ -n "$COMPOSE_FILE" ]; then + echo "开始替换 $OLD_DOMAIN -> $NEW_DOMAIN ..." + if sed -i "s|$OLD_DOMAIN|$NEW_DOMAIN|g" "$COMPOSE_FILE"; then + echo "成功: 已将 $OLD_DOMAIN 替换为 $NEW_DOMAIN" + else + echo "错误: 替换镜像源地址失败" + fi + fi + else + echo "镜像替换未启用($MIRROR_TYPE)" + fi fi + +# ===== 9. 后续其他步骤 ===== +echo "这里执行 init.sh 的其他操作..." diff --git a/pansou/latest/scripts/upgrade.sh b/pansou/latest/scripts/upgrade.sh index 390cc1d23..435cd4c8c 100644 --- a/pansou/latest/scripts/upgrade.sh +++ b/pansou/latest/scripts/upgrade.sh @@ -1,10 +1,78 @@ #!/bin/bash -# 替换docker-compose.yml中的ghcr.io为ghcr.nju.edu.cn -echo "开始替换镜像源地址..." -if sed -i 's/ghcr.io/ghcr.nju.edu.cn/g' ./docker-compose.yml; then - echo "成功: 已将ghcr.io替换为ghcr.nju.edu.cn" +# ===== 1. 定义当前应用的镜像类别 ===== +# 可选值:ghcr / quay / gcr / k8s_gcr / k8s_reg +MIRROR_TYPE="ghcr" + +# ===== 2. 配置文件路径 ===== +CONFIG_FILE="/opt/mirror-config.env" + +# ===== 3. 检查配置文件是否存在 ===== +if [ ! -f "$CONFIG_FILE" ]; then + echo "未找到配置文件 $CONFIG_FILE,跳过镜像替换步骤。" else - echo "错误: 替换镜像源地址失败" - exit 1 + # ===== 4. 加载配置文件 ===== + set -a + source "$CONFIG_FILE" + set +a + + # ===== 5. 根据镜像类别获取变量 ===== + case "$MIRROR_TYPE" in + ghcr) + ENABLE_VAR="$GHCR_ENABLE" + OLD_DOMAIN="ghcr.io" + NEW_DOMAIN="$GHCR_MIRROR" + ;; + quay) + ENABLE_VAR="$QUAY_ENABLE" + OLD_DOMAIN="quay.io" + NEW_DOMAIN="$QUAY_MIRROR" + ;; + gcr) + ENABLE_VAR="$GCR_ENABLE" + OLD_DOMAIN="gcr.io" + NEW_DOMAIN="$GCR_MIRROR" + ;; + k8s_gcr) + ENABLE_VAR="$K8S_GCR_ENABLE" + OLD_DOMAIN="k8s.gcr.io" + NEW_DOMAIN="$K8S_GCR_MIRROR" + ;; + k8s_reg) + ENABLE_VAR="$K8S_REG_ENABLE" + OLD_DOMAIN="registry.k8s.io" + NEW_DOMAIN="$K8S_REG_MIRROR" + ;; + *) + echo "未知的 MIRROR_TYPE: $MIRROR_TYPE" + ;; + esac + + # ===== 6. 检查是否启用镜像替换 ===== + if [ "$ENABLE_VAR" == "true" ]; then + # ===== 7. 检查 docker-compose 文件 ===== + if [ -f "./docker-compose.yml" ]; then + COMPOSE_FILE="./docker-compose.yml" + elif [ -f "./docker-compose.yaml" ]; then + COMPOSE_FILE="./docker-compose.yaml" + else + echo "未找到 docker-compose 文件,跳过替换。" + COMPOSE_FILE="" + fi + + # ===== 8. 执行替换 ===== + if [ -n "$COMPOSE_FILE" ]; then + echo "开始替换 $OLD_DOMAIN -> $NEW_DOMAIN ..." + if sed -i "s|$OLD_DOMAIN|$NEW_DOMAIN|g" "$COMPOSE_FILE"; then + echo "成功: 已将 $OLD_DOMAIN 替换为 $NEW_DOMAIN" + else + echo "错误: 替换镜像源地址失败" + fi + fi + else + echo "镜像替换未启用($MIRROR_TYPE)" + fi fi + +# ===== 9. 后续其他步骤 ===== +echo "这里执行 init.sh 的其他操作..." From 8eced1610bac7f61e80566c73744bb8d06323eef Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Wed, 13 Aug 2025 23:58:16 +0800 Subject: [PATCH 47/56] =?UTF-8?q?=F0=9F=A4=97=E4=BF=AE=E6=94=B9=E5=BA=94?= =?UTF-8?q?=E7=94=A8PanSou=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pansou/latest/data.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pansou/latest/data.yml b/pansou/latest/data.yml index 717e51c28..1fa8ae5f5 100644 --- a/pansou/latest/data.yml +++ b/pansou/latest/data.yml @@ -66,22 +66,22 @@ additionalProperties: type: text - default: true - envKey: MOONTV_ENABLE_REGISTER + envKey: CACHE_ENABLED required: true type: select label: - en: Enable Registration - ja: 登録を有効にする - ms: Dayakan Pendaftaran - pt-br: Habilitar Registro - ru: Включить регистрацию - ko: 회원가입 활성화 - zh: 启用注册 - zh-Hant: 啟用註冊 + en: Enable Cache + ja: キャッシュを有効にする + ms: Dayakan Cache + pt-br: Habilitar Cache + ru: Включить кэш + ko: 캐시 활성화 + zh: 启用缓存 + zh-Hant: 啟用快取 values: - - label: 启用 + - label: 启用缓存 value: "true" - - label: 禁用 + - label: 禁用缓存 value: "false" - default: "3600" From 64bed75fd8d5a7716b1b5334fe3cd5679221ffa5 Mon Sep 17 00:00:00 2001 From: LiuShen <3162475700@qq.com> Date: Thu, 14 Aug 2025 22:38:53 +0800 Subject: [PATCH 48/56] =?UTF-8?q?=F0=9F=A4=94=E4=BF=AE=E6=94=B9=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E4=B8=BA=E6=B8=85=E7=BE=BD=E7=9B=98=E6=90=9C=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E6=89=98=E7=AE=A1=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pansou/{latest => 1.0.1}/data.yml | 0 pansou/{latest => 1.0.1}/docker-compose.yml | 2 +- pansou/latest/scripts/init.sh | 78 --------------------- pansou/latest/scripts/upgrade.sh | 78 --------------------- 4 files changed, 1 insertion(+), 157 deletions(-) rename pansou/{latest => 1.0.1}/data.yml (100%) rename pansou/{latest => 1.0.1}/docker-compose.yml (92%) delete mode 100644 pansou/latest/scripts/init.sh delete mode 100644 pansou/latest/scripts/upgrade.sh diff --git a/pansou/latest/data.yml b/pansou/1.0.1/data.yml similarity index 100% rename from pansou/latest/data.yml rename to pansou/1.0.1/data.yml diff --git a/pansou/latest/docker-compose.yml b/pansou/1.0.1/docker-compose.yml similarity index 92% rename from pansou/latest/docker-compose.yml rename to pansou/1.0.1/docker-compose.yml index 3f4cf46cf..291104719 100644 --- a/pansou/latest/docker-compose.yml +++ b/pansou/1.0.1/docker-compose.yml @@ -1,6 +1,6 @@ services: pansou: - image: ghcr.io/fish2018/pansou-web:latest + image: willowgod/pansou-web:v1.0.1 container_name: ${CONTAINER_NAME} restart: always labels: diff --git a/pansou/latest/scripts/init.sh b/pansou/latest/scripts/init.sh deleted file mode 100644 index 435cd4c8c..000000000 --- a/pansou/latest/scripts/init.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -# ===== 1. 定义当前应用的镜像类别 ===== -# 可选值:ghcr / quay / gcr / k8s_gcr / k8s_reg -MIRROR_TYPE="ghcr" - -# ===== 2. 配置文件路径 ===== -CONFIG_FILE="/opt/mirror-config.env" - -# ===== 3. 检查配置文件是否存在 ===== -if [ ! -f "$CONFIG_FILE" ]; then - echo "未找到配置文件 $CONFIG_FILE,跳过镜像替换步骤。" -else - # ===== 4. 加载配置文件 ===== - set -a - source "$CONFIG_FILE" - set +a - - # ===== 5. 根据镜像类别获取变量 ===== - case "$MIRROR_TYPE" in - ghcr) - ENABLE_VAR="$GHCR_ENABLE" - OLD_DOMAIN="ghcr.io" - NEW_DOMAIN="$GHCR_MIRROR" - ;; - quay) - ENABLE_VAR="$QUAY_ENABLE" - OLD_DOMAIN="quay.io" - NEW_DOMAIN="$QUAY_MIRROR" - ;; - gcr) - ENABLE_VAR="$GCR_ENABLE" - OLD_DOMAIN="gcr.io" - NEW_DOMAIN="$GCR_MIRROR" - ;; - k8s_gcr) - ENABLE_VAR="$K8S_GCR_ENABLE" - OLD_DOMAIN="k8s.gcr.io" - NEW_DOMAIN="$K8S_GCR_MIRROR" - ;; - k8s_reg) - ENABLE_VAR="$K8S_REG_ENABLE" - OLD_DOMAIN="registry.k8s.io" - NEW_DOMAIN="$K8S_REG_MIRROR" - ;; - *) - echo "未知的 MIRROR_TYPE: $MIRROR_TYPE" - ;; - esac - - # ===== 6. 检查是否启用镜像替换 ===== - if [ "$ENABLE_VAR" == "true" ]; then - # ===== 7. 检查 docker-compose 文件 ===== - if [ -f "./docker-compose.yml" ]; then - COMPOSE_FILE="./docker-compose.yml" - elif [ -f "./docker-compose.yaml" ]; then - COMPOSE_FILE="./docker-compose.yaml" - else - echo "未找到 docker-compose 文件,跳过替换。" - COMPOSE_FILE="" - fi - - # ===== 8. 执行替换 ===== - if [ -n "$COMPOSE_FILE" ]; then - echo "开始替换 $OLD_DOMAIN -> $NEW_DOMAIN ..." - if sed -i "s|$OLD_DOMAIN|$NEW_DOMAIN|g" "$COMPOSE_FILE"; then - echo "成功: 已将 $OLD_DOMAIN 替换为 $NEW_DOMAIN" - else - echo "错误: 替换镜像源地址失败" - fi - fi - else - echo "镜像替换未启用($MIRROR_TYPE)" - fi -fi - -# ===== 9. 后续其他步骤 ===== -echo "这里执行 init.sh 的其他操作..." diff --git a/pansou/latest/scripts/upgrade.sh b/pansou/latest/scripts/upgrade.sh deleted file mode 100644 index 435cd4c8c..000000000 --- a/pansou/latest/scripts/upgrade.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -# ===== 1. 定义当前应用的镜像类别 ===== -# 可选值:ghcr / quay / gcr / k8s_gcr / k8s_reg -MIRROR_TYPE="ghcr" - -# ===== 2. 配置文件路径 ===== -CONFIG_FILE="/opt/mirror-config.env" - -# ===== 3. 检查配置文件是否存在 ===== -if [ ! -f "$CONFIG_FILE" ]; then - echo "未找到配置文件 $CONFIG_FILE,跳过镜像替换步骤。" -else - # ===== 4. 加载配置文件 ===== - set -a - source "$CONFIG_FILE" - set +a - - # ===== 5. 根据镜像类别获取变量 ===== - case "$MIRROR_TYPE" in - ghcr) - ENABLE_VAR="$GHCR_ENABLE" - OLD_DOMAIN="ghcr.io" - NEW_DOMAIN="$GHCR_MIRROR" - ;; - quay) - ENABLE_VAR="$QUAY_ENABLE" - OLD_DOMAIN="quay.io" - NEW_DOMAIN="$QUAY_MIRROR" - ;; - gcr) - ENABLE_VAR="$GCR_ENABLE" - OLD_DOMAIN="gcr.io" - NEW_DOMAIN="$GCR_MIRROR" - ;; - k8s_gcr) - ENABLE_VAR="$K8S_GCR_ENABLE" - OLD_DOMAIN="k8s.gcr.io" - NEW_DOMAIN="$K8S_GCR_MIRROR" - ;; - k8s_reg) - ENABLE_VAR="$K8S_REG_ENABLE" - OLD_DOMAIN="registry.k8s.io" - NEW_DOMAIN="$K8S_REG_MIRROR" - ;; - *) - echo "未知的 MIRROR_TYPE: $MIRROR_TYPE" - ;; - esac - - # ===== 6. 检查是否启用镜像替换 ===== - if [ "$ENABLE_VAR" == "true" ]; then - # ===== 7. 检查 docker-compose 文件 ===== - if [ -f "./docker-compose.yml" ]; then - COMPOSE_FILE="./docker-compose.yml" - elif [ -f "./docker-compose.yaml" ]; then - COMPOSE_FILE="./docker-compose.yaml" - else - echo "未找到 docker-compose 文件,跳过替换。" - COMPOSE_FILE="" - fi - - # ===== 8. 执行替换 ===== - if [ -n "$COMPOSE_FILE" ]; then - echo "开始替换 $OLD_DOMAIN -> $NEW_DOMAIN ..." - if sed -i "s|$OLD_DOMAIN|$NEW_DOMAIN|g" "$COMPOSE_FILE"; then - echo "成功: 已将 $OLD_DOMAIN 替换为 $NEW_DOMAIN" - else - echo "错误: 替换镜像源地址失败" - fi - fi - else - echo "镜像替换未启用($MIRROR_TYPE)" - fi -fi - -# ===== 9. 后续其他步骤 ===== -echo "这里执行 init.sh 的其他操作..." From 323adb92e9a2547a22215e158da5b31fc3a9f398 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 17 Aug 2025 10:21:38 +0000 Subject: [PATCH 49/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v9.1.0 --- forgejo-runner-dind/9.0.3/docker-compose.yml | 2 +- forgejo-runner/9.0.2/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forgejo-runner-dind/9.0.3/docker-compose.yml b/forgejo-runner-dind/9.0.3/docker-compose.yml index 060b6c8de..948e77a86 100644 --- a/forgejo-runner-dind/9.0.3/docker-compose.yml +++ b/forgejo-runner-dind/9.0.3/docker-compose.yml @@ -15,7 +15,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.3 + image: code.forgejo.org/forgejo/runner:9.1.0 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: diff --git a/forgejo-runner/9.0.2/docker-compose.yml b/forgejo-runner/9.0.2/docker-compose.yml index bb15f80e2..4ad0bfd49 100644 --- a/forgejo-runner/9.0.2/docker-compose.yml +++ b/forgejo-runner/9.0.2/docker-compose.yml @@ -1,6 +1,6 @@ services: forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.0.3 + image: code.forgejo.org/forgejo/runner:9.1.0 container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always user: root From a0132c65cdf441d4731a5b87c50463d095a9b063 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sun, 17 Aug 2025 10:21:48 +0000 Subject: [PATCH 50/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner-dind=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E?= =?UTF-8?q?=209.0.3=20=E5=8D=87=E7=BA=A7=E5=88=B0=209.1.0=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/{9.0.3 => 9.1.0}/data.yml | 0 forgejo-runner-dind/{9.0.3 => 9.1.0}/docker-compose.yml | 0 forgejo-runner-dind/{9.0.3 => 9.1.0}/scripts/init.sh | 0 forgejo-runner-dind/{9.0.3 => 9.1.0}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner-dind/{9.0.3 => 9.1.0}/data.yml (100%) rename forgejo-runner-dind/{9.0.3 => 9.1.0}/docker-compose.yml (100%) rename forgejo-runner-dind/{9.0.3 => 9.1.0}/scripts/init.sh (100%) rename forgejo-runner-dind/{9.0.3 => 9.1.0}/scripts/register.sh (100%) diff --git a/forgejo-runner-dind/9.0.3/data.yml b/forgejo-runner-dind/9.1.0/data.yml similarity index 100% rename from forgejo-runner-dind/9.0.3/data.yml rename to forgejo-runner-dind/9.1.0/data.yml diff --git a/forgejo-runner-dind/9.0.3/docker-compose.yml b/forgejo-runner-dind/9.1.0/docker-compose.yml similarity index 100% rename from forgejo-runner-dind/9.0.3/docker-compose.yml rename to forgejo-runner-dind/9.1.0/docker-compose.yml diff --git a/forgejo-runner-dind/9.0.3/scripts/init.sh b/forgejo-runner-dind/9.1.0/scripts/init.sh similarity index 100% rename from forgejo-runner-dind/9.0.3/scripts/init.sh rename to forgejo-runner-dind/9.1.0/scripts/init.sh diff --git a/forgejo-runner-dind/9.0.3/scripts/register.sh b/forgejo-runner-dind/9.1.0/scripts/register.sh similarity index 100% rename from forgejo-runner-dind/9.0.3/scripts/register.sh rename to forgejo-runner-dind/9.1.0/scripts/register.sh From 45fe7e072aa05b08583f8bd77da46c8cde61d6a5 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Sun, 17 Aug 2025 10:21:48 +0000 Subject: [PATCH 51/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E=209.0.?= =?UTF-8?q?2=20=E5=8D=87=E7=BA=A7=E5=88=B0=209.1.0=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/{9.0.2 => 9.1.0}/data.yml | 0 forgejo-runner/{9.0.2 => 9.1.0}/docker-compose.yml | 0 forgejo-runner/{9.0.2 => 9.1.0}/scripts/init.sh | 0 forgejo-runner/{9.0.2 => 9.1.0}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner/{9.0.2 => 9.1.0}/data.yml (100%) rename forgejo-runner/{9.0.2 => 9.1.0}/docker-compose.yml (100%) rename forgejo-runner/{9.0.2 => 9.1.0}/scripts/init.sh (100%) rename forgejo-runner/{9.0.2 => 9.1.0}/scripts/register.sh (100%) diff --git a/forgejo-runner/9.0.2/data.yml b/forgejo-runner/9.1.0/data.yml similarity index 100% rename from forgejo-runner/9.0.2/data.yml rename to forgejo-runner/9.1.0/data.yml diff --git a/forgejo-runner/9.0.2/docker-compose.yml b/forgejo-runner/9.1.0/docker-compose.yml similarity index 100% rename from forgejo-runner/9.0.2/docker-compose.yml rename to forgejo-runner/9.1.0/docker-compose.yml diff --git a/forgejo-runner/9.0.2/scripts/init.sh b/forgejo-runner/9.1.0/scripts/init.sh similarity index 100% rename from forgejo-runner/9.0.2/scripts/init.sh rename to forgejo-runner/9.1.0/scripts/init.sh diff --git a/forgejo-runner/9.0.2/scripts/register.sh b/forgejo-runner/9.1.0/scripts/register.sh similarity index 100% rename from forgejo-runner/9.0.2/scripts/register.sh rename to forgejo-runner/9.1.0/scripts/register.sh From c0991d33872053302804bd5c2c6326c0314a4198 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 06:40:09 +0000 Subject: [PATCH 52/56] chore(deps): update willowgod/pansou-web docker tag to v1.0.2 --- pansou/1.0.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pansou/1.0.1/docker-compose.yml b/pansou/1.0.1/docker-compose.yml index 291104719..81efeeafd 100644 --- a/pansou/1.0.1/docker-compose.yml +++ b/pansou/1.0.1/docker-compose.yml @@ -1,6 +1,6 @@ services: pansou: - image: willowgod/pansou-web:v1.0.1 + image: willowgod/pansou-web:v1.0.2 container_name: ${CONTAINER_NAME} restart: always labels: From c5dd7f2eaa5d2d5f138a8dfdbf1f4e45fe3208a3 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Tue, 19 Aug 2025 06:40:22 +0000 Subject: [PATCH 53/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20pansou=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E=201.0.1=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0=201.0.2=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pansou/{1.0.1 => 1.0.2}/data.yml | 0 pansou/{1.0.1 => 1.0.2}/docker-compose.yml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename pansou/{1.0.1 => 1.0.2}/data.yml (100%) rename pansou/{1.0.1 => 1.0.2}/docker-compose.yml (100%) diff --git a/pansou/1.0.1/data.yml b/pansou/1.0.2/data.yml similarity index 100% rename from pansou/1.0.1/data.yml rename to pansou/1.0.2/data.yml diff --git a/pansou/1.0.1/docker-compose.yml b/pansou/1.0.2/docker-compose.yml similarity index 100% rename from pansou/1.0.1/docker-compose.yml rename to pansou/1.0.2/docker-compose.yml From b1d4fc0ba5bedfe76e83dc3cd6fc951d5f5c0666 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Aug 2025 13:10:46 +0000 Subject: [PATCH 54/56] chore(deps): update code.forgejo.org/forgejo/runner docker tag to v9.1.1 --- forgejo-runner-dind/9.1.0/docker-compose.yml | 2 +- forgejo-runner/9.1.0/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forgejo-runner-dind/9.1.0/docker-compose.yml b/forgejo-runner-dind/9.1.0/docker-compose.yml index 948e77a86..95309fceb 100644 --- a/forgejo-runner-dind/9.1.0/docker-compose.yml +++ b/forgejo-runner-dind/9.1.0/docker-compose.yml @@ -15,7 +15,7 @@ services: labels: createdBy: "Apps" forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.1.0 + image: code.forgejo.org/forgejo/runner:9.1.1 container_name: ${CONTAINER_NAME:-forgejo-runner} depends_on: dind: diff --git a/forgejo-runner/9.1.0/docker-compose.yml b/forgejo-runner/9.1.0/docker-compose.yml index 4ad0bfd49..0400926e0 100644 --- a/forgejo-runner/9.1.0/docker-compose.yml +++ b/forgejo-runner/9.1.0/docker-compose.yml @@ -1,6 +1,6 @@ services: forgejo_runner: - image: code.forgejo.org/forgejo/runner:9.1.0 + image: code.forgejo.org/forgejo/runner:9.1.1 container_name: ${CONTAINER_NAME:-forgejo-runner} restart: always user: root From a234d1c3fc7ef2d76558ea63e5b9ea3ae17b7108 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 21 Aug 2025 13:10:58 +0000 Subject: [PATCH 55/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner-dind=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E?= =?UTF-8?q?=209.1.0=20=E5=8D=87=E7=BA=A7=E5=88=B0=209.1.1=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner-dind/{9.1.0 => 9.1.1}/data.yml | 0 forgejo-runner-dind/{9.1.0 => 9.1.1}/docker-compose.yml | 0 forgejo-runner-dind/{9.1.0 => 9.1.1}/scripts/init.sh | 0 forgejo-runner-dind/{9.1.0 => 9.1.1}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner-dind/{9.1.0 => 9.1.1}/data.yml (100%) rename forgejo-runner-dind/{9.1.0 => 9.1.1}/docker-compose.yml (100%) rename forgejo-runner-dind/{9.1.0 => 9.1.1}/scripts/init.sh (100%) rename forgejo-runner-dind/{9.1.0 => 9.1.1}/scripts/register.sh (100%) diff --git a/forgejo-runner-dind/9.1.0/data.yml b/forgejo-runner-dind/9.1.1/data.yml similarity index 100% rename from forgejo-runner-dind/9.1.0/data.yml rename to forgejo-runner-dind/9.1.1/data.yml diff --git a/forgejo-runner-dind/9.1.0/docker-compose.yml b/forgejo-runner-dind/9.1.1/docker-compose.yml similarity index 100% rename from forgejo-runner-dind/9.1.0/docker-compose.yml rename to forgejo-runner-dind/9.1.1/docker-compose.yml diff --git a/forgejo-runner-dind/9.1.0/scripts/init.sh b/forgejo-runner-dind/9.1.1/scripts/init.sh similarity index 100% rename from forgejo-runner-dind/9.1.0/scripts/init.sh rename to forgejo-runner-dind/9.1.1/scripts/init.sh diff --git a/forgejo-runner-dind/9.1.0/scripts/register.sh b/forgejo-runner-dind/9.1.1/scripts/register.sh similarity index 100% rename from forgejo-runner-dind/9.1.0/scripts/register.sh rename to forgejo-runner-dind/9.1.1/scripts/register.sh From 28b5184979f4ad252833119b20185edaf3b16439 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 21 Aug 2025 13:10:58 +0000 Subject: [PATCH 56/56] =?UTF-8?q?=F0=9F=93=88=E5=B0=86=E5=BA=94=E7=94=A8?= =?UTF-8?q?=20forgejo-runner=20=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E=209.1.?= =?UTF-8?q?0=20=E5=8D=87=E7=BA=A7=E5=88=B0=209.1.1=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forgejo-runner/{9.1.0 => 9.1.1}/data.yml | 0 forgejo-runner/{9.1.0 => 9.1.1}/docker-compose.yml | 0 forgejo-runner/{9.1.0 => 9.1.1}/scripts/init.sh | 0 forgejo-runner/{9.1.0 => 9.1.1}/scripts/register.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename forgejo-runner/{9.1.0 => 9.1.1}/data.yml (100%) rename forgejo-runner/{9.1.0 => 9.1.1}/docker-compose.yml (100%) rename forgejo-runner/{9.1.0 => 9.1.1}/scripts/init.sh (100%) rename forgejo-runner/{9.1.0 => 9.1.1}/scripts/register.sh (100%) diff --git a/forgejo-runner/9.1.0/data.yml b/forgejo-runner/9.1.1/data.yml similarity index 100% rename from forgejo-runner/9.1.0/data.yml rename to forgejo-runner/9.1.1/data.yml diff --git a/forgejo-runner/9.1.0/docker-compose.yml b/forgejo-runner/9.1.1/docker-compose.yml similarity index 100% rename from forgejo-runner/9.1.0/docker-compose.yml rename to forgejo-runner/9.1.1/docker-compose.yml diff --git a/forgejo-runner/9.1.0/scripts/init.sh b/forgejo-runner/9.1.1/scripts/init.sh similarity index 100% rename from forgejo-runner/9.1.0/scripts/init.sh rename to forgejo-runner/9.1.1/scripts/init.sh diff --git a/forgejo-runner/9.1.0/scripts/register.sh b/forgejo-runner/9.1.1/scripts/register.sh similarity index 100% rename from forgejo-runner/9.1.0/scripts/register.sh rename to forgejo-runner/9.1.1/scripts/register.sh