diff --git a/apps/blinko/1.0.3/.env.sample b/apps/blinko/1.0.3/.env.sample deleted file mode 100644 index 0780dc5fe..000000000 --- a/apps/blinko/1.0.3/.env.sample +++ /dev/null @@ -1,11 +0,0 @@ -CONTAINER_NAME="blinko" -NEXTAUTH_SECRET="my_ultra_secure_nextauth_secret" -NEXTAUTH_URL="http://1.2.3.4:1111" -NEXT_PUBLIC_BASE_URL="http://1.2.3.4:1111" -PANEL_APP_PORT_HTTP=1111 -PANEL_DB_HOST="postgresql" -PANEL_DB_HOST_NAME="postgresql" -PANEL_DB_NAME="blinko" -PANEL_DB_PORT=5432 -PANEL_DB_USER="blinko" -PANEL_DB_USER_PASSWORD="blinko" diff --git a/apps/blinko/1.0.3/data.yml b/apps/blinko/1.0.3/data.yml deleted file mode 100644 index 3fe7c782c..000000000 --- a/apps/blinko/1.0.3/data.yml +++ /dev/null @@ -1,70 +0,0 @@ -additionalProperties: - formFields: - - default: "1111" - envKey: PANEL_APP_PORT_HTTP - labelEn: HTTP Port - labelZh: HTTP 端口 - required: true - rule: paramPort - type: number - - default: "http://1.2.3.4:1111" - envKey: NEXTAUTH_URL - labelEn: NextAuth URL - labelZh: 基本 URL - required: true - rule: paramExtUrl - type: text - - default: "http://1.2.3.4:1111" - envKey: NEXT_PUBLIC_BASE_URL - labelEn: Next Public Base URL - labelZh: 公共基本 URL - required: true - rule: paramExtUrl - type: text - - default: "my_ultra_secure_nextauth_secret" - envKey: NEXTAUTH_SECRET - labelEn: NextAuth Secret - labelZh: NextAuth 密钥 - random: true - required: true - rule: paramComplexity - type: password - - default: "" - envKey: PANEL_DB_HOST - key: postgresql - labelEn: PostgreSQL Database Service - labelZh: PostgreSQL 数据库服务 - required: true - type: service - - default: "5432" - edit: true - envKey: PANEL_DB_PORT - labelEn: Database Port Number - labelZh: 数据库端口号 - required: true - rule: paramPort - type: number - - default: "blinko" - envKey: PANEL_DB_NAME - labelEn: Database - labelZh: 数据库名 - random: true - required: true - rule: paramCommon - type: text - - default: "blinko" - envKey: PANEL_DB_USER - labelEn: User - labelZh: 数据库用户 - random: true - required: true - rule: paramCommon - type: text - - default: "blinko" - envKey: PANEL_DB_USER_PASSWORD - labelEn: Password - labelZh: 数据库用户密码 - random: true - required: true - rule: paramComplexity - type: password diff --git a/apps/blinko/1.0.3/docker-compose.yml b/apps/blinko/1.0.3/docker-compose.yml deleted file mode 100644 index 31094b3c2..000000000 --- a/apps/blinko/1.0.3/docker-compose.yml +++ /dev/null @@ -1,35 +0,0 @@ -services: - blinko: - image: "blinkospace/blinko:1.0.3" - container_name: ${CONTAINER_NAME} - environment: - NODE_ENV: production - NEXTAUTH_URL: ${NEXTAUTH_URL} - NEXT_PUBLIC_BASE_URL: ${NEXT_PUBLIC_BASE_URL} - NEXTAUTH_SECRET: ${NEXTAUTH_SECRET} - DATABASE_URL: postgresql://${PANEL_DB_USER}:${PANEL_DB_USER_PASSWORD}@${PANEL_DB_HOST}:${PANEL_DB_PORT}/${PANEL_DB_NAME} - depends_on: - postgres: - condition: service_healthy - volumes: - - "./data:/app/.blinko" - restart: always - logging: - options: - max-size: "10m" - max-file: "3" - ports: - - "${PANEL_APP_PORT_HTTP}:1111" - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:1111/"] - interval: 30s - timeout: 10s - retries: 5 - start_period: 30s - networks: - - 1panel-network - labels: - createdBy: "Apps" -networks: - 1panel-network: - external: true \ No newline at end of file diff --git a/apps/cup/latest/data.yml b/apps/cup/3.4.0/data.yml similarity index 100% rename from apps/cup/latest/data.yml rename to apps/cup/3.4.0/data.yml diff --git a/apps/cup/latest/docker-compose.yml b/apps/cup/3.4.0/docker-compose.yml similarity index 90% rename from apps/cup/latest/docker-compose.yml rename to apps/cup/3.4.0/docker-compose.yml index a61d331c6..5a4a52065 100644 --- a/apps/cup/latest/docker-compose.yml +++ b/apps/cup/3.4.0/docker-compose.yml @@ -1,6 +1,6 @@ services: cup: - image: ghcr.io/sergi0g/cup:latest + image: ghcr.io/sergi0g/cup:v3.4.0 container_name: ${CONTAINER_NAME} restart: unless-stopped ports: diff --git a/apps/cup/data.yml b/apps/cup/data.yml index 242f50f4b..5f0d26684 100644 --- a/apps/cup/data.yml +++ b/apps/cup/data.yml @@ -2,7 +2,12 @@ name: cup tags: - 实用工具 title: 自动检测 Docker 容器基础镜像的工具 -description: 自动检测 Docker 容器基础镜像的工具 +description: + en: Docker container updates made easy + zh: 自动检测 Docker 容器基础镜像的工具 + architectures: + - amd64 + - arm64 additionalProperties: key: cup name: cup @@ -16,10 +21,4 @@ additionalProperties: recommend: 0 website: https://cup.sergi0g.dev/ github: https://github.com/sergi0g/cup - document: https://cup.sergi0g.dev/docs - description: - en: Docker container updates made easy - zh: 自动检测 Docker 容器基础镜像的工具 - architectures: - - amd64 - - arm64 \ No newline at end of file + document: https://cup.sergi0g.dev/docs \ No newline at end of file diff --git a/apps/deepseek-free-api/latest/data.yml b/apps/deepseek-free-api/0.0.21/data.yml similarity index 100% rename from apps/deepseek-free-api/latest/data.yml rename to apps/deepseek-free-api/0.0.21/data.yml diff --git a/apps/deepseek-free-api/latest/docker-compose.yml b/apps/deepseek-free-api/0.0.21/docker-compose.yml similarity index 88% rename from apps/deepseek-free-api/latest/docker-compose.yml rename to apps/deepseek-free-api/0.0.21/docker-compose.yml index 92a9c1843..2849c0e7a 100644 --- a/apps/deepseek-free-api/latest/docker-compose.yml +++ b/apps/deepseek-free-api/0.0.21/docker-compose.yml @@ -1,6 +1,6 @@ services: deepseek-free-api: - image: vinlic/deepseek-free-api:latest + image: vinlic/deepseek-free-api:0.0.21 container_name: ${CONTAINER_NAME} ports: - ${PANEL_APP_PORT_HTTP}:8000 diff --git a/apps/demo/data.yml b/apps/demo/data.yml.txt similarity index 100% rename from apps/demo/data.yml rename to apps/demo/data.yml.txt diff --git a/apps/easytier/2.3.1/2.0.2/.env.sample b/apps/easytier/2.3.1/2.0.2/.env.sample deleted file mode 100644 index 2ad05e7c7..000000000 --- a/apps/easytier/2.3.1/2.0.2/.env.sample +++ /dev/null @@ -1,6 +0,0 @@ -COMMAND="-i 10.144.144.1 --network-name abc --network-secret abc -p tcp://public.easytier.top:11010" -CONTAINER_NAME="easytier" -DATA_PATH="./data/data" -HOSTNAME="easytier" -PRIVILEGED_MODE="true" -TIME_ZONE="Asia/Shanghai" diff --git a/apps/easytier/2.3.1/2.0.2/data.yml b/apps/easytier/2.3.1/2.0.2/data.yml deleted file mode 100644 index f2d753b69..000000000 --- a/apps/easytier/2.3.1/2.0.2/data.yml +++ /dev/null @@ -1,37 +0,0 @@ -additionalProperties: - formFields: - - default: "./data" - edit: true - envKey: DATA_PATH - labelEn: Data Path - labelZh: 数据路径 - required: true - type: text - - default: "Asia/Shanghai" - edit: true - envKey: TIME_ZONE - labelEn: Time Zone - labelZh: 时区 - required: true - type: text - - default: "true" - disabled: true - envKey: PRIVILEGED_MODE - labelEn: Privilege mode switch - labelZh: 特权模式开关 - required: true - type: text - - default: "easytier" - edit: true - envKey: HOSTNAME - labelEn: Hostname - labelZh: 主机名 - required: true - type: text - - default: "-i --network-name <用户> --network-secret <密码> -e tcp://<服务器地址>:11010 -l <监听地址>" - edit: true - envKey: COMMAND - labelEn: Command (modified as required) - labelZh: 命令 (按需修改) - required: true - type: text diff --git a/apps/easytier/2.3.1/2.0.2/docker-compose.yml b/apps/easytier/2.3.1/2.0.2/docker-compose.yml deleted file mode 100644 index c29de58d9..000000000 --- a/apps/easytier/2.3.1/2.0.2/docker-compose.yml +++ /dev/null @@ -1,15 +0,0 @@ -services: - easytier: - image: "easytier/easytier:v2.3.1" - container_name: ${CONTAINER_NAME} - restart: always - network_mode: host - privileged: ${PRIVILEGED_MODE} - hostname: ${HOSTNAME} - environment: - - TZ=${TIME_ZONE} - volumes: - - ${DATA_PATH}:/root - command: ${COMMAND} - labels: - createdBy: "Apps" diff --git a/apps/easytier/config-latest/.env.sample b/apps/easytier/config-latest/.env.sample deleted file mode 100644 index fbe0f91d0..000000000 --- a/apps/easytier/config-latest/.env.sample +++ /dev/null @@ -1,8 +0,0 @@ -COMMAND="-c /root/config.toml" -CONFIG_FILE_PATH="./data/config.toml" -CONFIG_FILE_PATH_INTERNAL="/root/config.toml" -CONTAINER_NAME="easytier" -DATA_PATH="./data/data" -HOSTNAME="easytier" -PRIVILEGED_MODE="true" -TIME_ZONE="Asia/Shanghai" diff --git a/apps/easytier/config-latest/data.yml b/apps/easytier/config-latest/data.yml deleted file mode 100644 index e4031775c..000000000 --- a/apps/easytier/config-latest/data.yml +++ /dev/null @@ -1,51 +0,0 @@ -additionalProperties: - formFields: - - default: "./data/data" - edit: true - envKey: DATA_PATH - labelEn: Data Path - labelZh: 数据路径 - required: true - type: text - - default: "./data/config.toml" - disabled: true - envKey: CONFIG_FILE_PATH - labelEn: Configuration file path - labelZh: 配置文件路径 - required: true - type: text - - default: "/root/config.toml" - disabled: true - envKey: CONFIG_FILE_PATH_INTERNAL - labelEn: Configuration file path(inside container) - labelZh: 配置文件路径 (容器内部) - required: true - type: text - - default: "Asia/Shanghai" - edit: true - envKey: TIME_ZONE - labelEn: Time Zone - labelZh: 时区 - required: true - type: text - - default: "true" - disabled: true - envKey: PRIVILEGED_MODE - labelEn: Privilege mode switch - labelZh: 特权模式开关 - required: true - type: text - - default: "easytier" - edit: true - envKey: HOSTNAME - labelEn: Hostname - labelZh: 主机名 - required: true - type: text - - default: "-c /root/config.toml" - disabled: true - envKey: COMMAND - labelEn: Command - labelZh: 命令 - required: true - type: text diff --git a/apps/easytier/config-latest/data/config-example.toml b/apps/easytier/config-latest/data/config-example.toml deleted file mode 100644 index 389dbfeb8..000000000 --- a/apps/easytier/config-latest/data/config-example.toml +++ /dev/null @@ -1,68 +0,0 @@ -# 实例名称，用于在同一台机器上标识此 VPN 节点 -instance_name = "" -# 主机名，用于标识此设备的主机名 -hostname = "" -# 实例 ID，一般为 UUID，在同一个 VPN 网络中唯一 -instance_id = "" -# 此 VPN 节点的 IPv4 地址，如果为空，则此节点将仅转发数据包，不会创建 TUN 设备 -ipv4 = "" -# 由 Easytier 自动确定并设置IP地址，默认从10.0.0.1开始。警告：在使用 DHCP 时，如果网络中出现 IP 冲突，IP 将自动更改 -dhcp = false - -# 监听器列表，用于接受连接 -listeners = [ -"tcp://0.0.0.0:11010", -"udp://0.0.0.0:11010", -"wg://0.0.0.0:11011", -"ws://0.0.0.0:11011/", -"wss://0.0.0.0:11012/", -] - -# 退出节点列表 -exit_nodes = [ -] - -# 用于管理的 RPC 门户地址 -rpc_portal = "127.0.0.1:15888" - -[network_identity] -# 网络名称，用于标识 VPN 网络 -network_name = "" -# 网络密钥，用于验证此节点属于 VPN 网络 -network_secret = "" - -# 这里是对等连接节点配置，可以多段配置 -[[peer]] -uri = "" - -[[peer]] -uri = "" - -# 这里是子网代理节点配置，可以有多段配置 -[[proxy_network]] -cidr = "10.0.1.0/24" - -[[proxy_network]] -cidr = "10.0.2.0/24" - -[flags] -# 连接到对等节点使用的默认协议 -default_protocol = "tcp" -# TUN 设备名称，如果为空，则使用默认名称 -dev_name = "" -# 是否启用加密 -enable_encryption = true -# 是否启用 IPv6 支持 -enable_ipv6 = true -# TUN 设备的 MTU -mtu = 1380 -# 延迟优先模式，将尝试使用最低延迟路径转发流量，默认使用最短路径 -latency_first = false -# 将本节点配置为退出节点 -enable_exit_node = false -# 禁用 TUN 设备 -no_tun = false -# 为子网代理启用 smoltcp 堆栈 -use_smoltcp = false -# 仅转发白名单网络的流量，支持通配符字符串。多个网络名称间可以使用英文空格间隔。如果该参数为空，则禁用转发。默认允许所有网络。例如：'*'（所有网络），'def*'（以def为前缀的网络），'net1 net2'（只允许net1和net2） -foreign_network_whitelist = "*" \ No newline at end of file diff --git a/apps/easytier/config-latest/data/config.toml b/apps/easytier/config-latest/data/config.toml deleted file mode 100644 index ed8de6ddc..000000000 --- a/apps/easytier/config-latest/data/config.toml +++ /dev/null @@ -1,17 +0,0 @@ -instance_name = "default" -instance_id = "3d3db819-ad54-4d86-bf9a-faac864478ab" -dhcp = false -listeners = [ - "tcp://0.0.0.0:11010", - "udp://0.0.0.0:11010", - "wg://0.0.0.0:11011", - "ws://0.0.0.0:11011/", - "wss://0.0.0.0:11012/", -] -exit_nodes = [] -peer = [] -rpc_portal = "0.0.0.0:15889" - -[network_identity] -network_name = "default" -network_secret = "" diff --git a/apps/easytier/config-latest/docker-compose.yml b/apps/easytier/config-latest/docker-compose.yml deleted file mode 100644 index acfb4cb51..000000000 --- a/apps/easytier/config-latest/docker-compose.yml +++ /dev/null @@ -1,20 +0,0 @@ -services: - easytier: - image: "easytier/easytier:latest" - container_name: ${CONTAINER_NAME} - restart: always - network_mode: host - privileged: ${PRIVILEGED_MODE} - hostname: ${HOSTNAME} - environment: - - TZ=${TIME_ZONE} - volumes: - - ${DATA_PATH}:/root - - ${CONFIG_FILE_PATH}:${CONFIG_FILE_PATH_INTERNAL} - command: ${COMMAND} - labels: - createdBy: "Apps" - -networks: - 1panel-network: - external: true diff --git a/apps/easytier/latest/.env.sample b/apps/easytier/latest/.env.sample index 2ad05e7c7..fbe0f91d0 100644 --- a/apps/easytier/latest/.env.sample +++ b/apps/easytier/latest/.env.sample @@ -1,4 +1,6 @@ -COMMAND="-i 10.144.144.1 --network-name abc --network-secret abc -p tcp://public.easytier.top:11010" +COMMAND="-c /root/config.toml" +CONFIG_FILE_PATH="./data/config.toml" +CONFIG_FILE_PATH_INTERNAL="/root/config.toml" CONTAINER_NAME="easytier" DATA_PATH="./data/data" HOSTNAME="easytier" diff --git a/apps/easytier/latest/data.yml b/apps/easytier/latest/data.yml index f2d753b69..e4031775c 100644 --- a/apps/easytier/latest/data.yml +++ b/apps/easytier/latest/data.yml @@ -1,12 +1,26 @@ additionalProperties: formFields: - - default: "./data" + - default: "./data/data" edit: true envKey: DATA_PATH labelEn: Data Path labelZh: 数据路径 required: true type: text + - default: "./data/config.toml" + disabled: true + envKey: CONFIG_FILE_PATH + labelEn: Configuration file path + labelZh: 配置文件路径 + required: true + type: text + - default: "/root/config.toml" + disabled: true + envKey: CONFIG_FILE_PATH_INTERNAL + labelEn: Configuration file path(inside container) + labelZh: 配置文件路径 (容器内部) + required: true + type: text - default: "Asia/Shanghai" edit: true envKey: TIME_ZONE @@ -28,10 +42,10 @@ additionalProperties: labelZh: 主机名 required: true type: text - - default: "-i --network-name <用户> --network-secret <密码> -e tcp://<服务器地址>:11010 -l <监听地址>" - edit: true + - default: "-c /root/config.toml" + disabled: true envKey: COMMAND - labelEn: Command (modified as required) - labelZh: 命令 (按需修改) + labelEn: Command + labelZh: 命令 required: true type: text diff --git a/apps/easytier/latest/docker-compose.yml b/apps/easytier/latest/docker-compose.yml index 92c52d2de..acfb4cb51 100644 --- a/apps/easytier/latest/docker-compose.yml +++ b/apps/easytier/latest/docker-compose.yml @@ -10,6 +10,11 @@ services: - TZ=${TIME_ZONE} volumes: - ${DATA_PATH}:/root + - ${CONFIG_FILE_PATH}:${CONFIG_FILE_PATH_INTERNAL} command: ${COMMAND} labels: createdBy: "Apps" + +networks: + 1panel-network: + external: true diff --git a/apps/glm-free-api/latest/data.yml b/apps/glm-free-api/0.0.37/data.yml similarity index 100% rename from apps/glm-free-api/latest/data.yml rename to apps/glm-free-api/0.0.37/data.yml diff --git a/apps/glm-free-api/latest/docker-compose.yml b/apps/glm-free-api/0.0.37/docker-compose.yml similarity index 89% rename from apps/glm-free-api/latest/docker-compose.yml rename to apps/glm-free-api/0.0.37/docker-compose.yml index 957ea2bcd..6f36eac2d 100644 --- a/apps/glm-free-api/latest/docker-compose.yml +++ b/apps/glm-free-api/0.0.37/docker-compose.yml @@ -1,6 +1,6 @@ services: glm-free-api: - image: vinlic/glm-free-api:latest + image: vinlic/glm-free-api:0.0.37 container_name: ${CONTAINER_NAME} ports: - ${PANEL_APP_PORT_HTTP}:8000 diff --git a/apps/hexo/latest/docker-compose.yml b/apps/hexo/latest/docker-compose.yml deleted file mode 100644 index 5d470de88..000000000 --- a/apps/hexo/latest/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -services: - hexo: - container_name: ${CONTAINER_NAME} - restart: always - networks: - - 1panel-network - ports: - - "${PANEL_APP_PORT_HTTP}:4000" - volumes: - - "${DATA_PATH}:/app" - environment: - - PUID=1000 - - PGID=1000 - - TZ=Asia/Shanghai - - GIT_USER=${GIT_USERNAME} - - GIT_EMAIL=${GIT_MAIL} - image: bloodstar/hexo:latest - labels: - createdBy: "Apps" - -networks: - 1panel-network: - external: true diff --git a/apps/hexo/stable-23-07-01/data.yml b/apps/hexo/stable-23-07-01/data.yml deleted file mode 100644 index 77eb60dfd..000000000 --- a/apps/hexo/stable-23-07-01/data.yml +++ /dev/null @@ -1,31 +0,0 @@ -additionalProperties: - formFields: - - default: 40064 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number - - default: ./data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text - - default: "" - edit: true - envKey: GIT_USERNAME - labelEn: Git username - labelZh: Git 用户名 - required: true - type: text - - default: "" - edit: true - envKey: GIT_MAIL - labelEn: Git Email - labelZh: Git 邮箱 - required: true - type: text diff --git a/apps/hexo/latest/.env.sample b/apps/hexo/stable-25-05-01/.env.sample similarity index 100% rename from apps/hexo/latest/.env.sample rename to apps/hexo/stable-25-05-01/.env.sample diff --git a/apps/hexo/latest/data.yml b/apps/hexo/stable-25-05-01/data.yml similarity index 100% rename from apps/hexo/latest/data.yml rename to apps/hexo/stable-25-05-01/data.yml diff --git a/apps/hexo/stable-23-07-01/docker-compose.yml b/apps/hexo/stable-25-05-01/docker-compose.yml similarity index 91% rename from apps/hexo/stable-23-07-01/docker-compose.yml rename to apps/hexo/stable-25-05-01/docker-compose.yml index 53354efa6..a086570fa 100644 --- a/apps/hexo/stable-23-07-01/docker-compose.yml +++ b/apps/hexo/stable-25-05-01/docker-compose.yml @@ -14,7 +14,7 @@ services: - TZ=Asia/Shanghai - GIT_USER=${GIT_USERNAME} - GIT_EMAIL=${GIT_MAIL} - image: bloodstar/hexo:stable-23-07-01 + image: bloodstar/hexo:stable-25-05-01 labels: createdBy: "Apps" diff --git a/apps/hubcmdui/latest/data.yml b/apps/hubcmdui/4.0.7/data.yml similarity index 100% rename from apps/hubcmdui/latest/data.yml rename to apps/hubcmdui/4.0.7/data.yml diff --git a/apps/hubcmdui/latest/docker-compose.yml b/apps/hubcmdui/4.0.7/docker-compose.yml similarity index 91% rename from apps/hubcmdui/latest/docker-compose.yml rename to apps/hubcmdui/4.0.7/docker-compose.yml index feecc7b04..f263422b4 100644 --- a/apps/hubcmdui/latest/docker-compose.yml +++ b/apps/hubcmdui/4.0.7/docker-compose.yml @@ -1,6 +1,6 @@ services: hubcmd-ui: - image: dqzboy/hubcmd-ui:latest + image: dqzboy/hubcmd-ui:4.0.7 container_name: ${CONTAINER_NAME} restart: always ports: diff --git a/apps/jimeng-free-api/latest/data.yml b/apps/jimeng-free-api/0.0.6/data.yml similarity index 100% rename from apps/jimeng-free-api/latest/data.yml rename to apps/jimeng-free-api/0.0.6/data.yml diff --git a/apps/jimeng-free-api/latest/docker-compose.yml b/apps/jimeng-free-api/0.0.6/docker-compose.yml similarity index 88% rename from apps/jimeng-free-api/latest/docker-compose.yml rename to apps/jimeng-free-api/0.0.6/docker-compose.yml index 77017fdb9..ed5ee2a02 100644 --- a/apps/jimeng-free-api/latest/docker-compose.yml +++ b/apps/jimeng-free-api/0.0.6/docker-compose.yml @@ -1,6 +1,6 @@ services: jimeng-free-api: - image: vinlic/jimeng-free-api:latest + image: vinlic/jimeng-free-api:0.0.6 container_name: ${CONTAINER_NAME} ports: - ${PANEL_APP_PORT_HTTP}:8000 diff --git a/apps/kimi-free-api/latest/data.yml b/apps/kimi-free-api/0.0.36/data.yml similarity index 100% rename from apps/kimi-free-api/latest/data.yml rename to apps/kimi-free-api/0.0.36/data.yml diff --git a/apps/kimi-free-api/latest/docker-compose.yml b/apps/kimi-free-api/0.0.36/docker-compose.yml similarity index 89% rename from apps/kimi-free-api/latest/docker-compose.yml rename to apps/kimi-free-api/0.0.36/docker-compose.yml index ce935a98a..cadb277a1 100644 --- a/apps/kimi-free-api/latest/docker-compose.yml +++ b/apps/kimi-free-api/0.0.36/docker-compose.yml @@ -1,6 +1,6 @@ services: kimi-free-api: - image: vinlic/kimi-free-api:latest + image: vinlic/kimi-free-api:0.0.36 container_name: ${CONTAINER_NAME} ports: - ${PANEL_APP_PORT_HTTP}:8000 diff --git a/apps/metaso-free-api/latest/docker-compose.yml b/apps/metaso-free-api/latest/docker-compose.yml index cf4555164..047d3f902 100644 --- a/apps/metaso-free-api/latest/docker-compose.yml +++ b/apps/metaso-free-api/latest/docker-compose.yml @@ -1,6 +1,6 @@ services: metaso-free-api: - image: vinlic/metaso-free-api:latest + image: vinlic/metaso-free-api:0.0.17 container_name: ${CONTAINER_NAME} ports: - ${PANEL_APP_PORT_HTTP}:8000 diff --git a/apps/netdata/2.2.6/.env.sample b/apps/netdata/2.5-host/.env.sample similarity index 100% rename from apps/netdata/2.2.6/.env.sample rename to apps/netdata/2.5-host/.env.sample diff --git a/apps/netdata/2.2.6/data.yml b/apps/netdata/2.5-host/data.yml similarity index 100% rename from apps/netdata/2.2.6/data.yml rename to apps/netdata/2.5-host/data.yml diff --git a/apps/netdata/2.2.6/docker-compose.yml b/apps/netdata/2.5-host/docker-compose.yml similarity index 100% rename from apps/netdata/2.2.6/docker-compose.yml rename to apps/netdata/2.5-host/docker-compose.yml diff --git a/apps/netdata/latest-host/.env.sample b/apps/netdata/latest-host/.env.sample deleted file mode 100644 index 3ba58ad3b..000000000 --- a/apps/netdata/latest-host/.env.sample +++ /dev/null @@ -1,4 +0,0 @@ -CONTAINER_NAME="netdata" -DOCKER_SOCK_PATH="/var/run/docker.sock" -HOSTNAME="netdata" -PANEL_APP_PORT_HTTP=19999 diff --git a/apps/netdata/latest-host/data.yml b/apps/netdata/latest-host/data.yml deleted file mode 100644 index a52a39115..000000000 --- a/apps/netdata/latest-host/data.yml +++ /dev/null @@ -1,24 +0,0 @@ -additionalProperties: - formFields: - - default: "19999" - disabled: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number - - default: "netdata" - edit: true - envKey: HOSTNAME - labelEn: Hostname - labelZh: 主机名 - required: true - type: text - - default: "/var/run/docker.sock" - edit: true - envKey: DOCKER_SOCK_PATH - labelEn: Docker Socket Path - labelZh: Docker 套接字路径 - required: true - type: text diff --git a/apps/netdata/latest-host/docker-compose.yml b/apps/netdata/latest-host/docker-compose.yml deleted file mode 100644 index c68c1b68a..000000000 --- a/apps/netdata/latest-host/docker-compose.yml +++ /dev/null @@ -1,27 +0,0 @@ -services: - netdata: - image: "netdata/netdata:latest" - container_name: ${CONTAINER_NAME} - restart: always - network_mode: host - hostname: ${HOSTNAME} - cap_add: - - SYS_PTRACE - - SYS_ADMIN - security_opt: - - apparmor:unconfined - volumes: - - ./data/netdataconfig:/etc/netdata - - ./data/netdatalib:/var/lib/netdata - - ./data/netdatacache:/var/cache/netdata - - /:/host/root:ro,rslave - - /etc/passwd:/host/etc/passwd:ro - - /etc/group:/host/etc/group:ro - - /etc/localtime:/etc/localtime:ro - - /proc:/host/proc:ro - - /sys:/host/sys:ro - - /etc/os-release:/host/etc/os-release:ro - - /var/log:/host/var/log:ro - - ${DOCKER_SOCK_PATH}:/var/run/docker.sock:ro - labels: - createdBy: "Apps" diff --git a/apps/netdata/latest/.env.sample b/apps/netdata/latest/.env.sample deleted file mode 100644 index e4615defb..000000000 --- a/apps/netdata/latest/.env.sample +++ /dev/null @@ -1,4 +0,0 @@ -CONTAINER_NAME="netdata" -DOCKER_SOCK_PATH="/var/run/docker.sock" -HOSTNAME="netdata" -PANEL_APP_PORT_HTTP=40314 diff --git a/apps/netdata/latest/data.yml b/apps/netdata/latest/data.yml deleted file mode 100644 index 8cffaa342..000000000 --- a/apps/netdata/latest/data.yml +++ /dev/null @@ -1,24 +0,0 @@ -additionalProperties: - formFields: - - default: "40314" - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number - - default: "netdata" - edit: true - envKey: HOSTNAME - labelEn: Hostname - labelZh: 主机名 - required: true - type: text - - default: "/var/run/docker.sock" - edit: true - envKey: DOCKER_SOCK_PATH - labelEn: Docker Socket Path - labelZh: Docker 套接字路径 - required: true - type: text diff --git a/apps/netdata/latest/docker-compose.yml b/apps/netdata/latest/docker-compose.yml deleted file mode 100644 index 7ed3d878c..000000000 --- a/apps/netdata/latest/docker-compose.yml +++ /dev/null @@ -1,34 +0,0 @@ -services: - netdata: - image: "netdata/netdata:latest" - container_name: ${CONTAINER_NAME} - restart: always - networks: - - 1panel-network - ports: - - "${PANEL_APP_PORT_HTTP}:19999" - hostname: ${HOSTNAME} - cap_add: - - SYS_PTRACE - - SYS_ADMIN - security_opt: - - apparmor:unconfined - volumes: - - ./data/netdataconfig:/etc/netdata - - ./data/netdatalib:/var/lib/netdata - - ./data/netdatacache:/var/cache/netdata - - /:/host/root:ro,rslave - - /etc/passwd:/host/etc/passwd:ro - - /etc/group:/host/etc/group:ro - - /etc/localtime:/etc/localtime:ro - - /proc:/host/proc:ro - - /sys:/host/sys:ro - - /etc/os-release:/host/etc/os-release:ro - - /var/log:/host/var/log:ro - - ${DOCKER_SOCK_PATH}:/var/run/docker.sock:ro - labels: - createdBy: "Apps" - -networks: - 1panel-network: - external: true diff --git a/apps/next-terminal/2.4.10/.env.sample b/apps/next-terminal/2.4.10/.env.sample deleted file mode 100644 index fb20450ac..000000000 --- a/apps/next-terminal/2.4.10/.env.sample +++ /dev/null @@ -1,6 +0,0 @@ -CONTAINER_NAME="next-terminal" -PANEL_APP_PORT_HTTP="40058" -PANEL_APP_PORT_SSH="40059" -DATA_PATH="./data" -SSHD_SWITCH="false" -SSH_KEY_PATH="./ssh/id_rsa" \ No newline at end of file diff --git a/apps/next-terminal/2.4.10/config.yaml b/apps/next-terminal/2.4.10/config.yaml deleted file mode 100755 index 29f487fa8..000000000 --- a/apps/next-terminal/2.4.10/config.yaml +++ /dev/null @@ -1,31 +0,0 @@ -database: - enabled: true - type: postgres - postgres: - hostname: postgresql - port: 5432 - username: next-terminal - password: next-terminal - database: next-terminal -log: - level: debug - filename: ./logs/nt.log - -server: - addr: "0.0.0.0:8088" - tls: - enabled: false - auto: false - cert: "" - key: "" - -app: - recording: - type: "local" - path: "/usr/local/next-terminal/data/recordings" - guacd: - drive: "/usr/local/next-terminal/data/drive" - hosts: - - hostname: guacd - port: 4822 - weight: 1 \ No newline at end of file diff --git a/apps/next-terminal/2.4.10/data.yml b/apps/next-terminal/2.4.10/data.yml deleted file mode 100644 index 83e0fa6e9..000000000 --- a/apps/next-terminal/2.4.10/data.yml +++ /dev/null @@ -1,41 +0,0 @@ -additionalProperties: - formFields: - - default: 40058 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number - - default: 40059 - edit: true - envKey: PANEL_APP_PORT_SSH - labelEn: SSH Server Port - labelZh: SSH Server 端口 (可选) - required: false - rule: paramPort - type: number - - default: 40060 - edit: true - envKey: PANEL_APP_PORT_PROXY_HTTP - labelEn: Proxy HTTP Port - labelZh: 资产反代 HTTP 端口 (可选) - required: false - rule: paramPort - type: number - - default: 40061 - edit: true - envKey: PANEL_APP_PORT_PROXY_HTTPS - labelEn: Proxy HTTPS Port - labelZh: 资产反代 HTTPS 端口 (申请证书必需) - required: false - rule: paramPort - type: number - - default: ./data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text diff --git a/apps/next-terminal/2.4.10/docker-compose.yml b/apps/next-terminal/2.4.10/docker-compose.yml deleted file mode 100644 index d352e09b7..000000000 --- a/apps/next-terminal/2.4.10/docker-compose.yml +++ /dev/null @@ -1,53 +0,0 @@ -services: - next-terminal: - image: dushixiang/next-terminal:v2.4.10 - container_name: ${CONTAINER_NAME} - restart: always - networks: - - 1panel-network - ports: - - "${PANEL_APP_PORT_HTTP}:8088" - - "${PANEL_APP_PORT_SSH}:2022" - - "${PANEL_APP_PORT_PROXY_HTTP}:80" - - "${PANEL_APP_PORT_PROXY_HTTPS}:443" - volumes: - - "/etc/localtime:/etc/localtime" - - "${DATA_PATH}:/usr/local/next-terminal/data" - - ./logs:/usr/local/next-terminal/logs - - ./config.yaml:/etc/next-terminal/config.yaml - depends_on: - - postgresql - - guacd - - labels: - createdBy: "Apps" - postgresql: - container_name: postgresql-${CONTAINER_NAME} - image: registry.cn-beijing.aliyuncs.com/dushixiang/postgres:16.4 - networks: - - 1panel-network - environment: - POSTGRES_DB: next-terminal - POSTGRES_USER: next-terminal - POSTGRES_PASSWORD: next-terminal - volumes: - - ./data/postgresql:/var/lib/postgresql/data - restart: always - - guacd: - container_name: guacd-${CONTAINER_NAME} - image: dushixiang/guacd:1.5.5 - restart: always - networks: - - 1panel-network - volumes: - - "${DATA_PATH}:/usr/local/next-terminal/data" - - environment: - - GUACD_LOG_LEVEL=debug - labels: - createdBy: "Apps" - -networks: - 1panel-network: - external: true \ No newline at end of file diff --git a/apps/next-terminal/2.4.10/ssh/id_rsa b/apps/next-terminal/2.4.10/ssh/id_rsa deleted file mode 100644 index fe7575508..000000000 --- a/apps/next-terminal/2.4.10/ssh/id_rsa +++ /dev/null @@ -1,49 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -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 ------END OPENSSH PRIVATE KEY----- diff --git a/apps/next-terminal/latest/.env.sample b/apps/next-terminal/latest/.env.sample deleted file mode 100644 index fb20450ac..000000000 --- a/apps/next-terminal/latest/.env.sample +++ /dev/null @@ -1,6 +0,0 @@ -CONTAINER_NAME="next-terminal" -PANEL_APP_PORT_HTTP="40058" -PANEL_APP_PORT_SSH="40059" -DATA_PATH="./data" -SSHD_SWITCH="false" -SSH_KEY_PATH="./ssh/id_rsa" \ No newline at end of file diff --git a/apps/next-terminal/latest/data.yml b/apps/next-terminal/latest/data.yml deleted file mode 100644 index e980ca411..000000000 --- a/apps/next-terminal/latest/data.yml +++ /dev/null @@ -1,39 +0,0 @@ -additionalProperties: - formFields: - - default: 40058 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number - - default: 40059 - edit: true - envKey: PANEL_APP_PORT_SSH - labelEn: SSH Port - labelZh: SSH端口 - required: false - rule: paramPort - type: number - - default: ./data - edit: true - envKey: DATA_PATH - labelEn: Data folder path - labelZh: 数据文件夹路径 - required: true - type: text - - default: "false" - edit: true - envKey: SSHD_SWITCH - labelEn: Enable SSH (true or false) - labelZh: 启用SSH(true/false) - required: true - type: text - - default: ./ssh/id_rsa - edit: true - envKey: SSH_KEY_PATH - labelEn: SSH key file(/root/.ssh/id_rsa) - labelZh: SSH 私钥文件(/root/.ssh/id_rsa) - required: true - type: text diff --git a/apps/next-terminal/latest/docker-compose.yml b/apps/next-terminal/latest/docker-compose.yml deleted file mode 100644 index b2f957f9f..000000000 --- a/apps/next-terminal/latest/docker-compose.yml +++ /dev/null @@ -1,36 +0,0 @@ -services: - nt-guacd: - container_name: ${CONTAINER_NAME}-guacd - restart: always - networks: - - 1panel-network - volumes: - - "${DATA_PATH}:/usr/local/next-terminal/data" - image: dushixiang/guacd:latest - labels: - createdBy: "Apps" - - next-terminal: - container_name: ${CONTAINER_NAME} - restart: always - networks: - - 1panel-network - ports: - - "${PANEL_APP_PORT_HTTP}:8088" - - "${PANEL_APP_PORT_SSH}:8089" - volumes: - - "${DATA_PATH}:/usr/local/next-terminal/data" - - "/etc/localtime:/etc/localtime" - - "${SSH_KEY_PATH}:/root/.ssh/id_rsa" - environment: - DB: sqlite - GUACD_HOSTNAME: nt-guacd - GUACD_PORT: 4822 - SSHD_ENABLE: ${SSHD_SWITCH} - image: dushixiang/next-terminal:latest - labels: - createdBy: "Apps" - -networks: - 1panel-network: - external: true \ No newline at end of file diff --git a/apps/next-terminal/latest/ssh/id_rsa b/apps/next-terminal/latest/ssh/id_rsa deleted file mode 100644 index fe7575508..000000000 --- a/apps/next-terminal/latest/ssh/id_rsa +++ /dev/null @@ -1,49 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -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 ------END OPENSSH PRIVATE KEY----- diff --git a/apps/npc/0.27.01/.env.sample b/apps/npc/0.27.01-yisier1/.env.sample similarity index 100% rename from apps/npc/0.27.01/.env.sample rename to apps/npc/0.27.01-yisier1/.env.sample diff --git a/apps/npc/0.27.01/data.yml b/apps/npc/0.27.01-yisier1/data.yml similarity index 100% rename from apps/npc/0.27.01/data.yml rename to apps/npc/0.27.01-yisier1/data.yml diff --git a/apps/npc/0.27.01/docker-compose.yml b/apps/npc/0.27.01-yisier1/docker-compose.yml similarity index 100% rename from apps/npc/0.27.01/docker-compose.yml rename to apps/npc/0.27.01-yisier1/docker-compose.yml diff --git a/apps/npc/0.29.21/.env.sample b/apps/npc/0.29.21-duan2001/.env.sample similarity index 100% rename from apps/npc/0.29.21/.env.sample rename to apps/npc/0.29.21-duan2001/.env.sample diff --git a/apps/npc/0.29.21/data.yml b/apps/npc/0.29.21-duan2001/data.yml similarity index 100% rename from apps/npc/0.29.21/data.yml rename to apps/npc/0.29.21-duan2001/data.yml diff --git a/apps/npc/0.29.21/docker-compose.yml b/apps/npc/0.29.21-duan2001/docker-compose.yml similarity index 100% rename from apps/npc/0.29.21/docker-compose.yml rename to apps/npc/0.29.21-duan2001/docker-compose.yml diff --git a/apps/npc/data.yml b/apps/npc/data.yml index e07ab63a8..80ad8b6fd 100644 --- a/apps/npc/data.yml +++ b/apps/npc/data.yml @@ -15,5 +15,5 @@ additionalProperties: limit: 1 recommend: 0 website: https://ehang-io.github.io/nps - github: https://github.com/yisier/nps - document: https://ehang-io.github.io/nps + github: https://github.com/ehang-io/nps + document: https://ehang-io.github.io/nps/#/?id=nps diff --git a/apps/npc/latest/.env.sample b/apps/npc/latest/.env.sample deleted file mode 100644 index 0db841035..000000000 --- a/apps/npc/latest/.env.sample +++ /dev/null @@ -1,4 +0,0 @@ -CONTAINER_NAME="npc" -NPS_SERVER_ADDR="1.2.3.4:8025" -NPS_VKEY="xly7traGe3r0t6UWltristuh1" -TLS_ENABLE_SWITCH="true" diff --git a/apps/npc/latest/data.yml b/apps/npc/latest/data.yml deleted file mode 100644 index 465e731c2..000000000 --- a/apps/npc/latest/data.yml +++ /dev/null @@ -1,28 +0,0 @@ -additionalProperties: - formFields: - - default: 1.2.3.4:8025 - edit: true - envKey: NPS_SERVER_ADDR - labelEn: NPS server address - labelZh: NPS 服务端地址 - required: true - type: text - - default: "xly7traGe3r0t6UWltristuh1" - edit: true - envKey: NPS_VKEY - labelEn: Client connection key displayed by the server - labelZh: 服务端显示的客户端连接密钥 - required: true - rule: paramCommon - type: text - - default: "true" - envKey: TLS_ENABLE_SWITCH - labelEn: Whether TLS is enabled for server-client communication - labelZh: 服务端与客户端的通信是否启用 TLS - required: true - type: select - values: - - label: "True" - value: "true" - - label: "False" - value: "false" diff --git a/apps/npc/latest/docker-compose.yml b/apps/npc/latest/docker-compose.yml deleted file mode 100644 index f0fce9d73..000000000 --- a/apps/npc/latest/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -services: - npc: - image: yisier1/npc:latest - restart: always - network_mode: "host" - command: -server=${NPS_SERVER_ADDR} -vkey=${NPS_VKEY} -tls_enable=${TLS_ENABLE_SWITCH} - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" diff --git a/apps/nps/0.27.01/.env.sample b/apps/nps/0.27.01-host-yisier1/.env.sample similarity index 100% rename from apps/nps/0.27.01/.env.sample rename to apps/nps/0.27.01-host-yisier1/.env.sample diff --git a/apps/nps/0.27.01/conf/clients.json b/apps/nps/0.27.01-host-yisier1/conf/clients.json similarity index 100% rename from apps/nps/0.27.01/conf/clients.json rename to apps/nps/0.27.01-host-yisier1/conf/clients.json diff --git a/apps/nps/0.27.01/conf/hosts.json b/apps/nps/0.27.01-host-yisier1/conf/hosts.json similarity index 100% rename from apps/nps/0.27.01/conf/hosts.json rename to apps/nps/0.27.01-host-yisier1/conf/hosts.json diff --git a/apps/nps/0.27.01/conf/multi_account.conf b/apps/nps/0.27.01-host-yisier1/conf/multi_account.conf similarity index 100% rename from apps/nps/0.27.01/conf/multi_account.conf rename to apps/nps/0.27.01-host-yisier1/conf/multi_account.conf diff --git a/apps/nps/0.27.01/conf/nps.conf b/apps/nps/0.27.01-host-yisier1/conf/nps.conf similarity index 100% rename from apps/nps/0.27.01/conf/nps.conf rename to apps/nps/0.27.01-host-yisier1/conf/nps.conf diff --git a/apps/nps/0.27.01/conf/server.key b/apps/nps/0.27.01-host-yisier1/conf/server.key similarity index 100% rename from apps/nps/0.27.01/conf/server.key rename to apps/nps/0.27.01-host-yisier1/conf/server.key diff --git a/apps/nps/0.27.01/conf/server.pem b/apps/nps/0.27.01-host-yisier1/conf/server.pem similarity index 100% rename from apps/nps/0.27.01/conf/server.pem rename to apps/nps/0.27.01-host-yisier1/conf/server.pem diff --git a/apps/nps/0.27.01/conf/tasks.json b/apps/nps/0.27.01-host-yisier1/conf/tasks.json similarity index 100% rename from apps/nps/0.27.01/conf/tasks.json rename to apps/nps/0.27.01-host-yisier1/conf/tasks.json diff --git a/apps/nps/0.27.01/data.yml b/apps/nps/0.27.01-host-yisier1/data.yml similarity index 100% rename from apps/nps/0.27.01/data.yml rename to apps/nps/0.27.01-host-yisier1/data.yml diff --git a/apps/nps/0.27.01/docker-compose.yml b/apps/nps/0.27.01-host-yisier1/docker-compose.yml similarity index 100% rename from apps/nps/0.27.01/docker-compose.yml rename to apps/nps/0.27.01-host-yisier1/docker-compose.yml diff --git a/apps/nps/0.29.21/.env.sample b/apps/nps/0.27.01-yisier1/.env.sample similarity index 100% rename from apps/nps/0.29.21/.env.sample rename to apps/nps/0.27.01-yisier1/.env.sample diff --git a/apps/nps/bridge-latest/conf/clients.json b/apps/nps/0.27.01-yisier1/conf/clients.json similarity index 100% rename from apps/nps/bridge-latest/conf/clients.json rename to apps/nps/0.27.01-yisier1/conf/clients.json diff --git a/apps/nps/bridge-latest/conf/hosts.json b/apps/nps/0.27.01-yisier1/conf/hosts.json similarity index 100% rename from apps/nps/bridge-latest/conf/hosts.json rename to apps/nps/0.27.01-yisier1/conf/hosts.json diff --git a/apps/nps/bridge-latest/conf/multi_account.conf b/apps/nps/0.27.01-yisier1/conf/multi_account.conf similarity index 100% rename from apps/nps/bridge-latest/conf/multi_account.conf rename to apps/nps/0.27.01-yisier1/conf/multi_account.conf diff --git a/apps/nps/bridge-latest/conf/nps.conf b/apps/nps/0.27.01-yisier1/conf/nps.conf similarity index 100% rename from apps/nps/bridge-latest/conf/nps.conf rename to apps/nps/0.27.01-yisier1/conf/nps.conf diff --git a/apps/nps/bridge-latest/conf/server.key b/apps/nps/0.27.01-yisier1/conf/server.key similarity index 100% rename from apps/nps/bridge-latest/conf/server.key rename to apps/nps/0.27.01-yisier1/conf/server.key diff --git a/apps/nps/bridge-latest/conf/server.pem b/apps/nps/0.27.01-yisier1/conf/server.pem similarity index 100% rename from apps/nps/bridge-latest/conf/server.pem rename to apps/nps/0.27.01-yisier1/conf/server.pem diff --git a/apps/nps/bridge-latest/conf/tasks.json b/apps/nps/0.27.01-yisier1/conf/tasks.json similarity index 100% rename from apps/nps/bridge-latest/conf/tasks.json rename to apps/nps/0.27.01-yisier1/conf/tasks.json diff --git a/apps/nps/bridge-latest/data.yml b/apps/nps/0.27.01-yisier1/data.yml similarity index 100% rename from apps/nps/bridge-latest/data.yml rename to apps/nps/0.27.01-yisier1/data.yml diff --git a/apps/nps/bridge-latest/docker-compose.yml b/apps/nps/0.27.01-yisier1/docker-compose.yml similarity index 96% rename from apps/nps/bridge-latest/docker-compose.yml rename to apps/nps/0.27.01-yisier1/docker-compose.yml index ae2be7ab6..26c1c1540 100644 --- a/apps/nps/bridge-latest/docker-compose.yml +++ b/apps/nps/0.27.01-yisier1/docker-compose.yml @@ -1,6 +1,6 @@ services: nps: - image: yisier1/nps:latest + image: yisier1/nps:v0.27.01 container_name: ${CONTAINER_NAME} ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} diff --git a/apps/nps/bridge-latest/.env.sample b/apps/nps/0.29.21-duan2001/.env.sample similarity index 100% rename from apps/nps/bridge-latest/.env.sample rename to apps/nps/0.29.21-duan2001/.env.sample diff --git a/apps/nps/0.29.21/conf/nps.conf b/apps/nps/0.29.21-duan2001/conf/nps.conf similarity index 100% rename from apps/nps/0.29.21/conf/nps.conf rename to apps/nps/0.29.21-duan2001/conf/nps.conf diff --git a/apps/nps/0.29.21/data.yml b/apps/nps/0.29.21-duan2001/data.yml similarity index 100% rename from apps/nps/0.29.21/data.yml rename to apps/nps/0.29.21-duan2001/data.yml diff --git a/apps/nps/0.29.21/docker-compose.yml b/apps/nps/0.29.21-duan2001/docker-compose.yml similarity index 100% rename from apps/nps/0.29.21/docker-compose.yml rename to apps/nps/0.29.21-duan2001/docker-compose.yml diff --git a/apps/nps/0.29.21/web/static/css/bootstrap-select.min.css b/apps/nps/0.29.21-duan2001/web/static/css/bootstrap-select.min.css old mode 100755 new mode 100644 similarity index 100% rename from apps/nps/0.29.21/web/static/css/bootstrap-select.min.css rename to apps/nps/0.29.21-duan2001/web/static/css/bootstrap-select.min.css diff --git a/apps/nps/0.29.21/web/static/css/bootstrap-table.min.css b/apps/nps/0.29.21-duan2001/web/static/css/bootstrap-table.min.css old mode 100755 new mode 100644 similarity index 100% rename from apps/nps/0.29.21/web/static/css/bootstrap-table.min.css rename to apps/nps/0.29.21-duan2001/web/static/css/bootstrap-table.min.css diff --git a/apps/nps/0.29.21/web/static/css/bootstrap.min.css b/apps/nps/0.29.21-duan2001/web/static/css/bootstrap.min.css similarity index 100% rename from apps/nps/0.29.21/web/static/css/bootstrap.min.css rename to apps/nps/0.29.21-duan2001/web/static/css/bootstrap.min.css diff --git a/apps/nps/0.29.21/web/static/css/datatables.css b/apps/nps/0.29.21-duan2001/web/static/css/datatables.css similarity index 100% rename from apps/nps/0.29.21/web/static/css/datatables.css rename to apps/nps/0.29.21-duan2001/web/static/css/datatables.css diff --git a/apps/nps/0.29.21/web/static/css/fontawesome.min.css b/apps/nps/0.29.21-duan2001/web/static/css/fontawesome.min.css similarity index 100% rename from apps/nps/0.29.21/web/static/css/fontawesome.min.css rename to apps/nps/0.29.21-duan2001/web/static/css/fontawesome.min.css diff --git a/apps/nps/0.29.21/web/static/css/regular.min.css b/apps/nps/0.29.21-duan2001/web/static/css/regular.min.css similarity index 100% rename from apps/nps/0.29.21/web/static/css/regular.min.css rename to apps/nps/0.29.21-duan2001/web/static/css/regular.min.css diff --git a/apps/nps/0.29.21/web/static/css/solid.min.css b/apps/nps/0.29.21-duan2001/web/static/css/solid.min.css similarity index 100% rename from apps/nps/0.29.21/web/static/css/solid.min.css rename to apps/nps/0.29.21-duan2001/web/static/css/solid.min.css diff --git a/apps/nps/0.29.21/web/static/css/style.css b/apps/nps/0.29.21-duan2001/web/static/css/style.css old mode 100755 new mode 100644 similarity index 100% rename from apps/nps/0.29.21/web/static/css/style.css rename to apps/nps/0.29.21-duan2001/web/static/css/style.css diff --git a/apps/nps/0.29.21/web/static/img/flag/en-US.png b/apps/nps/0.29.21-duan2001/web/static/img/flag/en-US.png similarity index 100% rename from apps/nps/0.29.21/web/static/img/flag/en-US.png rename to apps/nps/0.29.21-duan2001/web/static/img/flag/en-US.png diff --git a/apps/nps/0.29.21/web/static/img/flag/zh-CN.png b/apps/nps/0.29.21-duan2001/web/static/img/flag/zh-CN.png similarity index 100% rename from apps/nps/0.29.21/web/static/img/flag/zh-CN.png rename to apps/nps/0.29.21-duan2001/web/static/img/flag/zh-CN.png diff --git a/apps/nps/0.29.21/web/static/img/nps.svg b/apps/nps/0.29.21-duan2001/web/static/img/nps.svg similarity index 100% rename from apps/nps/0.29.21/web/static/img/nps.svg rename to apps/nps/0.29.21-duan2001/web/static/img/nps.svg diff --git a/apps/nps/0.29.21/web/static/js/bootstrap-select.min.js b/apps/nps/0.29.21-duan2001/web/static/js/bootstrap-select.min.js similarity index 100% rename from apps/nps/0.29.21/web/static/js/bootstrap-select.min.js rename to apps/nps/0.29.21-duan2001/web/static/js/bootstrap-select.min.js diff --git a/apps/nps/0.29.21/web/static/js/bootstrap-table-cookie.min.js b/apps/nps/0.29.21-duan2001/web/static/js/bootstrap-table-cookie.min.js similarity index 100% rename from apps/nps/0.29.21/web/static/js/bootstrap-table-cookie.min.js rename to apps/nps/0.29.21-duan2001/web/static/js/bootstrap-table-cookie.min.js diff --git a/apps/nps/0.29.21/web/static/js/bootstrap-table-locale-all.min.js b/apps/nps/0.29.21-duan2001/web/static/js/bootstrap-table-locale-all.min.js old mode 100755 new mode 100644 similarity index 100% rename from apps/nps/0.29.21/web/static/js/bootstrap-table-locale-all.min.js rename to apps/nps/0.29.21-duan2001/web/static/js/bootstrap-table-locale-all.min.js diff --git a/apps/nps/0.29.21/web/static/js/bootstrap-table.min.js b/apps/nps/0.29.21-duan2001/web/static/js/bootstrap-table.min.js old mode 100755 new mode 100644 similarity index 100% rename from apps/nps/0.29.21/web/static/js/bootstrap-table.min.js rename to apps/nps/0.29.21-duan2001/web/static/js/bootstrap-table.min.js diff --git a/apps/nps/0.29.21/web/static/js/bootstrap.min.js b/apps/nps/0.29.21-duan2001/web/static/js/bootstrap.min.js similarity index 100% rename from apps/nps/0.29.21/web/static/js/bootstrap.min.js rename to apps/nps/0.29.21-duan2001/web/static/js/bootstrap.min.js diff --git a/apps/nps/0.29.21/web/static/js/echarts.min.js b/apps/nps/0.29.21-duan2001/web/static/js/echarts.min.js old mode 100755 new mode 100644 similarity index 100% rename from apps/nps/0.29.21/web/static/js/echarts.min.js rename to apps/nps/0.29.21-duan2001/web/static/js/echarts.min.js diff --git a/apps/nps/0.29.21/web/static/js/fontawesome.min.js b/apps/nps/0.29.21-duan2001/web/static/js/fontawesome.min.js old mode 100755 new mode 100644 similarity index 100% rename from apps/nps/0.29.21/web/static/js/fontawesome.min.js rename to apps/nps/0.29.21-duan2001/web/static/js/fontawesome.min.js diff --git a/apps/nps/0.29.21/web/static/js/inspinia.js b/apps/nps/0.29.21-duan2001/web/static/js/inspinia.js similarity index 100% rename from apps/nps/0.29.21/web/static/js/inspinia.js rename to apps/nps/0.29.21-duan2001/web/static/js/inspinia.js diff --git a/apps/nps/0.29.21/web/static/js/jquery-3.7.1.min.js b/apps/nps/0.29.21-duan2001/web/static/js/jquery-3.7.1.min.js similarity index 100% rename from apps/nps/0.29.21/web/static/js/jquery-3.7.1.min.js rename to apps/nps/0.29.21-duan2001/web/static/js/jquery-3.7.1.min.js diff --git a/apps/nps/0.29.21/web/static/js/jsencrypt.min.js b/apps/nps/0.29.21-duan2001/web/static/js/jsencrypt.min.js similarity index 100% rename from apps/nps/0.29.21/web/static/js/jsencrypt.min.js rename to apps/nps/0.29.21-duan2001/web/static/js/jsencrypt.min.js diff --git a/apps/nps/0.29.21/web/static/js/language.js b/apps/nps/0.29.21-duan2001/web/static/js/language.js similarity index 100% rename from apps/nps/0.29.21/web/static/js/language.js rename to apps/nps/0.29.21-duan2001/web/static/js/language.js diff --git a/apps/nps/0.29.21/web/static/js/popper.min.js b/apps/nps/0.29.21-duan2001/web/static/js/popper.min.js old mode 100755 new mode 100644 similarity index 100% rename from apps/nps/0.29.21/web/static/js/popper.min.js rename to apps/nps/0.29.21-duan2001/web/static/js/popper.min.js diff --git a/apps/nps/0.29.21/web/static/page/error.html b/apps/nps/0.29.21-duan2001/web/static/page/error.html similarity index 100% rename from apps/nps/0.29.21/web/static/page/error.html rename to apps/nps/0.29.21-duan2001/web/static/page/error.html diff --git a/apps/nps/0.29.21/web/static/page/languages.xml b/apps/nps/0.29.21-duan2001/web/static/page/languages.xml similarity index 100% rename from apps/nps/0.29.21/web/static/page/languages.xml rename to apps/nps/0.29.21-duan2001/web/static/page/languages.xml diff --git a/apps/nps/0.29.21/web/static/webfonts/SourceCodePro.otf b/apps/nps/0.29.21-duan2001/web/static/webfonts/SourceCodePro.otf similarity index 100% rename from apps/nps/0.29.21/web/static/webfonts/SourceCodePro.otf rename to apps/nps/0.29.21-duan2001/web/static/webfonts/SourceCodePro.otf diff --git a/apps/nps/0.29.21/web/static/webfonts/fa-solid-900.eot b/apps/nps/0.29.21-duan2001/web/static/webfonts/fa-solid-900.eot similarity index 100% rename from apps/nps/0.29.21/web/static/webfonts/fa-solid-900.eot rename to apps/nps/0.29.21-duan2001/web/static/webfonts/fa-solid-900.eot diff --git a/apps/nps/0.29.21/web/static/webfonts/fa-solid-900.svg b/apps/nps/0.29.21-duan2001/web/static/webfonts/fa-solid-900.svg old mode 100755 new mode 100644 similarity index 100% rename from apps/nps/0.29.21/web/static/webfonts/fa-solid-900.svg rename to apps/nps/0.29.21-duan2001/web/static/webfonts/fa-solid-900.svg diff --git a/apps/nps/0.29.21/web/static/webfonts/fa-solid-900.ttf b/apps/nps/0.29.21-duan2001/web/static/webfonts/fa-solid-900.ttf similarity index 100% rename from apps/nps/0.29.21/web/static/webfonts/fa-solid-900.ttf rename to apps/nps/0.29.21-duan2001/web/static/webfonts/fa-solid-900.ttf diff --git a/apps/nps/0.29.21/web/static/webfonts/fa-solid-900.woff b/apps/nps/0.29.21-duan2001/web/static/webfonts/fa-solid-900.woff similarity index 100% rename from apps/nps/0.29.21/web/static/webfonts/fa-solid-900.woff rename to apps/nps/0.29.21-duan2001/web/static/webfonts/fa-solid-900.woff diff --git a/apps/nps/0.29.21/web/static/webfonts/fa-solid-900.woff2 b/apps/nps/0.29.21-duan2001/web/static/webfonts/fa-solid-900.woff2 similarity index 100% rename from apps/nps/0.29.21/web/static/webfonts/fa-solid-900.woff2 rename to apps/nps/0.29.21-duan2001/web/static/webfonts/fa-solid-900.woff2 diff --git a/apps/nps/0.29.21/web/static/webfonts/glyphicons-halflings-regular.eot b/apps/nps/0.29.21-duan2001/web/static/webfonts/glyphicons-halflings-regular.eot similarity index 100% rename from apps/nps/0.29.21/web/static/webfonts/glyphicons-halflings-regular.eot rename to apps/nps/0.29.21-duan2001/web/static/webfonts/glyphicons-halflings-regular.eot diff --git a/apps/nps/0.29.21/web/static/webfonts/glyphicons-halflings-regular.svg b/apps/nps/0.29.21-duan2001/web/static/webfonts/glyphicons-halflings-regular.svg similarity index 100% rename from apps/nps/0.29.21/web/static/webfonts/glyphicons-halflings-regular.svg rename to apps/nps/0.29.21-duan2001/web/static/webfonts/glyphicons-halflings-regular.svg diff --git a/apps/nps/0.29.21/web/static/webfonts/glyphicons-halflings-regular.ttf b/apps/nps/0.29.21-duan2001/web/static/webfonts/glyphicons-halflings-regular.ttf similarity index 100% rename from apps/nps/0.29.21/web/static/webfonts/glyphicons-halflings-regular.ttf rename to apps/nps/0.29.21-duan2001/web/static/webfonts/glyphicons-halflings-regular.ttf diff --git a/apps/nps/0.29.21/web/static/webfonts/glyphicons-halflings-regular.woff b/apps/nps/0.29.21-duan2001/web/static/webfonts/glyphicons-halflings-regular.woff similarity index 100% rename from apps/nps/0.29.21/web/static/webfonts/glyphicons-halflings-regular.woff rename to apps/nps/0.29.21-duan2001/web/static/webfonts/glyphicons-halflings-regular.woff diff --git a/apps/nps/0.29.21/web/static/webfonts/glyphicons-halflings-regular.woff2 b/apps/nps/0.29.21-duan2001/web/static/webfonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from apps/nps/0.29.21/web/static/webfonts/glyphicons-halflings-regular.woff2 rename to apps/nps/0.29.21-duan2001/web/static/webfonts/glyphicons-halflings-regular.woff2 diff --git a/apps/nps/0.29.21/web/views/client/add.html b/apps/nps/0.29.21-duan2001/web/views/client/add.html similarity index 100% rename from apps/nps/0.29.21/web/views/client/add.html rename to apps/nps/0.29.21-duan2001/web/views/client/add.html diff --git a/apps/nps/0.29.21/web/views/client/edit.html b/apps/nps/0.29.21-duan2001/web/views/client/edit.html similarity index 100% rename from apps/nps/0.29.21/web/views/client/edit.html rename to apps/nps/0.29.21-duan2001/web/views/client/edit.html diff --git a/apps/nps/0.29.21/web/views/client/list.html b/apps/nps/0.29.21-duan2001/web/views/client/list.html similarity index 100% rename from apps/nps/0.29.21/web/views/client/list.html rename to apps/nps/0.29.21-duan2001/web/views/client/list.html diff --git a/apps/nps/0.29.21/web/views/global/index.html b/apps/nps/0.29.21-duan2001/web/views/global/index.html similarity index 100% rename from apps/nps/0.29.21/web/views/global/index.html rename to apps/nps/0.29.21-duan2001/web/views/global/index.html diff --git a/apps/nps/0.29.21/web/views/index/add.html b/apps/nps/0.29.21-duan2001/web/views/index/add.html similarity index 100% rename from apps/nps/0.29.21/web/views/index/add.html rename to apps/nps/0.29.21-duan2001/web/views/index/add.html diff --git a/apps/nps/0.29.21/web/views/index/edit.html b/apps/nps/0.29.21-duan2001/web/views/index/edit.html similarity index 100% rename from apps/nps/0.29.21/web/views/index/edit.html rename to apps/nps/0.29.21-duan2001/web/views/index/edit.html diff --git a/apps/nps/0.29.21/web/views/index/hadd.html b/apps/nps/0.29.21-duan2001/web/views/index/hadd.html similarity index 100% rename from apps/nps/0.29.21/web/views/index/hadd.html rename to apps/nps/0.29.21-duan2001/web/views/index/hadd.html diff --git a/apps/nps/0.29.21/web/views/index/hedit.html b/apps/nps/0.29.21-duan2001/web/views/index/hedit.html similarity index 100% rename from apps/nps/0.29.21/web/views/index/hedit.html rename to apps/nps/0.29.21-duan2001/web/views/index/hedit.html diff --git a/apps/nps/0.29.21/web/views/index/help.html b/apps/nps/0.29.21-duan2001/web/views/index/help.html similarity index 100% rename from apps/nps/0.29.21/web/views/index/help.html rename to apps/nps/0.29.21-duan2001/web/views/index/help.html diff --git a/apps/nps/0.29.21/web/views/index/hlist.html b/apps/nps/0.29.21-duan2001/web/views/index/hlist.html similarity index 100% rename from apps/nps/0.29.21/web/views/index/hlist.html rename to apps/nps/0.29.21-duan2001/web/views/index/hlist.html diff --git a/apps/nps/0.29.21/web/views/index/index.html b/apps/nps/0.29.21-duan2001/web/views/index/index.html similarity index 100% rename from apps/nps/0.29.21/web/views/index/index.html rename to apps/nps/0.29.21-duan2001/web/views/index/index.html diff --git a/apps/nps/0.29.21/web/views/index/list.html b/apps/nps/0.29.21-duan2001/web/views/index/list.html similarity index 100% rename from apps/nps/0.29.21/web/views/index/list.html rename to apps/nps/0.29.21-duan2001/web/views/index/list.html diff --git a/apps/nps/0.29.21/web/views/login/index.html b/apps/nps/0.29.21-duan2001/web/views/login/index.html similarity index 100% rename from apps/nps/0.29.21/web/views/login/index.html rename to apps/nps/0.29.21-duan2001/web/views/login/index.html diff --git a/apps/nps/0.29.21/web/views/login/register.html b/apps/nps/0.29.21-duan2001/web/views/login/register.html similarity index 100% rename from apps/nps/0.29.21/web/views/login/register.html rename to apps/nps/0.29.21-duan2001/web/views/login/register.html diff --git a/apps/nps/0.29.21/web/views/public/error.html b/apps/nps/0.29.21-duan2001/web/views/public/error.html similarity index 100% rename from apps/nps/0.29.21/web/views/public/error.html rename to apps/nps/0.29.21-duan2001/web/views/public/error.html diff --git a/apps/nps/0.29.21/web/views/public/layout.html b/apps/nps/0.29.21-duan2001/web/views/public/layout.html similarity index 100% rename from apps/nps/0.29.21/web/views/public/layout.html rename to apps/nps/0.29.21-duan2001/web/views/public/layout.html diff --git a/apps/nps/data.yml b/apps/nps/data.yml index dcc0dc092..ca38748c4 100644 --- a/apps/nps/data.yml +++ b/apps/nps/data.yml @@ -15,5 +15,5 @@ additionalProperties: limit: 1 recommend: 0 website: https://ehang-io.github.io/nps - github: https://github.com/yisier/nps - document: https://ehang-io.github.io/nps + github: https://github.com/ehang-io/nps + document: https://ehang-io.github.io/nps/#/?id=nps diff --git a/apps/nps/latest/.env.sample b/apps/nps/latest/.env.sample deleted file mode 100644 index 6bca732c2..000000000 --- a/apps/nps/latest/.env.sample +++ /dev/null @@ -1,14 +0,0 @@ -CONTAINER_NAME="nps" -PANEL_APP_PORT_HTTP="40209" -NPS_AUTH_CRYPT_KEY="gl8r0tujikih7br5" -NPS_BRIDGE_PORT="8024" -NPS_BRIDGE_TLS_PORT="8025" -NPS_HTTPS_PROXY_PORT="50443" -NPS_HTTP_PROXY_IP="0.0.0.0" -NPS_HTTP_PROXY_PORT="50080" -NPS_PUBLIC_VKEY="xly7traGe3r0t6UWltristuh1" -NPS_WEB_HOST="http://localhost:40209" -NPS_WEB_OPEN_SSL="false" -NPS_WEB_PASSWORD="123_T8acCj" -NPS_WEB_USERNAME="admin_afmTRb" -TLS_ENABLE_SWITCH="true" diff --git a/apps/nps/latest/conf/clients.json b/apps/nps/latest/conf/clients.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/nps/latest/conf/hosts.json b/apps/nps/latest/conf/hosts.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/nps/latest/conf/multi_account.conf b/apps/nps/latest/conf/multi_account.conf deleted file mode 100644 index e3cd7926a..000000000 --- a/apps/nps/latest/conf/multi_account.conf +++ /dev/null @@ -1,2 +0,0 @@ -# key -> user | value -> pwd -npc=npc.pwd \ No newline at end of file diff --git a/apps/nps/latest/conf/nps.conf b/apps/nps/latest/conf/nps.conf deleted file mode 100644 index cc246b92e..000000000 --- a/apps/nps/latest/conf/nps.conf +++ /dev/null @@ -1,100 +0,0 @@ -appname = nps -#Boot mode(dev|pro) -runmode = pro - -#HTTP(S) proxy port, no startup if empty -http_proxy_ip=${NPS_HTTP_PROXY_IP} -http_proxy_port=${NPS_HTTP_PROXY_PORT} -https_proxy_port=${NPS_HTTPS_PROXY_PORT} -https_just_proxy=true -#default https certificate setting -https_default_cert_file=server.pem -https_default_key_file=server.key - -##bridge -bridge_type=tcp -bridge_port=${NPS_BRIDGE_PORT} -bridge_ip=0.0.0.0 - -# Public password, which clients can use to connect to the server -# After the connection, the server will be able to open relevant ports and parse related domain names according to its own configuration file. -public_vkey=${NPS_PUBLIC_VKEY} - -#Traffic data persistence interval(minute) -#Ignorance means no persistence -#flow_store_interval=1 - -# log level LevelEmergency->0 LevelAlert->1 LevelCritical->2 LevelError->3 LevelWarning->4 LevelNotice->5 LevelInformational->6 LevelDebug->7 -log_level=7 -#log_path=nps.log - -#Whether to restrict IP access, true or false or ignore -#ip_limit=true - -#p2p -#p2p_ip=127.0.0.1 -#p2p_port=6000 - -#web -web_host=${NPS_WEB_HOST} -web_username=${NPS_WEB_USERNAME} -web_password=${NPS_WEB_PASSWORD} -web_port = ${NPS_WEB_PORT} -web_ip=0.0.0.0 -web_base_url= -web_open_ssl=${NPS_WEB_OPEN_SSL} -web_cert_file=${NPS_DEFAULT_CERT_FILE} -web_key_file=${NPS_DEFAULT_KEY_FILE} -# if web under proxy use sub path. like http://host/nps need this. -#web_base_url=/nps - -#Web API unauthenticated IP address(the len of auth_crypt_key must be 16) -#Remove comments if needed -#auth_key=test -#ȡauthKeyʱaesԿ16λ -auth_crypt_key =${NPS_AUTH_CRYPT_KEY} - -#allow_ports=9001-9009,10001,11000-12000 - -#Web management multi-user login -allow_user_login=false -allow_user_register=false -allow_user_change_username=false - - -#extension -# -allow_flow_limit=false -# -allow_rate_limit=false -#ͻ -allow_tunnel_num_limit=false -allow_local_proxy=false -#ͻ -allow_connection_num_limit=false -#ÿͬķ˶˿ -allow_multi_ip=false -system_info_display=false -#ȡûʵip -http_add_origin_header=true - -#cache -http_cache=false -http_cache_length=100 - -#get origin ip -http_add_origin_header=false - -#pprof debug options -#pprof_ip=0.0.0.0 -#pprof_port=9999 - -#client disconnect timeout -disconnect_timeout=60 -#忪֤У -open_captcha=false - - -# Ƿtls -tls_enable=${TLS_ENABLE_SWITCH} -tls_bridge_port=${NPS_BRIDGE_TLS_PORT} diff --git a/apps/nps/latest/conf/server.key b/apps/nps/latest/conf/server.key deleted file mode 100644 index 570054afb..000000000 --- a/apps/nps/latest/conf/server.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA2MVLOHvgU8FCp6LgQrPfaWcGygrsRk7TL9hbT8MxbCRUSLV7 -Lbt3q5Knz8eTN4NWmwE6L5glOcH2x3Hnn+hPjbvgq35XBBIccAm0cYYKqoKkikeK -FZM0Gp/WhSrhJ4laTyQqyleIFKpwD9kHDiC/sxjGDhSFmHKhhAnsQIRm2tppFXX0 -aAMqJEm88jzk1BN2QtKjEAn1u8v1+QW1KP3WuzdXH4L7hhMll66/KIm6Hfs2FRHQ -pRUWqZeJY4q79NW5p5f+siGwOsGpxb/p11pM+0xnCH3UIFbm3zCTzP4sLvkfFGAe -yAHsAwmaP8dJxh40ej3NN8uNiNvt8nw2Vb/1LwIDAQABAoIBAD40x/RKoEKIyE8B -D6g0pB1EQo+CePFoN3SYewO1uR4WgtVmtxWVoa7r5BpdZGLe3uCWhpMX7z7W6bGs -f1LFQOckjkHIfMIfTGfecRjO5Yqu+Pbxtq+gUah+S/plJr3IzdC+SUVNvzBnBMeX -eU3Vmg2UQ2nQ+9GWu8D/c/vDwxx0X8oQ2G8QaxX0tUurlSMNA3M7xySwEvhx54fO -UrDF3Q4yF48eA4butxVLFWf3cnlY+nR8uYd2vKfmp689/8C6kkfoM9igB78e93sm -uDM2eRLm4kU5WLl301T42n6AF7w8J0MhLLVOIeLs4l5gZPa3uKvYFmuHQao7e/5R -U/jHKrECgYEA8alPXuxFSVOvdhIsSN//Frj9CdExVdYmaLkt/2LO4FMnOaWh1xh7 -5iCY1bJT8D9dhfbqRg3qW2oguZD8gu04R8fTRegQ89qmAIwsEYqVf9salR41lZU4 -Rc+5yc7O11WIe9Lzu+ONFBFkAh3UFMR4zVZ/JhKIG/P5Srm7SUdKW2cCgYEA5aHo -x2LR+yKhjkrBzHG3Qrfy1PtlYHjOpYYAKHQcBFuiG08W3CK/vkYl+mhv0uyhT7mn -q6NDqrpZPRnDlOoEqgRS1X/QWKN6Pgd4HNLIawvp0vK9jYXDPcAXFzVthXCIwFcn -3a3m4cHiuLdRNOHkydiHQyTOF6eEneN07TDvwvkCgYEApzOd1u9igPmFzQuF2GYi -+HXFnaU/nUQuDwcQ7EJRIKRn31raPxiRoQesty5LJU6yRp4wOYgnPliPi9Tk4TGA -XynC4/tMv2vorzhMxVY9Wdke602bhYNZC/RNd3O/aP2lEQdD3Bv04I2nxE8fDb9i -VbAjCRSJV83WDf2zt1+78sECgYEAzezjRiKdcZu9y0/I+WEk2cUCE/MaF2he0FsZ -uy1cjp/qAJltQ5452xUnK6cKWNlxU4CHF0mC/hC8xCldliZCZoEYE3PaUBLSJdwm -35o6tpxpZI3gZJCG5NJlIp/8BkVDrVC7ZHV17hAkFEf4n/bPaB8wNYtE8jt8luaK -TcarzGkCgYBn2alN0RLN2PHDurraFZB6GuCvh/arEjSCY3SDFQPF10CVjTDV7sx3 -eqJkwJ81syTmfJwZIceWbOFGgsuSx37UrQAVlHZSvzeqEg9dA5HqSoOACyidJI7j -RG2+HB+KpsIZjGgLrEM4i7VOpYUDRdaouIXngFq/t9HNT+MDck5/Lw== ------END RSA PRIVATE KEY----- diff --git a/apps/nps/latest/conf/server.pem b/apps/nps/latest/conf/server.pem deleted file mode 100644 index 7908eca54..000000000 --- a/apps/nps/latest/conf/server.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDtTCCAp2gAwIBAgIJAPXRSiP0Fs7sMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX -aWRnaXRzIFB0eSBMdGQwHhcNMTcxMTA3MDg1MzQ2WhcNMjcxMTA1MDg1MzQ2WjBF -MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 -ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEA2MVLOHvgU8FCp6LgQrPfaWcGygrsRk7TL9hbT8MxbCRUSLV7Lbt3q5Kn -z8eTN4NWmwE6L5glOcH2x3Hnn+hPjbvgq35XBBIccAm0cYYKqoKkikeKFZM0Gp/W -hSrhJ4laTyQqyleIFKpwD9kHDiC/sxjGDhSFmHKhhAnsQIRm2tppFXX0aAMqJEm8 -8jzk1BN2QtKjEAn1u8v1+QW1KP3WuzdXH4L7hhMll66/KIm6Hfs2FRHQpRUWqZeJ -Y4q79NW5p5f+siGwOsGpxb/p11pM+0xnCH3UIFbm3zCTzP4sLvkfFGAeyAHsAwma -P8dJxh40ej3NN8uNiNvt8nw2Vb/1LwIDAQABo4GnMIGkMB0GA1UdDgQWBBQdPc0R -a8alY6Ab7voidkTGaH4PxzB1BgNVHSMEbjBsgBQdPc0Ra8alY6Ab7voidkTGaH4P -x6FJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV -BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAPXRSiP0Fs7sMAwGA1UdEwQF -MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAH1IZNkjuvt2nZPzXsuiVNyCE1vm346z -naE0Uzt3aseAN9m/iiB8mLz+ryvWc2aFMX5lTdsHdm2rqmqBCBXeRwTLf4OeHIju -ZQW6makWt6PxANEo6gbdPbQXbS420ssUhnR2irIH1SdI31iikVFPdiS0baRRE/gS -+440M1jOOOnKm0Qin92ejsshmji/0qaD2+6D5TNw4HmIZaFTBw+kfjxCL6trfeBn -4fT0RJ121V3G3+AtG5sWQ93B3pCg+jtD+fGKkNSLhphq84bD1Zv7l73QGOoylkEn -Sc0ajTLOXFBb83yRdlgV3Da95jH9rDZ4jSod48m+KemoZTDQw0vSwAU= ------END CERTIFICATE----- diff --git a/apps/nps/latest/conf/tasks.json b/apps/nps/latest/conf/tasks.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/nps/latest/data.yml b/apps/nps/latest/data.yml deleted file mode 100644 index cc0d10b19..000000000 --- a/apps/nps/latest/data.yml +++ /dev/null @@ -1,111 +0,0 @@ -additionalProperties: - formFields: - - default: 40209 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Web Management Port - labelZh: web 管理端口 - required: true - rule: paramPort - type: number - - default: 8024 - edit: true - envKey: NPS_BRIDGE_PORT - labelEn: Server-Client Communication Port - labelZh: 服务端客户端通信端口 - required: true - rule: paramPort - type: number - - default: 8025 - edit: true - envKey: NPS_BRIDGE_TLS_PORT - labelEn: Server-Client Communication TLS Port - labelZh: 服务端客户端 TLS 通信端口 - required: true - rule: paramPort - type: number - - default: "true" - envKey: TLS_ENABLE_SWITCH - labelEn: Whether TLS is enabled for server-client communication - labelZh: 服务端与客户端的通信是否启用 TLS - required: true - type: select - values: - - label: "True" - value: "true" - - label: "False" - value: "false" - - default: http://localhost:40209 - edit: true - envKey: NPS_WEB_HOST - labelEn: External URL(If the default address, please replace localhost with the current service IP) - labelZh: 外部访问地址(若默认地址请替换 localhost 为当前服务 IP) - required: true - rule: paramExtUrl - type: text - - default: admin - edit: true - envKey: NPS_WEB_USERNAME - labelEn: Web Interface Management Account - labelZh: web 界面管理账号 - random: true - required: true - rule: paramCommon - type: text - - default: "123" - edit: true - envKey: NPS_WEB_PASSWORD - labelEn: Web Interface Management Password - labelZh: web 界面管理密码 - random: true - required: true - rule: paramComplexity - type: password - - default: "false" - edit: true - envKey: NPS_WEB_OPEN_SSL - labelEn: Enable webui https access - labelZh: web 界面开启 https 访问 - required: true - rule: paramCommon - type: text - - default: "xly7traGe3r0t6UWltristuh1" - edit: true - envKey: NPS_PUBLIC_VKEY - labelEn: Key When the Client Starts in Configuration File Mode - labelZh: 客户端以配置文件模式启动时的密钥 - required: true - rule: paramCommon - type: text - - default: "gl8r0tujikih7br5" - edit: true - envKey: NPS_AUTH_CRYPT_KEY - labelEn: 16-bit AES Encryption Key - labelZh: 16 位 AES 加密密钥 - required: true - rule: paramCommon - type: text - - default: 0.0.0.0 - edit: true - envKey: NPS_HTTP_PROXY_IP - labelEn: Http Proxy IP - labelZh: 域名代理 http 代理监听地址 - required: true - rule: paramCommon - type: text - - default: 50080 - edit: true - envKey: NPS_HTTP_PROXY_PORT - labelEn: Http Proxy Port - labelZh: 域名代理 http 代理监听端口 - required: true - rule: paramPort - type: number - - default: 50443 - edit: true - envKey: NPS_HTTPS_PROXY_PORT - labelEn: Https Proxy Port - labelZh: 域名代理 https 代理监听端口 - required: true - rule: paramPort - type: number diff --git a/apps/nps/latest/docker-compose.yml b/apps/nps/latest/docker-compose.yml deleted file mode 100644 index fb38f9bc5..000000000 --- a/apps/nps/latest/docker-compose.yml +++ /dev/null @@ -1,25 +0,0 @@ -services: - nps: - image: yisier1/nps:latest - container_name: ${CONTAINER_NAME} - restart: always - volumes: - - ./conf:/conf - - /etc/localtime:/etc/localtime:ro - environment: - NPS_WEB_HOST: ${NPS_WEB_HOST} - NPS_WEB_PORT: ${PANEL_APP_PORT_HTTP} - NPS_WEB_USERNAME: ${NPS_WEB_USERNAME} - NPS_WEB_PASSWORD: ${NPS_WEB_PASSWORD} - NPS_WEB_OPEN_SSL: ${NPS_WEB_OPEN_SSL} - NPS_PUBLIC_VKEY: ${NPS_PUBLIC_VKEY} - NPS_BRIDGE_PORT: ${NPS_BRIDGE_PORT} - NPS_BRIDGE_TLS_PORT: ${NPS_BRIDGE_TLS_PORT} - NPS_AUTH_CRYPT_KEY: ${NPS_AUTH_CRYPT_KEY} - NPS_HTTP_PROXY_IP: ${NPS_HTTP_PROXY_IP} - NPS_HTTP_PROXY_PORT: ${NPS_HTTP_PROXY_PORT} - NPS_HTTPS_PROXY_PORT: ${NPS_HTTPS_PROXY_PORT} - TLS_ENABLE_SWITCH: ${TLS_ENABLE_SWITCH} - network_mode: "host" - labels: - createdBy: "Apps" diff --git a/apps/openlist/README.md b/apps/openlist/README.md index 10ad88211..182255313 100644 --- a/apps/openlist/README.md +++ b/apps/openlist/README.md @@ -4,7 +4,6 @@ ## 版本说明 -- alist-3.45.0 原版Alist封存，不建议部署 - openlist 开源主版本，不包含其他工具，体积最小 - openlist-ffmpeg 添加ffmpeg视频处理工具 - openlist-aria2 添加aria2下载器工具 diff --git a/apps/openlist/alist-3.45.0/data.yml b/apps/openlist/alist-3.45.0/data.yml deleted file mode 100755 index c3739655d..000000000 --- a/apps/openlist/alist-3.45.0/data.yml +++ /dev/null @@ -1,36 +0,0 @@ -additionalProperties: - formFields: - - default: 5244 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: WebUI Port - labelZh: 网页端口 - required: true - rule: paramPort - type: number - label: - en: WebUI Port - ja: WebUI ポート - ms: Port WebUI - pt-br: Porta WebUI - ru: Порт WebUI - ko: WebUI 포트 - zh-Hant: WebUI 埠 - zh: WebUI 端口 - - default: 5426 - edit: true - envKey: PANEL_APP_PORT_S3 - labelEn: S3 Port - labelZh: S3 端口 - required: true - rule: paramPort - type: number - label: - en: S3 Port - ja: S3 ポート - ms: Port S3 - pt-br: Porta S3 - ru: Порт S3 - ko: S3 포트 - zh-Hant: S3 埠 - zh: S3 端口 diff --git a/apps/openlist/alist-3.45.0/data/data/.gitkeep b/apps/openlist/alist-3.45.0/data/data/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/openlist/alist-3.45.0/data/mnt/.gitkeep b/apps/openlist/alist-3.45.0/data/mnt/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/openlist/alist-3.45.0/docker-compose.yml b/apps/openlist/alist-3.45.0/docker-compose.yml deleted file mode 100644 index ae0d06cd6..000000000 --- a/apps/openlist/alist-3.45.0/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -services: - alist: - container_name: ${CONTAINER_NAME} - restart: always - networks: - - 1panel-network - ports: - - "${PANEL_APP_PORT_HTTP}:5244" - - "${PANEL_APP_PORT_S3}:5426" - volumes: - - ./data/data:/opt/alist/data - - ./data/mnt:/mnt/data - environment: - - PUID=0 - - PGID=0 - - UMASK=022 - image: xhofe/alist:v3.45.0 - labels: - createdBy: "Apps" -networks: - 1panel-network: - external: true - diff --git a/apps/openlist/alist-3.45.0/scripts/upgrade.sh b/apps/openlist/alist-3.45.0/scripts/upgrade.sh deleted file mode 100644 index 8957ef5f6..000000000 --- a/apps/openlist/alist-3.45.0/scripts/upgrade.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -if [[ -f ./.env ]]; then - if grep -q 'PANEL_APP_PORT_S3' ./.env; then - echo "PANEL_APP_PORT_S3 参数已存在" - else - echo 'PANEL_APP_PORT_S3=5426' >> ./.env - echo "已添加 PANEL_APP_PORT_S3=5426" - fi -else - echo ".env 文件不存在" -fi diff --git a/apps/openlist/data.yml b/apps/openlist/data.yml index ef8a8d274..5882911f0 100755 --- a/apps/openlist/data.yml +++ b/apps/openlist/data.yml @@ -29,9 +29,9 @@ additionalProperties: github: https://github.com/OpenListTeam/OpenList document: https://openlistteam.github.io/docs/ architectures: - - amd64 - - arm64 - - arm/v7 - - arm/v6 - - s390x + - amd64 + - arm64 + - arm/v7 + - arm/v6 + - s390x diff --git a/apps/outline/0.83.0/data.yml b/apps/outline/0.83.0/data.yml deleted file mode 100644 index c2e78f0e1..000000000 --- a/apps/outline/0.83.0/data.yml +++ /dev/null @@ -1,274 +0,0 @@ -additionalProperties: - formFields: - - child: - default: "" - envKey: PANEL_REDIS_SERVICE - required: true - type: service - default: redis - envKey: PANEL_REDIS_TYPE - labelZh: Redis 服务 (前置检查) - labelEn: Redis Service (Pre-check) - required: true - type: apps - values: - - label: Redis - value: redis - - child: - default: "" - envKey: PANEL_POSTGRES_SERVICE - required: true - type: service - default: postgresql - envKey: PANEL_POSTGRES_TYPE - labelZh: Postgres 服务 (前置检查) - labelEn: Postgres Service (Pre-check) - required: true - type: apps - values: - - label: PostgreSQL - value: postgresql - - default: "/home/outline" - edit: true - envKey: OUTLINE_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - - default: 3000 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "fbad4f5da794acbc10f060cdfcf8673300f3302d87f076d7f6e781d4840e9c3d" - edit: true - envKey: SECRET_KEY - labelZh: 加密密钥 - labelEn: Secret Key - required: true - type: password - - default: "b2be1c54acbfe6d965bda01e63195cc815e4743a6fb5ba5f82eae916d98989b5" - edit: true - envKey: UTILS_SECRET - labelZh: 工具密钥 - labelEn: Utils Secret - required: true - type: password - - default: "http://127.0.0.1:3000" - edit: true - envKey: URL - labelZh: 域名 - labelEn: Domain - required: true - rule: paramExtUrl - type: text - - default: "" - edit: true - envKey: CDN_URL - labelZh: CDN 域名 - labelEn: CDN Domain - required: false - type: text - - default: "https://iframe.ly/api/iframely" - edit: true - envKey: IFRAMELY_URL - labelZh: iFramely 地址 - labelEn: iFramely URL - required: true - rule: paramExtUrl - type: text - - default: "" - edit: true - envKey: IFRAMELY_API_KEY - labelZh: iFramely 密钥 - labelEn: iFramely API Key - required: false - type: text - - default: "127.0.0.1" - edit: true - envKey: DB_HOSTNAME - labelZh: 数据库 主机地址 - labelEn: Database Host - required: true - type: text - - default: 5432 - edit: true - envKey: DB_PORT - labelZh: 数据库 端口 - labelEn: Database Port - required: true - rule: paramPort - type: number - - default: "outline" - edit: true - envKey: DB_USERNAME - labelZh: 数据库 用户名 - labelEn: Database User - required: true - type: text - - default: "" - edit: true - envKey: DB_PASSWORD - labelZh: 数据库 密码 - labelEn: Database Password - random: true - required: true - rule: paramComplexity - type: password - - default: "outline" - edit: true - envKey: DB_DATABASE_NAME - labelZh: 数据库 名称 - labelEn: Database Name - required: true - type: text - - default: "redis://localhost:6379" - edit: true - envKey: REDIS_URL - labelZh: Redis 链接 - labelEn: Redis URL - required: true - type: text - - default: "" - edit: true - envKey: SLACK_CLIENT_ID - labelZh: Slack 客户端 ID (鉴权) - labelEn: Slack Client ID (Auth) - required: false - type: text - - default: "" - edit: true - envKey: SLACK_CLIENT_SECRET - labelZh: Slack 客户端密钥 (鉴权) - labelEn: Slack Client Secret (Auth) - required: false - type: password - - default: "" - edit: true - envKey: GOOGLE_CLIENT_ID - labelZh: Google 客户端 ID (鉴权) - labelEn: Google Client ID (Auth) - required: false - type: text - - default: "" - edit: true - envKey: GOOGLE_CLIENT_SECRET - labelZh: Google 客户端密钥 (鉴权) - labelEn: Google Client Secret (Auth) - required: false - type: password - - default: "" - edit: true - envKey: DISCORD_CLIENT_ID - labelZh: Discord 客户端 ID (鉴权) - labelEn: Discord Client ID (Auth) - required: false - type: text - - default: "" - edit: true - envKey: DISCORD_CLIENT_SECRET - labelZh: Discord 客户端密钥 (鉴权) - labelEn: Discord Client Secret (Auth) - required: false - type: password - - default: "" - edit: true - envKey: DISCORD_SERVER_ID - labelZh: Discord 服务端 ID (鉴权) - labelEn: Discord Server ID (Auth) - required: false - type: text - - default: "" - edit: true - envKey: DISCORD_SERVER_ROLES - labelZh: Discord 服务端角色 (鉴权) - labelEn: Discord Server Roles (Auth) - required: false - type: text - - default: "" - edit: true - envKey: SMTP_HOST - labelZh: SMTP 主机 - labelEn: SMTP Host - required: false - type: text - - default: 465 - edit: true - envKey: SMTP_PORT - labelZh: SMTP 端口 - labelEn: SMTP Port - required: false - type: number - - default: "" - edit: true - envKey: SMTP_USERNAME - labelZh: SMTP 用户名 - labelEn: SMTP Username - required: false - type: text - - default: "" - edit: true - envKey: SMTP_PASSWORD - labelZh: SMTP 密码 - labelEn: SMTP Password - required: false - type: password - - default: "" - edit: true - envKey: SMTP_FROM_EMAIL - labelZh: SMTP 发件人 - labelEn: SMTP From Email - required: false - type: text - - default: "" - edit: true - envKey: SLACK_VERIFICATION_TOKEN - labelZh: Slack 验证令牌 (Slack 集成) - labelEn: Slack Verification Token (Slack Integration) - required: false - type: text - - default: "" - edit: true - envKey: SLACK_APP_ID - labelZh: Slack 应用ID (Slack 集成) - labelEn: Slack App ID (Slack Integration) - required: false - type: text - - default: "" - edit: true - envKey: GITHUB_CLIENT_ID - labelZh: GitHub 客户端 ID (GitHub 集成) - labelEn: GitHub Client ID (GitHub Integration) - required: false - type: text - - default: "" - edit: true - envKey: GITHUB_CLIENT_SECRET - labelZh: GitHub 客户端密钥 (GitHub 集成) - labelEn: GitHub Client Secret (GitHub Integration) - required: false - type: password - - default: "" - edit: true - envKey: GITHUB_APP_NAME - labelZh: GitHub 应用名称 (GitHub 集成) - labelEn: GitHub App Name (GitHub Integration) - required: false - type: text - - default: "" - edit: true - envKey: GITHUB_APP_ID - labelZh: GitHub 应用ID (GitHub 集成) - labelEn: GitHub App ID (GitHub Integration) - required: false - type: text - - default: "" - edit: true - envKey: GITHUB_APP_PRIVATE_KEY - labelZh: GitHub 应用私钥 (GitHub 集成) - labelEn: GitHub App Private Key (GitHub Integration) - required: false - type: password diff --git a/apps/outline/0.83.0/docker-compose.yml b/apps/outline/0.83.0/docker-compose.yml deleted file mode 100644 index 17fd03210..000000000 --- a/apps/outline/0.83.0/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - outline: - image: outlinewiki/outline:0.83.0 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:3000 - volumes: - - ${OUTLINE_ROOT_PATH}/data:/var/lib/outline/data - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${APP_ENV_FILE:-/etc/1panel/envs/outline/outline.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - DATABASE_URL=postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} diff --git a/apps/outline/0.83.0/envs/default.env b/apps/outline/0.83.0/envs/default.env deleted file mode 100644 index ddd33010c..000000000 --- a/apps/outline/0.83.0/envs/default.env +++ /dev/null @@ -1 +0,0 @@ -ENV_FILE=.env diff --git a/apps/outline/0.83.0/envs/global.env b/apps/outline/0.83.0/envs/global.env deleted file mode 100644 index c5f9a929c..000000000 --- a/apps/outline/0.83.0/envs/global.env +++ /dev/null @@ -1 +0,0 @@ -TZ=Asia/Shanghai diff --git a/apps/outline/0.83.0/envs/outline.env b/apps/outline/0.83.0/envs/outline.env deleted file mode 100644 index 1e366c08f..000000000 --- a/apps/outline/0.83.0/envs/outline.env +++ /dev/null @@ -1,224 +0,0 @@ -# –––––––––––––––– REQUIRED –––––––––––––––– - -NODE_ENV=production - -# Generate a hex-encoded 32-byte random key. You should use `openssl rand -hex 32` -# in your terminal to generate a random value. -SECRET_KEY=generate_a_new_key - -# Generate a unique random key. The format is not important but you could still use -# `openssl rand -hex 32` in your terminal to produce this. -UTILS_SECRET=generate_a_new_key - -# For production point these at your databases, in development the default -# should work out of the box. -DATABASE_URL=postgres://user:pass@localhost:5432/outline -DATABASE_CONNECTION_POOL_MIN= -DATABASE_CONNECTION_POOL_MAX= -# Uncomment this to disable SSL for connecting to Postgres -PGSSLMODE=disable - -# For redis you can either specify an ioredis compatible url like this -REDIS_URL=redis://localhost:6379 -# or alternatively, if you would like to provide additional connection options, -# use a base64 encoded JSON connection option object. Refer to the ioredis documentation -# for a list of available options. -# Example: Use Redis Sentinel for high availability -# {"sentinels":[{"host":"sentinel-0","port":26379},{"host":"sentinel-1","port":26379}],"name":"mymaster"} -# REDIS_URL=ioredis://eyJzZW50aW5lbHMiOlt7Imhvc3QiOiJzZW50aW5lbC0wIiwicG9ydCI6MjYzNzl9LHsiaG9zdCI6InNlbnRpbmVsLTEiLCJwb3J0IjoyNjM3OX1dLCJuYW1lIjoibXltYXN0ZXIifQ== - -# URL should point to the fully qualified, publicly accessible URL. If using a -# proxy the port in URL and PORT may be different. -URL=http://127.0.0.1:3000 -PORT=3000 - -# See [documentation](docs/SERVICES.md) on running a separate collaboration -# server, for normal operation this does not need to be set. -COLLABORATION_URL= - -# Specify what storage system to use. Possible value is one of "s3" or "local". -# For "local", the avatar images and document attachments will be saved on local disk. -FILE_STORAGE=local - -# If "local" is configured for FILE_STORAGE above, then this sets the parent directory under -# which all attachments/images go. Make sure that the process has permissions to create -# this path and also to write files to it. -FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data - -# Maximum allowed size for the uploaded attachment. -FILE_STORAGE_UPLOAD_MAX_SIZE=262144000 - -# Override the maximum size of document imports, generally this should be lower -# than the document attachment maximum size. -FILE_STORAGE_IMPORT_MAX_SIZE= - -# Override the maximum size of workspace imports, these can be especially large -# and the files are temporary being automatically deleted after a period of time. -FILE_STORAGE_WORKSPACE_IMPORT_MAX_SIZE= - -# To support uploading of images for avatars and document attachments in a distributed -# architecture an s3-compatible storage can be configured if FILE_STORAGE=s3 above. -AWS_ACCESS_KEY_ID=get_a_key_from_aws -AWS_SECRET_ACCESS_KEY=get_the_secret_of_above_key -AWS_REGION=xx-xxxx-x -AWS_S3_ACCELERATE_URL= -AWS_S3_UPLOAD_BUCKET_URL=http://s3:4569 -AWS_S3_UPLOAD_BUCKET_NAME=bucket_name_here -AWS_S3_FORCE_PATH_STYLE=true -AWS_S3_ACL=private - -# –––––––––––––– AUTHENTICATION –––––––––––––– - -# Third party signin credentials, at least ONE OF EITHER Google, Slack, -# or Microsoft is required for a working installation or you'll have no sign-in -# options. - -# To configure Slack auth, you'll need to create an Application at -# => https://api.slack.com/apps -# -# When configuring the Client ID, add a redirect URL under "OAuth & Permissions": -# https:///auth/slack.callback -SLACK_CLIENT_ID=get_a_key_from_slack -SLACK_CLIENT_SECRET=get_the_secret_of_above_key - -# To configure Google auth, you'll need to create an OAuth Client ID at -# => https://console.cloud.google.com/apis/credentials -# -# When configuring the Client ID, add an Authorized redirect URI: -# https:///auth/google.callback -GOOGLE_CLIENT_ID= -GOOGLE_CLIENT_SECRET= - -# To configure Microsoft/Azure auth, you'll need to create an OAuth Client. See -# the guide for details on setting up your Azure App: -# => https://wiki.generaloutline.com/share/dfa77e56-d4d2-4b51-8ff8-84ea6608faa4 -AZURE_CLIENT_ID= -AZURE_CLIENT_SECRET= -AZURE_RESOURCE_APP_ID= - -# To configure generic OIDC auth, you'll need some kind of identity provider. -# See documentation for whichever IdP you use to acquire the following info: -# Redirect URI is https:///auth/oidc.callback -OIDC_CLIENT_ID= -OIDC_CLIENT_SECRET= -OIDC_AUTH_URI= -OIDC_TOKEN_URI= -OIDC_USERINFO_URI= -OIDC_LOGOUT_URI= - -# Specify which claims to derive user information from -# Supports any valid JSON path with the JWT payload -OIDC_USERNAME_CLAIM=preferred_username - -# Display name for OIDC authentication -OIDC_DISPLAY_NAME=OpenID Connect - -# Space separated auth scopes. -OIDC_SCOPES=openid profile email - -# To configure the GitHub integration, you'll need to create a GitHub App at -# => https://github.com/settings/apps -# -# When configuring the Client ID, add a redirect URL under "Permissions & events": -# https:///api/github.callback -GITHUB_CLIENT_ID= -GITHUB_CLIENT_SECRET= -GITHUB_APP_NAME= -GITHUB_APP_ID= -GITHUB_APP_PRIVATE_KEY= - -# To configure Discord auth, you'll need to create a Discord Application at -# => https://discord.com/developers/applications/ -# -# When configuring the Client ID, add a redirect URL under "OAuth2": -# https:///auth/discord.callback -DISCORD_CLIENT_ID= -DISCORD_CLIENT_SECRET= - -# DISCORD_SERVER_ID should be the ID of the Discord server that Outline is -# integrated with. -# Used to verify that the user is a member of the server as well as server -# metadata such as nicknames, server icon and name. -DISCORD_SERVER_ID= - -# DISCORD_SERVER_ROLES should be a comma separated list of role IDs that are -# allowed to access Outline. If this is not set, all members of the server -# will be allowed to access Outline. -# DISCORD_SERVER_ID and DISCORD_SERVER_ROLES must be set together. -DISCORD_SERVER_ROLES= - -# –––––––––––––––– OPTIONAL –––––––––––––––– - -# Base64 encoded private key and certificate for HTTPS termination. This is only -# required if you do not use an external reverse proxy. See documentation: -# https://wiki.generaloutline.com/share/1c922644-40d8-41fe-98f9-df2b67239d45 -SSL_KEY= -SSL_CERT= - -# If using a Cloudfront/Cloudflare distribution or similar it can be set below. -# This will cause paths to javascript, stylesheets, and images to be updated to -# the hostname defined in CDN_URL. In your CDN configuration the origin server -# should be set to the same as URL. -CDN_URL= - -# Auto-redirect to https in production. The default is true but you may set to -# false if you can be sure that SSL is terminated at an external loadbalancer. -FORCE_HTTPS=false - -# Have the installation check for updates by sending anonymized statistics to -# the maintainers -ENABLE_UPDATES=true - -# How many processes should be spawned. As a reasonable rule divide your servers -# available memory by 512 for a rough estimate -WEB_CONCURRENCY=1 - -# You can remove this line if your reverse proxy already logs incoming http -# requests and this ends up being duplicative -DEBUG=http - -# Configure lowest severity level for server logs. Should be one of -# error, warn, info, http, verbose, debug and silly -LOG_LEVEL=info - -# For a complete Slack integration with search and posting to channels the -# following configs are also needed, some more details -# => https://wiki.generaloutline.com/share/be25efd1-b3ef-4450-b8e5-c4a4fc11e02a -# -SLACK_VERIFICATION_TOKEN=your_token -SLACK_APP_ID=A0XXXXXXX -SLACK_MESSAGE_ACTIONS=true - -# Optionally enable Sentry (sentry.io) to track errors and performance, -# and optionally add a Sentry proxy tunnel for bypassing ad blockers in the UI: -# https://docs.sentry.io/platforms/javascript/troubleshooting/#using-the-tunnel-option) -SENTRY_DSN= -SENTRY_TUNNEL= - -# To support sending outgoing transactional emails such as "document updated" or -# "you've been invited" you'll need to provide authentication for an SMTP server -SMTP_HOST= -SMTP_PORT= -SMTP_USERNAME= -SMTP_PASSWORD= -SMTP_FROM_EMAIL= -SMTP_REPLY_EMAIL= -SMTP_TLS_CIPHERS= -SMTP_SECURE=true - -# The default interface language. See translate.getoutline.com for a list of -# available language codes and their rough percentage translated. -DEFAULT_LANGUAGE=zh_CN - -# Optionally enable rate limiter at application web server -RATE_LIMITER_ENABLED=true - -# Configure default throttling parameters for rate limiter -RATE_LIMITER_REQUESTS=1000 -RATE_LIMITER_DURATION_WINDOW=60 - -# Iframely API config -# https://iframe.ly/api/oembed -# https://iframe.ly/api/iframely -IFRAMELY_URL=https://iframe.ly/api/iframely -# IFRAMELY_API_KEY= diff --git a/apps/outline/0.83.0/scripts/init.sh b/apps/outline/0.83.0/scripts/init.sh deleted file mode 100644 index 4c7fbfcb7..000000000 --- a/apps/outline/0.83.0/scripts/init.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/outline.env" >> .env - - # setup-2 remove empty values - sed -i '/^.*=""/d' .env - - # setup-3 update directory permissions - mkdir -p "$OUTLINE_ROOT_PATH" - mkdir -p "$OUTLINE_ROOT_PATH/data" - - chown -R 1001:1001 "$OUTLINE_ROOT_PATH" - chmod -R 1777 "$OUTLINE_ROOT_PATH" - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/outline/0.83.0/scripts/uninstall.sh b/apps/outline/0.83.0/scripts/uninstall.sh deleted file mode 100644 index c86c4fbca..000000000 --- a/apps/outline/0.83.0/scripts/uninstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/outline/0.83.0/scripts/upgrade.sh b/apps/outline/0.83.0/scripts/upgrade.sh deleted file mode 100644 index 4c7fbfcb7..000000000 --- a/apps/outline/0.83.0/scripts/upgrade.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 - sed -i '/^APP_ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env - echo "APP_ENV_FILE=${CURRENT_DIR}/envs/outline.env" >> .env - - # setup-2 remove empty values - sed -i '/^.*=""/d' .env - - # setup-3 update directory permissions - mkdir -p "$OUTLINE_ROOT_PATH" - mkdir -p "$OUTLINE_ROOT_PATH/data" - - chown -R 1001:1001 "$OUTLINE_ROOT_PATH" - chmod -R 1777 "$OUTLINE_ROOT_PATH" - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/pairdrop/latest/data.yml b/apps/pairdrop/1.11.2/data.yml similarity index 100% rename from apps/pairdrop/latest/data.yml rename to apps/pairdrop/1.11.2/data.yml diff --git a/apps/pairdrop/latest/docker-compose.yml b/apps/pairdrop/1.11.2/docker-compose.yml similarity index 91% rename from apps/pairdrop/latest/docker-compose.yml rename to apps/pairdrop/1.11.2/docker-compose.yml index 4a24bf644..1dd1fc492 100644 --- a/apps/pairdrop/latest/docker-compose.yml +++ b/apps/pairdrop/1.11.2/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: pairdrop: - image: lscr.io/linuxserver/pairdrop:latest + image: linuxserver/pairdrop:1.11.2 container_name: ${CONTAINER_NAME} restart: always ports: diff --git a/apps/piclist/1.9.14/docker-compose.yml b/apps/piclist/1.9.14/docker-compose.yml index 011d5d9a8..bda9c401d 100644 --- a/apps/piclist/1.9.14/docker-compose.yml +++ b/apps/piclist/1.9.14/docker-compose.yml @@ -12,7 +12,7 @@ services: command: node /usr/local/bin/picgo-server -k ${AUTH_KEY} labels: createdBy: "Apps" - + networks: 1panel-network: external: true diff --git a/apps/piclist/latest/.env.sample b/apps/piclist/latest/.env.sample deleted file mode 100644 index 466b56bc7..000000000 --- a/apps/piclist/latest/.env.sample +++ /dev/null @@ -1,4 +0,0 @@ -CONTAINER_NAME="piclist" -DATA_PATH="./data" -PANEL_APP_PORT_HTTP=40333 -AUTH_KEY="password" diff --git a/apps/piclist/latest/data.yml b/apps/piclist/latest/data.yml deleted file mode 100644 index 731c4d246..000000000 --- a/apps/piclist/latest/data.yml +++ /dev/null @@ -1,26 +0,0 @@ -additionalProperties: - formFields: - - default: "40333" - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number - - default: "./data" - edit: true - envKey: DATA_PATH - labelEn: Data Path - labelZh: 数据路径 - required: true - type: text - - default: "password" - edit: true - envKey: AUTH_KEY - labelEn: Auth Key - labelZh: 授权密钥 - random: true - required: true - rule: paramComplexity - type: password diff --git a/apps/piclist/latest/docker-compose.yml b/apps/piclist/latest/docker-compose.yml deleted file mode 100644 index 65e545336..000000000 --- a/apps/piclist/latest/docker-compose.yml +++ /dev/null @@ -1,18 +0,0 @@ -services: - piclist: - image: "kuingsmile/piclist:latest" - container_name: ${CONTAINER_NAME} - restart: always - networks: - - 1panel-network - ports: - - "${PANEL_APP_PORT_HTTP}:36677" - volumes: - - "${DATA_PATH}:/root/.piclist" - command: node /usr/local/bin/picgo-server -k ${AUTH_KEY} - labels: - createdBy: "Apps" - -networks: - 1panel-network: - external: true diff --git a/apps/hexo/stable-23-07-01/.env.sample b/apps/qexo/3.6.0/.env.sample similarity index 100% rename from apps/hexo/stable-23-07-01/.env.sample rename to apps/qexo/3.6.0/.env.sample diff --git a/apps/qexo/latest/data.yml b/apps/qexo/3.6.0/data.yml similarity index 100% rename from apps/qexo/latest/data.yml rename to apps/qexo/3.6.0/data.yml diff --git a/apps/qexo/latest/docker-compose.yml b/apps/qexo/3.6.0/docker-compose.yml similarity index 90% rename from apps/qexo/latest/docker-compose.yml rename to apps/qexo/3.6.0/docker-compose.yml index 03e28f340..063f7486c 100644 --- a/apps/qexo/latest/docker-compose.yml +++ b/apps/qexo/3.6.0/docker-compose.yml @@ -15,7 +15,7 @@ services: - TZ=Asia/Shanghai - WORKERS=4 - THREADS=4 - image: abudulin/qexo:latest + image: abudulin/qexo:3.6.0 labels: createdBy: "Apps" volumes: diff --git a/apps/qexo/latest/.env.sample b/apps/qexo/latest/.env.sample deleted file mode 100644 index f6c6fa51c..000000000 --- a/apps/qexo/latest/.env.sample +++ /dev/null @@ -1,5 +0,0 @@ -CONTAINER_NAME="hexo" -PANEL_APP_PORT_HTTP="40064" -DATA_PATH="./data" -GIT_USERNAME="gituser" -GIT_MAIL="user@email.com" diff --git a/apps/qwen-free-api/latest/data.yml b/apps/qwen-free-api/0.0.22/data.yml similarity index 100% rename from apps/qwen-free-api/latest/data.yml rename to apps/qwen-free-api/0.0.22/data.yml diff --git a/apps/qwen-free-api/latest/docker-compose.yml b/apps/qwen-free-api/0.0.22/docker-compose.yml similarity index 89% rename from apps/qwen-free-api/latest/docker-compose.yml rename to apps/qwen-free-api/0.0.22/docker-compose.yml index 4e95d965f..bf35d1d35 100644 --- a/apps/qwen-free-api/latest/docker-compose.yml +++ b/apps/qwen-free-api/0.0.22/docker-compose.yml @@ -1,6 +1,6 @@ services: qwen-free-api: - image: vinlic/qwen-free-api:latest + image: vinlic/qwen-free-api:0.0.22 container_name: ${CONTAINER_NAME} ports: - ${PANEL_APP_PORT_HTTP}:8000 diff --git a/apps/safeline/7.3.1/.env.sample b/apps/safeline/7.3.1/.env.sample deleted file mode 100644 index b7379d9d2..000000000 --- a/apps/safeline/7.3.1/.env.sample +++ /dev/null @@ -1,5 +0,0 @@ -CONTAINER_NAME="safeline" -PANEL_APP_PORT_HTTP="40080" -POSTGRES_PASSWORD="password_xxJdZD" -SAFELINE_DIR="./data" -SUBNET_PREFIX="172.18.0" diff --git a/apps/safeline/7.3.1/data.yml b/apps/safeline/7.3.1/data.yml deleted file mode 100644 index 77b259caa..000000000 --- a/apps/safeline/7.3.1/data.yml +++ /dev/null @@ -1,32 +0,0 @@ -additionalProperties: - formFields: - - default: "" - edit: true - envKey: POSTGRES_PASSWORD - labelEn: Postgres database User Password - labelZh: Postgres数据库密码 - required: true - rule: paramCommon - type: password - - default: 40080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number - - default: ./data - edit: true - envKey: SAFELINE_DIR - labelEn: Data storage folder - labelZh: 数据存放文件夹 - required: true - type: text - - default: 172.18.0 - edit: true - envKey: SUBNET_PREFIX - labelEn: 1panel-network subnet prefix (Check the docker network to get it) - labelZh: 1panel-network 子网前缀 (查看docker网络获取) - required: true - type: text diff --git a/apps/safeline/7.3.1/docker-compose.yml b/apps/safeline/7.3.1/docker-compose.yml deleted file mode 100644 index 3388c4d7f..000000000 --- a/apps/safeline/7.3.1/docker-compose.yml +++ /dev/null @@ -1,162 +0,0 @@ -services: - safeline-mgt: - container_name: ${CONTAINER_NAME}-mgt - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt:7.3.1 - volumes: - - /etc/localtime:/etc/localtime:ro - - ${SAFELINE_DIR}/resources/mgt:/app/data - - ${SAFELINE_DIR}/logs/nginx:/app/log/nginx:z - - ${SAFELINE_DIR}/resources/sock:/app/sock - - /var/run:/app/run - ports: - - ${PANEL_APP_PORT_HTTP:-9443}:1443 - healthcheck: - test: curl -k -f https://localhost:1443/api/open/health - environment: - - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable - logging: - options: - max-size: "100m" - max-file: "5" - depends_on: - - safeline-pg - - safeline-fvm - labels: - createdBy: Apps - - safeline-detector: - container_name: ${CONTAINER_NAME}-detector - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:7.3.1 - volumes: - - ${SAFELINE_DIR}/resources/detector:/resources/detector - - ${SAFELINE_DIR}/logs/detector:/logs/detector - - /etc/localtime:/etc/localtime:ro - environment: - - LOG_DIR=/logs/detector - labels: - createdBy: Apps - - safeline-tengine: - container_name: ${CONTAINER_NAME}-tengine - restart: always - image: chaitin/safeline-tengine:7.3.1 - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/resolv.conf:/etc/resolv.conf:ro - - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - - ${SAFELINE_DIR}/resources/detector:/resources/detector - - ${SAFELINE_DIR}/resources/chaos:/resources/chaos - - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx:z - - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache - - ${SAFELINE_DIR}/resources/sock:/app/sock - environment: - - TCD_MGT_API=https://${SUBNET_PREFIX}.4:1443/api/open/publish/server - - SNSERVER_ADDR=${SUBNET_PREFIX}.5:8000 - ulimits: - nofile: 131072 - network_mode: host - labels: - createdBy: Apps - - safeline-luigi: - container_name: ${CONTAINER_NAME}-luigi - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.7 - image: chaitin/safeline-luigi:7.3.1 - volumes: - - /etc/localtime:/etc/localtime:ro - - ${SAFELINE_DIR}/resources/luigi:/app/data - - ${SAFELINE_DIR}/logs/nginx:/app/log/nginx:z - environment: - - MGT_IP=${SUBNET_PREFIX}.4 - logging: - options: - max-size: "100m" - max-file: "5" - depends_on: - - safeline-detector - - safeline-mgt - labels: - createdBy: Apps - - safeline-fvm: - container_name: ${CONTAINER_NAME}-fvm - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm:7.3.1 - volumes: - - /etc/localtime:/etc/localtime:ro - logging: - options: - max-size: "100m" - max-file: "5" - labels: - createdBy: Apps - - safeline-pg: - container_name: ${CONTAINER_NAME}-pg - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.2 - image: postgres:15.8 - volumes: - - ${SAFELINE_DIR}/resources/postgres/data:/var/lib/postgresql/data - - /etc/localtime:/etc/localtime:ro - environment: - - POSTGRES_USER=safeline-ce - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - command: [postgres, -c, max_connections=600] - healthcheck: - test: pg_isready -U safeline-ce -d safeline-ce - labels: - createdBy: Apps - - safeline-chaos: - container_name: ${CONTAINER_NAME}-chaos - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.10 - image: chaitin/safeline-chaos:7.3.1 - logging: - options: - max-size: "100m" - max-file: "5" - volumes: - - ${SAFELINE_DIR}/resources/sock:/app/sock - - ${SAFELINE_DIR}/resources/chaos:/app/chaos - labels: - createdBy: Apps - -networks: - 1panel-network: - external: true - safeline-ce: - name: safeline-ce - driver: bridge - ipam: - driver: default - config: - - gateway: ${SUBNET_PREFIX:?SUBNET_PREFIX required}.1 - subnet: ${SUBNET_PREFIX}.0/24 - driver_opts: - com.docker.network.bridge.name: safeline-ce \ No newline at end of file diff --git a/apps/safeline/7.6.2/.env.sample b/apps/safeline/7.6.2/.env.sample deleted file mode 100644 index b7379d9d2..000000000 --- a/apps/safeline/7.6.2/.env.sample +++ /dev/null @@ -1,5 +0,0 @@ -CONTAINER_NAME="safeline" -PANEL_APP_PORT_HTTP="40080" -POSTGRES_PASSWORD="password_xxJdZD" -SAFELINE_DIR="./data" -SUBNET_PREFIX="172.18.0" diff --git a/apps/safeline/7.6.2/data.yml b/apps/safeline/7.6.2/data.yml deleted file mode 100644 index 77b259caa..000000000 --- a/apps/safeline/7.6.2/data.yml +++ /dev/null @@ -1,32 +0,0 @@ -additionalProperties: - formFields: - - default: "" - edit: true - envKey: POSTGRES_PASSWORD - labelEn: Postgres database User Password - labelZh: Postgres数据库密码 - required: true - rule: paramCommon - type: password - - default: 40080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number - - default: ./data - edit: true - envKey: SAFELINE_DIR - labelEn: Data storage folder - labelZh: 数据存放文件夹 - required: true - type: text - - default: 172.18.0 - edit: true - envKey: SUBNET_PREFIX - labelEn: 1panel-network subnet prefix (Check the docker network to get it) - labelZh: 1panel-network 子网前缀 (查看docker网络获取) - required: true - type: text diff --git a/apps/safeline/7.6.2/docker-compose.yml b/apps/safeline/7.6.2/docker-compose.yml deleted file mode 100644 index fa1c1fd8b..000000000 --- a/apps/safeline/7.6.2/docker-compose.yml +++ /dev/null @@ -1,167 +0,0 @@ -services: - safeline-mgt: - container_name: ${CONTAINER_NAME}-mgt - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt:7.6.2 - volumes: - - /etc/localtime:/etc/localtime:ro - - ${SAFELINE_DIR}/resources/mgt:/app/data - - ${SAFELINE_DIR}/logs/nginx:/app/log/nginx:z - - ${SAFELINE_DIR}/resources/sock:/app/sock - - /var/run:/app/run - ports: - - ${PANEL_APP_PORT_HTTP:-9443}:1443 - healthcheck: - test: curl -k -f https://localhost:1443/api/open/health - environment: - - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable - logging: - options: - max-size: "100m" - max-file: "5" - depends_on: - - safeline-pg - - safeline-fvm - labels: - createdBy: Apps - - safeline-detector: - container_name: ${CONTAINER_NAME}-detector - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:7.6.2 - volumes: - - ${SAFELINE_DIR}/resources/detector:/resources/detector - - ${SAFELINE_DIR}/logs/detector:/logs/detector - - /etc/localtime:/etc/localtime:ro - environment: - - LOG_DIR=/logs/detector - labels: - createdBy: Apps - - safeline-tengine: - container_name: ${CONTAINER_NAME}-tengine - restart: always - image: chaitin/safeline-tengine:7.6.2 - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/resolv.conf:/etc/resolv.conf:ro - - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - - ${SAFELINE_DIR}/resources/detector:/resources/detector - - ${SAFELINE_DIR}/resources/chaos:/resources/chaos - - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx:z - - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache - - ${SAFELINE_DIR}/resources/sock:/app/sock - environment: - - TCD_MGT_API=https://${SUBNET_PREFIX}.4:1443/api/open/publish/server - - TCD_SNSERVER=${SUBNET_PREFIX}.5:8000 - - SNSERVER_ADDR=${SUBNET_PREFIX}.5:8000 - - CHAOS_ADDR=${SUBNET_PREFIX}.10 - ulimits: - nofile: 131072 - network_mode: host - labels: - createdBy: Apps - - safeline-luigi: - container_name: ${CONTAINER_NAME}-luigi - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.7 - image: chaitin/safeline-luigi:7.6.2 - volumes: - - /etc/localtime:/etc/localtime:ro - - ${SAFELINE_DIR}/resources/luigi:/app/data - - ${SAFELINE_DIR}/logs/nginx:/app/log/nginx:z - environment: - - MGT_IP=${SUBNET_PREFIX}.4 - - LUIGI_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable - logging: - options: - max-size: "100m" - max-file: "5" - depends_on: - - safeline-detector - - safeline-mgt - labels: - createdBy: Apps - - safeline-fvm: - container_name: ${CONTAINER_NAME}-fvm - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm:7.6.2 - volumes: - - /etc/localtime:/etc/localtime:ro - logging: - options: - max-size: "100m" - max-file: "5" - labels: - createdBy: Apps - - safeline-pg: - container_name: ${CONTAINER_NAME}-pg - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.2 - image: safeline-postgres:15.2 - volumes: - - ${SAFELINE_DIR}/resources/postgres/data:/var/lib/postgresql/data - - /etc/localtime:/etc/localtime:ro - environment: - - POSTGRES_USER=safeline-ce - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - command: [postgres, -c, max_connections=600] - healthcheck: - test: pg_isready -U safeline-ce -d safeline-ce - labels: - createdBy: Apps - - safeline-chaos: - container_name: ${CONTAINER_NAME}-chaos - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.10 - image: chaitin/safeline-chaos:7.6.2 - logging: - options: - max-size: "100m" - max-file: "5" - volumes: - - ${SAFELINE_DIR}/resources/sock:/app/sock - - ${SAFELINE_DIR}/resources/chaos:/app/chaos - environment: - - DB_ADDR=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable - labels: - createdBy: Apps - -networks: - 1panel-network: - external: true - safeline-ce: - name: safeline-ce - driver: bridge - ipam: - driver: default - config: - - gateway: ${SUBNET_PREFIX:?SUBNET_PREFIX required}.1 - subnet: ${SUBNET_PREFIX}.0/24 - driver_opts: - com.docker.network.bridge.name: safeline-ce \ No newline at end of file diff --git a/apps/spark-free-api/latest/data.yml b/apps/spark-free-api/0.0.10/data.yml similarity index 100% rename from apps/spark-free-api/latest/data.yml rename to apps/spark-free-api/0.0.10/data.yml diff --git a/apps/spark-free-api/latest/docker-compose.yml b/apps/spark-free-api/0.0.10/docker-compose.yml similarity index 88% rename from apps/spark-free-api/latest/docker-compose.yml rename to apps/spark-free-api/0.0.10/docker-compose.yml index 7bb5dcb9a..ceb3925ce 100644 --- a/apps/spark-free-api/latest/docker-compose.yml +++ b/apps/spark-free-api/0.0.10/docker-compose.yml @@ -1,6 +1,6 @@ services: spark-free-api: - image: vinlic/spark-free-api:latest + image: vinlic/spark-free-api:0.0.10 container_name: ${CONTAINER_NAME} ports: - ${PANEL_APP_PORT_HTTP}:8000 diff --git a/apps/step-free-api/latest/data.yml b/apps/step-free-api/0.0.20/data.yml similarity index 100% rename from apps/step-free-api/latest/data.yml rename to apps/step-free-api/0.0.20/data.yml diff --git a/apps/step-free-api/latest/docker-compose.yml b/apps/step-free-api/0.0.20/docker-compose.yml similarity index 89% rename from apps/step-free-api/latest/docker-compose.yml rename to apps/step-free-api/0.0.20/docker-compose.yml index 467a7840c..7ffc61568 100644 --- a/apps/step-free-api/latest/docker-compose.yml +++ b/apps/step-free-api/0.0.20/docker-compose.yml @@ -1,6 +1,6 @@ services: step-free-api: - image: vinlic/step-free-api:latest + image: vinlic/step-free-api:0.0.20 container_name: ${CONTAINER_NAME} ports: - ${PANEL_APP_PORT_HTTP}:8000 diff --git a/apps/wud/latest/data.yml b/apps/wud/8.0.1/data.yml similarity index 100% rename from apps/wud/latest/data.yml rename to apps/wud/8.0.1/data.yml diff --git a/apps/wud/latest/docker-compose.yml b/apps/wud/8.0.1/docker-compose.yml similarity index 91% rename from apps/wud/latest/docker-compose.yml rename to apps/wud/8.0.1/docker-compose.yml index d5501f418..2e282c523 100644 --- a/apps/wud/latest/docker-compose.yml +++ b/apps/wud/8.0.1/docker-compose.yml @@ -1,6 +1,6 @@ services: whatsupdocker: - image: getwud/wud:latest + image: getwud/wud:8.0.1 container_name: ${CONTAINER_NAME} ports: - ${PANEL_APP_PORT_HTTP}:3000 diff --git a/apps/xiaomusic/0.3.82/data.yml b/apps/xiaomusic/0.3.83/data.yml similarity index 93% rename from apps/xiaomusic/0.3.82/data.yml rename to apps/xiaomusic/0.3.83/data.yml index eb9347411..1b70776eb 100644 --- a/apps/xiaomusic/0.3.82/data.yml +++ b/apps/xiaomusic/0.3.83/data.yml @@ -1,6 +1,6 @@ additionalProperties: formFields: - - default: "${APP_DATA}/music" + - default: "./data" edit: true envKey: "APP_DATA" labelEn: "Data Storage Path" diff --git a/apps/xiaomusic/0.3.82/docker-compose.yml b/apps/xiaomusic/0.3.83/docker-compose.yml similarity index 89% rename from apps/xiaomusic/0.3.82/docker-compose.yml rename to apps/xiaomusic/0.3.83/docker-compose.yml index 93bad2780..91054c24c 100644 --- a/apps/xiaomusic/0.3.82/docker-compose.yml +++ b/apps/xiaomusic/0.3.83/docker-compose.yml @@ -1,6 +1,6 @@ services: xiaomusic: - image: hanxi/xiaomusic:latest + image: hanxi/xiaomusic:v0.3.83 container_name: xiaomusic restart: unless-stopped ports: