diff --git a/appstore/apifox-runner/README.md b/appstore/apifox-runner/README.md index ca590535d..6bd73aa45 100644 --- a/appstore/apifox-runner/README.md +++ b/appstore/apifox-runner/README.md @@ -33,6 +33,14 @@ API 文档和 API 开发调试使用同一个工具,API 调试完成后即可 ## 安装说明 +### 版本说明 + +- `latest`:通用版 + 包含 Runner 所有功能,及以下外部程序语言环境:Nodejs 18,Java 21,Python 3,PHP 8 + +- `slim`:精简版 + 在精简版中,包含 Runner 所有功能,及以下外部程序语言环境:Nodejs 18 + ### 应用服务地址 默认值:`https://api.apifox.cn` diff --git a/appstore/apifox-runner/slim/.env b/appstore/apifox-runner/slim/.env new file mode 100644 index 000000000..078754206 --- /dev/null +++ b/appstore/apifox-runner/slim/.env @@ -0,0 +1,18 @@ +# 数据持久化路径 [必填] +APIFOX_RUNNER_ROOT_PATH=/home/apifox-runner + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=4524 + +# 应用服务地址 [必填] +SERVER_APP_BASE_URL=https://api.apifox.cn + +# 访问令牌 [必填] +ACCESS_TOKEN= + +# 团队 ID [必填] +TEAM_ID=0 + +# Runner ID [必填] +RUNNER_ID=0 + diff --git a/appstore/apifox-runner/slim/data.yml b/appstore/apifox-runner/slim/data.yml new file mode 100644 index 000000000..82139f8c7 --- /dev/null +++ b/appstore/apifox-runner/slim/data.yml @@ -0,0 +1,45 @@ +additionalProperties: + formFields: + - default: "/home/apifox-runner" + edit: true + envKey: APIFOX_RUNNER_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 4524 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: "https://api.apifox.cn" + edit: true + envKey: SERVER_APP_BASE_URL + labelZh: 应用服务地址 + labelEn: App Server address + required: true + type: text + - default: "" + edit: true + envKey: ACCESS_TOKEN + labelZh: 访问令牌 + labelEn: Access Token + required: true + type: text + - default: 0 + edit: true + envKey: TEAM_ID + labelZh: 团队 ID + labelEn: Team ID + required: true + type: number + - default: 0 + edit: true + envKey: RUNNER_ID + labelZh: Runner ID + labelEn: Runner ID + required: true + type: number diff --git a/appstore/apifox-runner/slim/docker-compose.yml b/appstore/apifox-runner/slim/docker-compose.yml new file mode 100644 index 000000000..bcacfcd4d --- /dev/null +++ b/appstore/apifox-runner/slim/docker-compose.yml @@ -0,0 +1,21 @@ +networks: + 1panel-network: + external: true +services: + apifox-runner: + container_name: apifox-runner + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + image: registry.cn-hangzhou.aliyuncs.com/apifox/self-hosted-general-runner:slim + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:4524 + restart: always + volumes: + - ${APIFOX_RUNNER_ROOT_PATH}/runner:/opt/runner diff --git a/appstore/apifox-runner/slim/envs/default.env b/appstore/apifox-runner/slim/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/appstore/apifox-runner/slim/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/appstore/apifox-runner/slim/envs/global.env b/appstore/apifox-runner/slim/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/appstore/apifox-runner/slim/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/appstore/apifox-runner/slim/scripts/init.sh b/appstore/apifox-runner/slim/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/apifox-runner/slim/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/apifox-runner/slim/scripts/uninstall.sh b/appstore/apifox-runner/slim/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/appstore/apifox-runner/slim/scripts/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/apifox-runner/slim/scripts/upgrade.sh b/appstore/apifox-runner/slim/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/apifox-runner/slim/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/umami-mysql/2.16.0/docker-compose.yml b/appstore/umami-mysql/2.16.0/docker-compose.yml index 2bc7a13bc..0ed830dcb 100644 --- a/appstore/umami-mysql/2.16.0/docker-compose.yml +++ b/appstore/umami-mysql/2.16.0/docker-compose.yml @@ -8,8 +8,8 @@ services: - ./envs/global.env - .env environment: - - DISABLE_TELEMETRY = 1 - - REMOVE_TRAILING_SLASH = 1 + - DISABLE_TELEMETRY=1 + - REMOVE_TRAILING_SLASH=1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} image: umamisoftware/umami:mysql-v2.16.0 diff --git a/appstore/umami-mysql/2.19.0/docker-compose.yml b/appstore/umami-mysql/2.19.0/docker-compose.yml index 63d1197b2..3ffd8e3a4 100644 --- a/appstore/umami-mysql/2.19.0/docker-compose.yml +++ b/appstore/umami-mysql/2.19.0/docker-compose.yml @@ -8,8 +8,8 @@ services: - ./envs/global.env - .env environment: - - DISABLE_TELEMETRY = 1 - - REMOVE_TRAILING_SLASH = 1 + - DISABLE_TELEMETRY=1 + - REMOVE_TRAILING_SLASH=1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} image: umamisoftware/umami:mysql-v2.19.0 diff --git a/appstore/umami/2.16.0/docker-compose.yml b/appstore/umami/2.16.0/docker-compose.yml index 7f7a58660..73fb562d5 100644 --- a/appstore/umami/2.16.0/docker-compose.yml +++ b/appstore/umami/2.16.0/docker-compose.yml @@ -8,8 +8,8 @@ services: - ./envs/global.env - .env environment: - - DISABLE_TELEMETRY = 1 - - REMOVE_TRAILING_SLASH = 1 + - DISABLE_TELEMETRY=1 + - REMOVE_TRAILING_SLASH=1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} image: umamisoftware/umami:postgresql-v2.16.0 diff --git a/appstore/umami/2.19.0/docker-compose.yml b/appstore/umami/2.19.0/docker-compose.yml index f8dc6fb29..992871461 100644 --- a/appstore/umami/2.19.0/docker-compose.yml +++ b/appstore/umami/2.19.0/docker-compose.yml @@ -8,8 +8,8 @@ services: - ./envs/global.env - .env environment: - - DISABLE_TELEMETRY = 1 - - REMOVE_TRAILING_SLASH = 1 + - DISABLE_TELEMETRY=1 + - REMOVE_TRAILING_SLASH=1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} image: umamisoftware/umami:postgresql-v2.19.0 diff --git a/appstore/zerotier-planet/1.14.2/.env b/appstore/zerotier-planet/1.14.2/.env index 622fbac30..484780af1 100644 --- a/appstore/zerotier-planet/1.14.2/.env +++ b/appstore/zerotier-planet/1.14.2/.env @@ -7,8 +7,8 @@ NETWORK_MODE=host # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3443 -# API 端口 [必填] -PANEL_APP_PORT_API=9994 +# Zerotier 端口 [必填] +PANEL_APP_PORT_ZT=9993 # 文件传输端口 [必填] PANEL_APP_PORT_FILE=3000 diff --git a/appstore/zerotier-planet/1.14.2/data.yml b/appstore/zerotier-planet/1.14.2/data.yml index c742126a4..86f6683f5 100644 --- a/appstore/zerotier-planet/1.14.2/data.yml +++ b/appstore/zerotier-planet/1.14.2/data.yml @@ -31,11 +31,11 @@ additionalProperties: required: true rule: paramPort type: number - - default: 9994 + - default: 9993 edit: true - envKey: PANEL_APP_PORT_API - labelZh: API 端口 - labelEn: API Port + envKey: PANEL_APP_PORT_ZT + labelZh: Zerotier 端口 + labelEn: Zerotier port required: true rule: paramPort type: number diff --git a/dockge/apifox-runner_slim/.env b/dockge/apifox-runner_slim/.env new file mode 100644 index 000000000..078754206 --- /dev/null +++ b/dockge/apifox-runner_slim/.env @@ -0,0 +1,18 @@ +# 数据持久化路径 [必填] +APIFOX_RUNNER_ROOT_PATH=/home/apifox-runner + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=4524 + +# 应用服务地址 [必填] +SERVER_APP_BASE_URL=https://api.apifox.cn + +# 访问令牌 [必填] +ACCESS_TOKEN= + +# 团队 ID [必填] +TEAM_ID=0 + +# Runner ID [必填] +RUNNER_ID=0 + diff --git a/dockge/apifox-runner_slim/docker-compose.yml b/dockge/apifox-runner_slim/docker-compose.yml new file mode 100644 index 000000000..bcacfcd4d --- /dev/null +++ b/dockge/apifox-runner_slim/docker-compose.yml @@ -0,0 +1,21 @@ +networks: + 1panel-network: + external: true +services: + apifox-runner: + container_name: apifox-runner + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + image: registry.cn-hangzhou.aliyuncs.com/apifox/self-hosted-general-runner:slim + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:4524 + restart: always + volumes: + - ${APIFOX_RUNNER_ROOT_PATH}/runner:/opt/runner diff --git a/dockge/apifox-runner_slim/envs/default.env b/dockge/apifox-runner_slim/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/apifox-runner_slim/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/apifox-runner_slim/envs/global.env b/dockge/apifox-runner_slim/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/apifox-runner_slim/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/umami-mysql/docker-compose.yml b/dockge/umami-mysql/docker-compose.yml index 63d1197b2..3ffd8e3a4 100644 --- a/dockge/umami-mysql/docker-compose.yml +++ b/dockge/umami-mysql/docker-compose.yml @@ -8,8 +8,8 @@ services: - ./envs/global.env - .env environment: - - DISABLE_TELEMETRY = 1 - - REMOVE_TRAILING_SLASH = 1 + - DISABLE_TELEMETRY=1 + - REMOVE_TRAILING_SLASH=1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} image: umamisoftware/umami:mysql-v2.19.0 diff --git a/dockge/umami-mysql_2_16_0/docker-compose.yml b/dockge/umami-mysql_2_16_0/docker-compose.yml index 2bc7a13bc..0ed830dcb 100644 --- a/dockge/umami-mysql_2_16_0/docker-compose.yml +++ b/dockge/umami-mysql_2_16_0/docker-compose.yml @@ -8,8 +8,8 @@ services: - ./envs/global.env - .env environment: - - DISABLE_TELEMETRY = 1 - - REMOVE_TRAILING_SLASH = 1 + - DISABLE_TELEMETRY=1 + - REMOVE_TRAILING_SLASH=1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} image: umamisoftware/umami:mysql-v2.16.0 diff --git a/dockge/umami/docker-compose.yml b/dockge/umami/docker-compose.yml index f8dc6fb29..992871461 100644 --- a/dockge/umami/docker-compose.yml +++ b/dockge/umami/docker-compose.yml @@ -8,8 +8,8 @@ services: - ./envs/global.env - .env environment: - - DISABLE_TELEMETRY = 1 - - REMOVE_TRAILING_SLASH = 1 + - DISABLE_TELEMETRY=1 + - REMOVE_TRAILING_SLASH=1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} image: umamisoftware/umami:postgresql-v2.19.0 diff --git a/dockge/umami_2_16_0/docker-compose.yml b/dockge/umami_2_16_0/docker-compose.yml index 7f7a58660..73fb562d5 100644 --- a/dockge/umami_2_16_0/docker-compose.yml +++ b/dockge/umami_2_16_0/docker-compose.yml @@ -8,8 +8,8 @@ services: - ./envs/global.env - .env environment: - - DISABLE_TELEMETRY = 1 - - REMOVE_TRAILING_SLASH = 1 + - DISABLE_TELEMETRY=1 + - REMOVE_TRAILING_SLASH=1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} image: umamisoftware/umami:postgresql-v2.16.0 diff --git a/dockge/zerotier-planet/.env b/dockge/zerotier-planet/.env index 622fbac30..484780af1 100644 --- a/dockge/zerotier-planet/.env +++ b/dockge/zerotier-planet/.env @@ -7,8 +7,8 @@ NETWORK_MODE=host # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3443 -# API 端口 [必填] -PANEL_APP_PORT_API=9994 +# Zerotier 端口 [必填] +PANEL_APP_PORT_ZT=9993 # 文件传输端口 [必填] PANEL_APP_PORT_FILE=3000