diff --git a/appstore/affine/stable-e98f035/.env b/appstore/affine/stable-e98f035/.env new file mode 100644 index 000000000..33fc7661a --- /dev/null +++ b/appstore/affine/stable-e98f035/.env @@ -0,0 +1,66 @@ +# Postgres 服务 (前置检查) [必填] +PANEL_POSTGRES_TYPE=postgresql + +# Redis 服务 (前置检查) [必填] +PANEL_REDIS_TYPE=redis + +# 数据持久化路径 [必填] +AFFINE_ROOT_PATH=/home/affine + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3010 + +# 通讯端口 [必填] +PANEL_APP_PORT_COMMUNICATION=5555 + +# 服务外部地址 [必填] +AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 + +# 是否启用 HTTPS [必填] +AFFINE_SERVER_HTTPS=false + +# SMTP 服务器地址 [必填] +MAILER_HOST=smtp.163.com + +# SMTP 服务器端口 [必填] +MAILER_PORT=465 + +# 邮件发送者 [必填] +MAILER_SENDER= + +# SMTP 用户名 [必填] +MAILER_USER= + +# SMTP 密码 [必填] +MAILER_PASSWORD= + +# 数据库 主机地址 [必填] +POSTGRES_HOST=127.0.0.1 + +# 数据库 端口 [必填] +POSTGRES_PORT=5432 + +# 数据库 名称 [必填] +POSTGRES_NAME=affine + +# 数据库 用户名 [必填] +POSTGRES_USER=affine + +# 数据库 密码 [必填] +POSTGRES_PASSWORD= + +# Redis 主机 [必填] +REDIS_SERVER_HOST=127.0.0.1 + +# Redis 端口 [必填] +REDIS_SERVER_PORT=6379 + +# Redis 索引 (0-20) [必填] +REDIS_SERVER_DATABASE=0 + +# Redis 用户 +REDIS_SERVER_USER= + +# Redis 密码 +REDIS_SERVER_PASSWORD= + diff --git a/appstore/affine/stable-e98f035/data.yml b/appstore/affine/stable-e98f035/data.yml new file mode 100644 index 000000000..bb37886e6 --- /dev/null +++ b/appstore/affine/stable-e98f035/data.yml @@ -0,0 +1,183 @@ +additionalProperties: + formFields: + - 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 + - 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 + - default: "/home/affine" + edit: true + envKey: AFFINE_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 3010 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: 5555 + edit: true + envKey: PANEL_APP_PORT_COMMUNICATION + labelZh: 通讯端口 + labelEn: Communication port + required: true + rule: paramPort + type: number + - default: "http://127.0.0.1:3010" + edit: true + envKey: AFFINE_SERVER_EXTERNAL_URL + labelZh: 服务外部地址 + labelEn: Service external address + required: true + type: text + - default: "false" + edit: true + envKey: AFFINE_SERVER_HTTPS + labelZh: 是否启用 HTTPS + labelEn: Enable HTTPS + required: true + type: select + values: + - label: 已开启 + value: "true" + - label: 未开启 + value: "false" + - default: "smtp.163.com" + edit: true + envKey: MAILER_HOST + labelZh: SMTP 服务器地址 + labelEn: SMTP server address + required: true + type: text + - default: 465 + edit: true + envKey: MAILER_PORT + labelZh: SMTP 服务器端口 + labelEn: SMTP server port + required: true + rule: paramPort + type: number + - default: "" + edit: true + envKey: MAILER_SENDER + labelZh: 邮件发送者 + labelEn: Email sender + required: true + type: text + - default: "" + edit: true + envKey: MAILER_USER + labelZh: SMTP 用户名 + labelEn: SMTP username + required: true + type: text + - default: "" + edit: true + envKey: MAILER_PASSWORD + labelZh: SMTP 密码 + labelEn: SMTP password + required: true + type: password + - default: "127.0.0.1" + edit: true + envKey: POSTGRES_HOST + labelZh: 数据库 主机地址 + labelEn: Database Host + required: true + type: text + - default: 5432 + edit: true + envKey: POSTGRES_PORT + labelZh: 数据库 端口 + labelEn: Database Port + required: true + rule: paramPort + type: number + - default: "affine" + edit: true + envKey: POSTGRES_NAME + labelZh: 数据库 名称 + labelEn: Database Name + required: true + rule: paramCommon + type: text + - default: "affine" + edit: true + envKey: POSTGRES_USER + labelZh: 数据库 用户名 + labelEn: Database Username + required: true + type: text + - default: "" + edit: true + envKey: POSTGRES_PASSWORD + labelZh: 数据库 密码 + labelEn: Database Password + random: true + required: true + rule: paramComplexity + type: password + - default: "127.0.0.1" + edit: true + envKey: REDIS_SERVER_HOST + labelZh: Redis 主机 + labelEn: Redis Host + required: true + type: text + - default: 6379 + edit: true + envKey: REDIS_SERVER_PORT + labelZh: Redis 端口 + labelEn: Redis Port + required: true + rule: paramPort + type: number + - default: 0 + edit: true + envKey: REDIS_SERVER_DATABASE + labelZh: Redis 索引 (0-20) + labelEn: Redis Index (0-20) + required: true + type: number + - default: "" + edit: true + envKey: REDIS_SERVER_USER + labelZh: Redis 用户 + labelEn: Redis User + required: false + type: text + - default: "" + edit: true + envKey: REDIS_SERVER_PASSWORD + labelZh: Redis 密码 + labelEn: Redis Password + required: false + type: password diff --git a/appstore/affine/stable-e98f035/docker-compose.yml b/appstore/affine/stable-e98f035/docker-compose.yml new file mode 100644 index 000000000..94a383ee2 --- /dev/null +++ b/appstore/affine/stable-e98f035/docker-compose.yml @@ -0,0 +1,36 @@ +networks: + 1panel-network: + external: true +services: + affine: + command: + - sh + - -c + - node ./scripts/self-host-predeploy && node ./dist/index.js + container_name: affine + env_file: + - ./envs/global.env + - .env + environment: + - NODE_OPTIONS="--import=./scripts/register.js" + - AFFINE_CONFIG_PATH=/root/.affine/config + - REDIS_SERVER_HOST=redis + - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_NAME} + - NODE_ENV=production + - TELEMETRY_ENABLE=false + - AFFINE_SERVER_HOST=localhost + - AFFINE_SERVER_PORT=3010 + - AFFINE_SERVER_HTTPS=false + - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 + image: ghcr.io/toeverything/affine-graphql:stable-e98f035 + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:3010 + - ${PANEL_APP_PORT_COMMUNICATION}:5555 + restart: always + volumes: + - ${AFFINE_ROOT_PATH}/config:/root/.affine/config + - ${AFFINE_ROOT_PATH}/storage:/root/.affine/storage diff --git a/appstore/movie-pilot/2.7.6/envs/default.env b/appstore/affine/stable-e98f035/envs/default.env similarity index 100% rename from appstore/movie-pilot/2.7.6/envs/default.env rename to appstore/affine/stable-e98f035/envs/default.env diff --git a/appstore/movie-pilot/2.7.6/envs/global.env b/appstore/affine/stable-e98f035/envs/global.env similarity index 100% rename from appstore/movie-pilot/2.7.6/envs/global.env rename to appstore/affine/stable-e98f035/envs/global.env diff --git a/appstore/affine/stable-e98f035/scripts/init.sh b/appstore/affine/stable-e98f035/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/affine/stable-e98f035/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/movie-pilot/2.7.6/scripts/uninstall.sh b/appstore/affine/stable-e98f035/scripts/uninstall.sh similarity index 100% rename from appstore/movie-pilot/2.7.6/scripts/uninstall.sh rename to appstore/affine/stable-e98f035/scripts/uninstall.sh diff --git a/appstore/affine/stable-e98f035/scripts/upgrade.sh b/appstore/affine/stable-e98f035/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/affine/stable-e98f035/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/movie-pilot/2.7.6/.env b/appstore/movie-pilot/2.7.7/.env similarity index 100% rename from appstore/movie-pilot/2.7.6/.env rename to appstore/movie-pilot/2.7.7/.env diff --git a/appstore/movie-pilot/2.7.6/data.yml b/appstore/movie-pilot/2.7.7/data.yml similarity index 100% rename from appstore/movie-pilot/2.7.6/data.yml rename to appstore/movie-pilot/2.7.7/data.yml diff --git a/appstore/movie-pilot/2.7.6/docker-compose.yml b/appstore/movie-pilot/2.7.7/docker-compose.yml similarity index 96% rename from appstore/movie-pilot/2.7.6/docker-compose.yml rename to appstore/movie-pilot/2.7.7/docker-compose.yml index 2e1d2d2e1..64638cfcb 100644 --- a/appstore/movie-pilot/2.7.6/docker-compose.yml +++ b/appstore/movie-pilot/2.7.7/docker-compose.yml @@ -13,7 +13,7 @@ services: - DEBUG=false - DEV=false - LOG_LEVEL=INFO - image: jxxghp/moviepilot:2.7.6 + image: jxxghp/moviepilot:2.7.7 labels: createdBy: Apps logging: diff --git a/appstore/siyuan/3.2.1/envs/default.env b/appstore/movie-pilot/2.7.7/envs/default.env similarity index 100% rename from appstore/siyuan/3.2.1/envs/default.env rename to appstore/movie-pilot/2.7.7/envs/default.env diff --git a/appstore/siyuan/3.2.1/envs/global.env b/appstore/movie-pilot/2.7.7/envs/global.env similarity index 100% rename from appstore/siyuan/3.2.1/envs/global.env rename to appstore/movie-pilot/2.7.7/envs/global.env diff --git a/appstore/movie-pilot/2.7.6/scripts/init.sh b/appstore/movie-pilot/2.7.7/scripts/init.sh similarity index 100% rename from appstore/movie-pilot/2.7.6/scripts/init.sh rename to appstore/movie-pilot/2.7.7/scripts/init.sh diff --git a/appstore/siyuan/3.2.1/scripts/uninstall.sh b/appstore/movie-pilot/2.7.7/scripts/uninstall.sh similarity index 100% rename from appstore/siyuan/3.2.1/scripts/uninstall.sh rename to appstore/movie-pilot/2.7.7/scripts/uninstall.sh diff --git a/appstore/movie-pilot/2.7.6/scripts/upgrade.sh b/appstore/movie-pilot/2.7.7/scripts/upgrade.sh similarity index 100% rename from appstore/movie-pilot/2.7.6/scripts/upgrade.sh rename to appstore/movie-pilot/2.7.7/scripts/upgrade.sh diff --git a/appstore/siyuan/3.2.1/.env b/appstore/siyuan/3.3.0/.env similarity index 100% rename from appstore/siyuan/3.2.1/.env rename to appstore/siyuan/3.3.0/.env diff --git a/appstore/siyuan/3.2.1/data.yml b/appstore/siyuan/3.3.0/data.yml similarity index 100% rename from appstore/siyuan/3.2.1/data.yml rename to appstore/siyuan/3.3.0/data.yml diff --git a/appstore/siyuan/3.2.1/docker-compose.yml b/appstore/siyuan/3.3.0/docker-compose.yml similarity index 93% rename from appstore/siyuan/3.2.1/docker-compose.yml rename to appstore/siyuan/3.3.0/docker-compose.yml index 277c1a64f..660059f93 100644 --- a/appstore/siyuan/3.2.1/docker-compose.yml +++ b/appstore/siyuan/3.3.0/docker-compose.yml @@ -11,7 +11,7 @@ services: - ./envs/global.env environment: - RUN_IN_CONTAINER=true - image: b3log/siyuan:v3.2.1 + image: b3log/siyuan:v3.3.0 labels: createdBy: Apps networks: diff --git a/dockge/movie-pilot_2_7_3/envs/default.env b/appstore/siyuan/3.3.0/envs/default.env similarity index 100% rename from dockge/movie-pilot_2_7_3/envs/default.env rename to appstore/siyuan/3.3.0/envs/default.env diff --git a/dockge/movie-pilot_2_7_3/envs/global.env b/appstore/siyuan/3.3.0/envs/global.env similarity index 100% rename from dockge/movie-pilot_2_7_3/envs/global.env rename to appstore/siyuan/3.3.0/envs/global.env diff --git a/appstore/siyuan/3.2.1/scripts/init.sh b/appstore/siyuan/3.3.0/scripts/init.sh similarity index 100% rename from appstore/siyuan/3.2.1/scripts/init.sh rename to appstore/siyuan/3.3.0/scripts/init.sh diff --git a/appstore/siyuan/3.2.1/scripts/upgrade.sh b/appstore/siyuan/3.3.0/scripts/uninstall.sh similarity index 100% rename from appstore/siyuan/3.2.1/scripts/upgrade.sh rename to appstore/siyuan/3.3.0/scripts/uninstall.sh diff --git a/appstore/siyuan/3.3.0/scripts/upgrade.sh b/appstore/siyuan/3.3.0/scripts/upgrade.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/appstore/siyuan/3.3.0/scripts/upgrade.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/dockge/affine/docker-compose.yml b/dockge/affine/docker-compose.yml index 18926413f..94a383ee2 100644 --- a/dockge/affine/docker-compose.yml +++ b/dockge/affine/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-1623f5d + image: ghcr.io/toeverything/affine-graphql:stable-e98f035 labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-1623f5d/.env b/dockge/affine_stable-1623f5d/.env new file mode 100644 index 000000000..33fc7661a --- /dev/null +++ b/dockge/affine_stable-1623f5d/.env @@ -0,0 +1,66 @@ +# Postgres 服务 (前置检查) [必填] +PANEL_POSTGRES_TYPE=postgresql + +# Redis 服务 (前置检查) [必填] +PANEL_REDIS_TYPE=redis + +# 数据持久化路径 [必填] +AFFINE_ROOT_PATH=/home/affine + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3010 + +# 通讯端口 [必填] +PANEL_APP_PORT_COMMUNICATION=5555 + +# 服务外部地址 [必填] +AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 + +# 是否启用 HTTPS [必填] +AFFINE_SERVER_HTTPS=false + +# SMTP 服务器地址 [必填] +MAILER_HOST=smtp.163.com + +# SMTP 服务器端口 [必填] +MAILER_PORT=465 + +# 邮件发送者 [必填] +MAILER_SENDER= + +# SMTP 用户名 [必填] +MAILER_USER= + +# SMTP 密码 [必填] +MAILER_PASSWORD= + +# 数据库 主机地址 [必填] +POSTGRES_HOST=127.0.0.1 + +# 数据库 端口 [必填] +POSTGRES_PORT=5432 + +# 数据库 名称 [必填] +POSTGRES_NAME=affine + +# 数据库 用户名 [必填] +POSTGRES_USER=affine + +# 数据库 密码 [必填] +POSTGRES_PASSWORD= + +# Redis 主机 [必填] +REDIS_SERVER_HOST=127.0.0.1 + +# Redis 端口 [必填] +REDIS_SERVER_PORT=6379 + +# Redis 索引 (0-20) [必填] +REDIS_SERVER_DATABASE=0 + +# Redis 用户 +REDIS_SERVER_USER= + +# Redis 密码 +REDIS_SERVER_PASSWORD= + diff --git a/dockge/affine_stable-1623f5d/docker-compose.yml b/dockge/affine_stable-1623f5d/docker-compose.yml new file mode 100644 index 000000000..18926413f --- /dev/null +++ b/dockge/affine_stable-1623f5d/docker-compose.yml @@ -0,0 +1,36 @@ +networks: + 1panel-network: + external: true +services: + affine: + command: + - sh + - -c + - node ./scripts/self-host-predeploy && node ./dist/index.js + container_name: affine + env_file: + - ./envs/global.env + - .env + environment: + - NODE_OPTIONS="--import=./scripts/register.js" + - AFFINE_CONFIG_PATH=/root/.affine/config + - REDIS_SERVER_HOST=redis + - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_NAME} + - NODE_ENV=production + - TELEMETRY_ENABLE=false + - AFFINE_SERVER_HOST=localhost + - AFFINE_SERVER_PORT=3010 + - AFFINE_SERVER_HTTPS=false + - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 + image: ghcr.io/toeverything/affine-graphql:stable-1623f5d + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:3010 + - ${PANEL_APP_PORT_COMMUNICATION}:5555 + restart: always + volumes: + - ${AFFINE_ROOT_PATH}/config:/root/.affine/config + - ${AFFINE_ROOT_PATH}/storage:/root/.affine/storage diff --git a/dockge/affine_stable-1623f5d/envs/default.env b/dockge/affine_stable-1623f5d/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/affine_stable-1623f5d/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/affine_stable-1623f5d/envs/global.env b/dockge/affine_stable-1623f5d/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/affine_stable-1623f5d/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/movie-pilot/.env b/dockge/movie-pilot/.env index 7e3047285..a66ae0c61 100644 --- a/dockge/movie-pilot/.env +++ b/dockge/movie-pilot/.env @@ -1,6 +1,3 @@ -# 网络模式 [必填] -NETWORK_MODE=1panel-network - # 数据持久化路径 [必填] MOVIEPILOT_ROOT_PATH=/home/movie-pilot @@ -20,7 +17,7 @@ API_TOKEN=moviepilot PROXY_HOST= # 自动更新资源包 [必填] -AUTO_UPDATE_RESOURCE=false +AUTO_UPDATE_RESOURCES=false # 自动更新 [必填] MOVIEPILOT_AUTO_UPDATE=false @@ -37,27 +34,105 @@ CUSTOM_MOUNT_DIRECTORY_3= # IYUU登录令牌 IYUU_SIGN= -# 缓存类型 [必填] -CACHE_BACKEND_TYPE=cachetools +# hhclub 用户名 +HHCLUB_USERNAME= -# 缓存连接地址 -CACHE_BACKEND_URL= +# hhclub 密钥 +HHCLUB_PASSKEY= -# 数据库类型 [必填] -DB_TYPE=sqlite +# audiences 用户ID +AUDIENCES_UID= -# 数据库 主机地址 -DB_POSTGRESQL_HOST=127.0.0.1 +# audiences 密钥 +AUDIENCES_PASSKEY= -# 数据库 端口 -DB_POSTGRESQL_PORT=5432 +# hddolby 用户ID +HDDOLBY_ID= -# 数据库 名称 -DB_POSTGRESQL_DATABASE=moviepilot +# hddolby 密钥 +HDDOLBY_PASSKEY= -# 数据库 用户名 -DB_POSTGRESQL_USERNAME=moviepilot +# zmpt 用户ID +ZMPT_UID= -# 数据库 密码 -DB_POSTGRESQL_PASSWORD= +# zmpt 密钥 +ZMPT_PASSKEY= + +# freefarm 用户ID +FREEFARM_UID= + +# freefarm 密钥 +FREEFARM_PASSKEY= + +# hdfans 用户ID +HDFANS_UID= + +# hdfans 密钥 +HDFANS_PASSKEY= + +# wintersakura 用户ID +WINTERSAKURA_UID= + +# wintersakura 密钥 +WINTERSAKURA_PASSKEY= + +# leaves 用户ID +LEAVES_UID= + +# leaves 密钥 +LEAVES_PASSKEY= + +# ptba 用户ID +PTBA_UID= + +# ptba 密钥 +PTBA_PASSKEY= + +# icc2022 用户ID +ICC2022_UID= + +# icc2022 密钥 +ICC2022_PASSKEY= + +# xingtan 用户ID +XINGTAN_UID= + +# xingtan 密钥 +XINGTAN_PASSKEY= + +# ptvicomo 用户ID +PTVICOMO_UID= + +# ptvicomo 密钥 +PTVICOMO_PASSKEY= + +# agsvpt 用户ID +AGSVPT_UID= + +# agsvpt 密钥 +AGSVPT_PASSKEY= + +# hdkyl 用户ID +HDKYL_UID= + +# hdkyl 密钥 +HDKYL_PASSKEY= + +# qingwa 用户ID +QINGWA_UID= + +# qingwa 密钥 +QINGWA_PASSKEY= + +# discfan 用户ID +DISCFAN_UID= + +# discfan 密钥 +DISCFAN_PASSKEY= + +# rousi 用户ID +ROUSI_UID= + +# rousi 密钥 +ROUSI_PASSKEY= diff --git a/dockge/movie-pilot/docker-compose.yml b/dockge/movie-pilot/docker-compose.yml index 2e1d2d2e1..648a415a9 100644 --- a/dockge/movie-pilot/docker-compose.yml +++ b/dockge/movie-pilot/docker-compose.yml @@ -6,24 +6,26 @@ services: container_name: movie-pilot env_file: - ./envs/global.env + - ./envs/movie-pilot.env - .env environment: - - NGINX_PORT=${PANEL_APP_PORT_HTTP} - - PORT=${PANEL_APP_PORT_API} - - DEBUG=false - - DEV=false - - LOG_LEVEL=INFO - image: jxxghp/moviepilot:2.7.6 + - NGINX_PORT=3000 + - PORT=3001 + - PUID=0 + - PGID=0 + - UMASK=022 + image: jxxghp/moviepilot:2.7.3 labels: createdBy: Apps logging: driver: json-file options: max-size: 5m - network_mode: ${NETWORK_MODE} + networks: + - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} + - ${PANEL_APP_PORT_HTTP}:3000 + - ${PANEL_APP_PORT_API}:3001 restart: always stdin_open: true tty: true diff --git a/dockge/movie-pilot_2_7_3/envs/movie-pilot.env b/dockge/movie-pilot/envs/movie-pilot.env similarity index 100% rename from dockge/movie-pilot_2_7_3/envs/movie-pilot.env rename to dockge/movie-pilot/envs/movie-pilot.env diff --git a/dockge/movie-pilot_2_7_3/.env b/dockge/movie-pilot_2_7_3/.env deleted file mode 100644 index a66ae0c61..000000000 --- a/dockge/movie-pilot_2_7_3/.env +++ /dev/null @@ -1,138 +0,0 @@ -# 数据持久化路径 [必填] -MOVIEPILOT_ROOT_PATH=/home/movie-pilot - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3000 - -# API 端口 [必填] -PANEL_APP_PORT_API=3001 - -# 管理员用户名 [必填] -SUPERUSER=admin - -# API 令牌 [必填] -API_TOKEN=moviepilot - -# 网络代理 -PROXY_HOST= - -# 自动更新资源包 [必填] -AUTO_UPDATE_RESOURCES=false - -# 自动更新 [必填] -MOVIEPILOT_AUTO_UPDATE=false - -# 自定义挂载目录 1 -CUSTOM_MOUNT_DIRECTORY_1= - -# 自定义挂载目录 2 -CUSTOM_MOUNT_DIRECTORY_2= - -# 自定义挂载目录 3 -CUSTOM_MOUNT_DIRECTORY_3= - -# IYUU登录令牌 -IYUU_SIGN= - -# hhclub 用户名 -HHCLUB_USERNAME= - -# hhclub 密钥 -HHCLUB_PASSKEY= - -# audiences 用户ID -AUDIENCES_UID= - -# audiences 密钥 -AUDIENCES_PASSKEY= - -# hddolby 用户ID -HDDOLBY_ID= - -# hddolby 密钥 -HDDOLBY_PASSKEY= - -# zmpt 用户ID -ZMPT_UID= - -# zmpt 密钥 -ZMPT_PASSKEY= - -# freefarm 用户ID -FREEFARM_UID= - -# freefarm 密钥 -FREEFARM_PASSKEY= - -# hdfans 用户ID -HDFANS_UID= - -# hdfans 密钥 -HDFANS_PASSKEY= - -# wintersakura 用户ID -WINTERSAKURA_UID= - -# wintersakura 密钥 -WINTERSAKURA_PASSKEY= - -# leaves 用户ID -LEAVES_UID= - -# leaves 密钥 -LEAVES_PASSKEY= - -# ptba 用户ID -PTBA_UID= - -# ptba 密钥 -PTBA_PASSKEY= - -# icc2022 用户ID -ICC2022_UID= - -# icc2022 密钥 -ICC2022_PASSKEY= - -# xingtan 用户ID -XINGTAN_UID= - -# xingtan 密钥 -XINGTAN_PASSKEY= - -# ptvicomo 用户ID -PTVICOMO_UID= - -# ptvicomo 密钥 -PTVICOMO_PASSKEY= - -# agsvpt 用户ID -AGSVPT_UID= - -# agsvpt 密钥 -AGSVPT_PASSKEY= - -# hdkyl 用户ID -HDKYL_UID= - -# hdkyl 密钥 -HDKYL_PASSKEY= - -# qingwa 用户ID -QINGWA_UID= - -# qingwa 密钥 -QINGWA_PASSKEY= - -# discfan 用户ID -DISCFAN_UID= - -# discfan 密钥 -DISCFAN_PASSKEY= - -# rousi 用户ID -ROUSI_UID= - -# rousi 密钥 -ROUSI_PASSKEY= - diff --git a/dockge/movie-pilot_2_7_7/.env b/dockge/movie-pilot_2_7_7/.env new file mode 100644 index 000000000..7e3047285 --- /dev/null +++ b/dockge/movie-pilot_2_7_7/.env @@ -0,0 +1,63 @@ +# 网络模式 [必填] +NETWORK_MODE=1panel-network + +# 数据持久化路径 [必填] +MOVIEPILOT_ROOT_PATH=/home/movie-pilot + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3000 + +# API 端口 [必填] +PANEL_APP_PORT_API=3001 + +# 管理员用户名 [必填] +SUPERUSER=admin + +# API 令牌 [必填] +API_TOKEN=moviepilot + +# 网络代理 +PROXY_HOST= + +# 自动更新资源包 [必填] +AUTO_UPDATE_RESOURCE=false + +# 自动更新 [必填] +MOVIEPILOT_AUTO_UPDATE=false + +# 自定义挂载目录 1 +CUSTOM_MOUNT_DIRECTORY_1= + +# 自定义挂载目录 2 +CUSTOM_MOUNT_DIRECTORY_2= + +# 自定义挂载目录 3 +CUSTOM_MOUNT_DIRECTORY_3= + +# IYUU登录令牌 +IYUU_SIGN= + +# 缓存类型 [必填] +CACHE_BACKEND_TYPE=cachetools + +# 缓存连接地址 +CACHE_BACKEND_URL= + +# 数据库类型 [必填] +DB_TYPE=sqlite + +# 数据库 主机地址 +DB_POSTGRESQL_HOST=127.0.0.1 + +# 数据库 端口 +DB_POSTGRESQL_PORT=5432 + +# 数据库 名称 +DB_POSTGRESQL_DATABASE=moviepilot + +# 数据库 用户名 +DB_POSTGRESQL_USERNAME=moviepilot + +# 数据库 密码 +DB_POSTGRESQL_PASSWORD= + diff --git a/dockge/movie-pilot_2_7_3/docker-compose.yml b/dockge/movie-pilot_2_7_7/docker-compose.yml similarity index 73% rename from dockge/movie-pilot_2_7_3/docker-compose.yml rename to dockge/movie-pilot_2_7_7/docker-compose.yml index 648a415a9..64638cfcb 100644 --- a/dockge/movie-pilot_2_7_3/docker-compose.yml +++ b/dockge/movie-pilot_2_7_7/docker-compose.yml @@ -6,26 +6,24 @@ services: container_name: movie-pilot env_file: - ./envs/global.env - - ./envs/movie-pilot.env - .env environment: - - NGINX_PORT=3000 - - PORT=3001 - - PUID=0 - - PGID=0 - - UMASK=022 - image: jxxghp/moviepilot:2.7.3 + - NGINX_PORT=${PANEL_APP_PORT_HTTP} + - PORT=${PANEL_APP_PORT_API} + - DEBUG=false + - DEV=false + - LOG_LEVEL=INFO + image: jxxghp/moviepilot:2.7.7 labels: createdBy: Apps logging: driver: json-file options: max-size: 5m - networks: - - 1panel-network + network_mode: ${NETWORK_MODE} ports: - - ${PANEL_APP_PORT_HTTP}:3000 - - ${PANEL_APP_PORT_API}:3001 + - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} + - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} restart: always stdin_open: true tty: true diff --git a/dockge/movie-pilot_2_7_7/envs/default.env b/dockge/movie-pilot_2_7_7/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/movie-pilot_2_7_7/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/movie-pilot_2_7_7/envs/global.env b/dockge/movie-pilot_2_7_7/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/movie-pilot_2_7_7/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/siyuan/docker-compose.yml b/dockge/siyuan/docker-compose.yml index 277c1a64f..660059f93 100644 --- a/dockge/siyuan/docker-compose.yml +++ b/dockge/siyuan/docker-compose.yml @@ -11,7 +11,7 @@ services: - ./envs/global.env environment: - RUN_IN_CONTAINER=true - image: b3log/siyuan:v3.2.1 + image: b3log/siyuan:v3.3.0 labels: createdBy: Apps networks: