diff --git a/appstore/ammds-ol8/1.6.55/.env b/appstore/ammds-ol8/1.6.56/.env similarity index 100% rename from appstore/ammds-ol8/1.6.55/.env rename to appstore/ammds-ol8/1.6.56/.env diff --git a/appstore/ammds-ol8/1.6.55/data.yml b/appstore/ammds-ol8/1.6.56/data.yml similarity index 100% rename from appstore/ammds-ol8/1.6.55/data.yml rename to appstore/ammds-ol8/1.6.56/data.yml diff --git a/appstore/ammds-ol8/1.6.55/docker-compose.yml b/appstore/ammds-ol8/1.6.56/docker-compose.yml similarity index 95% rename from appstore/ammds-ol8/1.6.55/docker-compose.yml rename to appstore/ammds-ol8/1.6.56/docker-compose.yml index 9dff85421..3d6e52a28 100644 --- a/appstore/ammds-ol8/1.6.55/docker-compose.yml +++ b/appstore/ammds-ol8/1.6.56/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080} - AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523} - image: qyg2297248353/ammds:v1.6.55-ol8 + image: qyg2297248353/ammds:v1.6.56-ol8 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/appstore/ammds-ol8/1.6.55/envs/default.env b/appstore/ammds-ol8/1.6.56/envs/default.env similarity index 100% rename from appstore/ammds-ol8/1.6.55/envs/default.env rename to appstore/ammds-ol8/1.6.56/envs/default.env diff --git a/appstore/ammds-ol8/1.6.55/envs/global.env b/appstore/ammds-ol8/1.6.56/envs/global.env similarity index 100% rename from appstore/ammds-ol8/1.6.55/envs/global.env rename to appstore/ammds-ol8/1.6.56/envs/global.env diff --git a/appstore/ammds-ol8/1.6.55/scripts/init.sh b/appstore/ammds-ol8/1.6.56/scripts/init.sh similarity index 100% rename from appstore/ammds-ol8/1.6.55/scripts/init.sh rename to appstore/ammds-ol8/1.6.56/scripts/init.sh diff --git a/appstore/ammds-ol8/1.6.55/scripts/uninstall.sh b/appstore/ammds-ol8/1.6.56/scripts/uninstall.sh similarity index 100% rename from appstore/ammds-ol8/1.6.55/scripts/uninstall.sh rename to appstore/ammds-ol8/1.6.56/scripts/uninstall.sh diff --git a/appstore/ammds-ol8/1.6.55/scripts/upgrade.sh b/appstore/ammds-ol8/1.6.56/scripts/upgrade.sh similarity index 100% rename from appstore/ammds-ol8/1.6.55/scripts/upgrade.sh rename to appstore/ammds-ol8/1.6.56/scripts/upgrade.sh diff --git a/appstore/ammds/1.6.55/.env b/appstore/ammds/1.6.56/.env similarity index 100% rename from appstore/ammds/1.6.55/.env rename to appstore/ammds/1.6.56/.env diff --git a/appstore/ammds/1.6.55/data.yml b/appstore/ammds/1.6.56/data.yml similarity index 100% rename from appstore/ammds/1.6.55/data.yml rename to appstore/ammds/1.6.56/data.yml diff --git a/appstore/ammds/1.6.55/docker-compose.yml b/appstore/ammds/1.6.56/docker-compose.yml similarity index 96% rename from appstore/ammds/1.6.55/docker-compose.yml rename to appstore/ammds/1.6.56/docker-compose.yml index 732ae49bf..75451c741 100644 --- a/appstore/ammds/1.6.55/docker-compose.yml +++ b/appstore/ammds/1.6.56/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080} - AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523} - image: qyg2297248353/ammds:v1.6.55 + image: qyg2297248353/ammds:v1.6.56 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/appstore/ammds/1.6.55/envs/default.env b/appstore/ammds/1.6.56/envs/default.env similarity index 100% rename from appstore/ammds/1.6.55/envs/default.env rename to appstore/ammds/1.6.56/envs/default.env diff --git a/appstore/ammds/1.6.55/envs/global.env b/appstore/ammds/1.6.56/envs/global.env similarity index 100% rename from appstore/ammds/1.6.55/envs/global.env rename to appstore/ammds/1.6.56/envs/global.env diff --git a/appstore/ammds/1.6.55/scripts/init.sh b/appstore/ammds/1.6.56/scripts/init.sh similarity index 100% rename from appstore/ammds/1.6.55/scripts/init.sh rename to appstore/ammds/1.6.56/scripts/init.sh diff --git a/appstore/ammds/1.6.55/scripts/uninstall.sh b/appstore/ammds/1.6.56/scripts/uninstall.sh similarity index 100% rename from appstore/ammds/1.6.55/scripts/uninstall.sh rename to appstore/ammds/1.6.56/scripts/uninstall.sh diff --git a/appstore/ammds/1.6.55/scripts/upgrade.sh b/appstore/ammds/1.6.56/scripts/upgrade.sh similarity index 100% rename from appstore/ammds/1.6.55/scripts/upgrade.sh rename to appstore/ammds/1.6.56/scripts/upgrade.sh diff --git a/appstore/ani-rss/3.0.11/.env b/appstore/ani-rss/3.0.12/.env similarity index 100% rename from appstore/ani-rss/3.0.11/.env rename to appstore/ani-rss/3.0.12/.env diff --git a/appstore/ani-rss/3.0.11/data.yml b/appstore/ani-rss/3.0.12/data.yml similarity index 100% rename from appstore/ani-rss/3.0.11/data.yml rename to appstore/ani-rss/3.0.12/data.yml diff --git a/appstore/ani-rss/3.0.11/docker-compose.yml b/appstore/ani-rss/3.0.12/docker-compose.yml similarity index 95% rename from appstore/ani-rss/3.0.11/docker-compose.yml rename to appstore/ani-rss/3.0.12/docker-compose.yml index 77826bc99..cf595f43b 100644 --- a/appstore/ani-rss/3.0.11/docker-compose.yml +++ b/appstore/ani-rss/3.0.12/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v3.0.11 + image: wushuo894/ani-rss:v3.0.12 labels: createdBy: Apps networks: diff --git a/appstore/ani-rss/3.0.11/envs/default.env b/appstore/ani-rss/3.0.12/envs/default.env similarity index 100% rename from appstore/ani-rss/3.0.11/envs/default.env rename to appstore/ani-rss/3.0.12/envs/default.env diff --git a/appstore/ani-rss/3.0.11/envs/global.env b/appstore/ani-rss/3.0.12/envs/global.env similarity index 100% rename from appstore/ani-rss/3.0.11/envs/global.env rename to appstore/ani-rss/3.0.12/envs/global.env diff --git a/appstore/ani-rss/3.0.11/scripts/init.sh b/appstore/ani-rss/3.0.12/scripts/init.sh similarity index 100% rename from appstore/ani-rss/3.0.11/scripts/init.sh rename to appstore/ani-rss/3.0.12/scripts/init.sh diff --git a/appstore/ani-rss/3.0.11/scripts/uninstall.sh b/appstore/ani-rss/3.0.12/scripts/uninstall.sh similarity index 100% rename from appstore/ani-rss/3.0.11/scripts/uninstall.sh rename to appstore/ani-rss/3.0.12/scripts/uninstall.sh diff --git a/appstore/ani-rss/3.0.11/scripts/upgrade.sh b/appstore/ani-rss/3.0.12/scripts/upgrade.sh similarity index 100% rename from appstore/ani-rss/3.0.11/scripts/upgrade.sh rename to appstore/ani-rss/3.0.12/scripts/upgrade.sh diff --git a/appstore/dujiaonext/0.1.1/.env b/appstore/dujiaonext/0.1.1/.env index e77160ab5..19fc5f516 100644 --- a/appstore/dujiaonext/0.1.1/.env +++ b/appstore/dujiaonext/0.1.1/.env @@ -34,6 +34,3 @@ REDIS_PORT=6379 # Redis 连接密码 REDIS_PASSWORD= -# Redis 数据库索引 [必填] -REDIS_DB=0 - diff --git a/appstore/dujiaonext/0.1.1/config/config.yml b/appstore/dujiaonext/0.1.1/config/config.yml index f5d0712de..ff3e3ade3 100644 --- a/appstore/dujiaonext/0.1.1/config/config.yml +++ b/appstore/dujiaonext/0.1.1/config/config.yml @@ -13,7 +13,7 @@ log: database: driver: sqlite - dsn: ./db/dujiao.db + dsn: ./db/dujiao.db?_busy_timeout=5000&_journal_mode=WAL&_synchronous=NORMAL pool: max_open_conns: 1 max_idle_conns: 1 @@ -21,20 +21,17 @@ database: conn_max_idle_time_seconds: 0 jwt: - secret: your-secret-key-change-in-production-please + secret: "dev-admin-jwt-secret-change-me-please-32chars" expire_hours: 24 user_jwt: - secret: user-secret-key-change-in-production-please + secret: "dev-user-jwt-secret-change-me-please-32chars" expire_hours: 24 remember_me_expire_hours: 168 -telegram_auth: - enabled: false - bot_username: "" - bot_token: "" - login_expire_seconds: 300 - replay_ttl_seconds: 300 +bootstrap: + default_admin_username: "" + default_admin_password: "" redis: enabled: true @@ -104,6 +101,13 @@ security: require_number: true require_special: false +telegram_auth: + enabled: false + bot_username: "" + bot_token: "" + login_expire_seconds: 300 + replay_ttl_seconds: 300 + email: enabled: true host: smtp.xxx.com diff --git a/appstore/dujiaonext/0.1.1/data.yml b/appstore/dujiaonext/0.1.1/data.yml index 37121984e..53148f87e 100644 --- a/appstore/dujiaonext/0.1.1/data.yml +++ b/appstore/dujiaonext/0.1.1/data.yml @@ -94,10 +94,3 @@ additionalProperties: labelEn: Redis Connection Password required: false type: password - - default: 0 - edit: true - envKey: REDIS_DB - labelZh: Redis 数据库索引 - labelEn: Redis Database Index - required: true - type: number diff --git a/appstore/dujiaonext/0.1.1/docker-compose.yml b/appstore/dujiaonext/0.1.1/docker-compose.yml index f4fb70ef1..4135cd21e 100644 --- a/appstore/dujiaonext/0.1.1/docker-compose.yml +++ b/appstore/dujiaonext/0.1.1/docker-compose.yml @@ -9,9 +9,6 @@ services: depends_on: dujiaonext-api: condition: service_healthy - env_file: - - ./envs/global.env - - .env environment: - TZ=Asia/Shanghai image: dujiaonext/admin:v0.1.1 @@ -30,7 +27,6 @@ services: - QUEUE_HOST=${REDIS_HOST:-} - QUEUE_PORT=${REDIS_PORT:-} - QUEUE_PASSWORD=${REDIS_PASSWORD:-} - - QUEUE_DB=${REDIS_DB:-} healthcheck: interval: 10s retries: 10 @@ -58,9 +54,6 @@ services: depends_on: dujiaonext-api: condition: service_healthy - env_file: - - ./envs/global.env - - .env environment: - TZ=Asia/Shanghai image: dujiaonext/user:v0.1.1 diff --git a/appstore/dujiaonext/0.1.1/scripts/init.sh b/appstore/dujiaonext/0.1.1/scripts/init.sh index 9949f675a..e875889bd 100644 --- a/appstore/dujiaonext/0.1.1/scripts/init.sh +++ b/appstore/dujiaonext/0.1.1/scripts/init.sh @@ -21,7 +21,7 @@ if [ -f .env ]; then cp ./config/config.yml "$DUJIAONEXT_ROOT_PATH/config/config.yml" - chmod -R 777 "$DUJIAONEXT_ROOT_PATH/data" + chmod -R 0777 "$DUJIAONEXT_ROOT_PATH" echo "Check Finish." diff --git a/appstore/ollama/0.18.0/.env b/appstore/ollama/0.18.1/.env similarity index 100% rename from appstore/ollama/0.18.0/.env rename to appstore/ollama/0.18.1/.env diff --git a/appstore/ollama/0.18.0/data.yml b/appstore/ollama/0.18.1/data.yml similarity index 100% rename from appstore/ollama/0.18.0/data.yml rename to appstore/ollama/0.18.1/data.yml diff --git a/appstore/ollama/0.18.0/docker-compose.yml b/appstore/ollama/0.18.1/docker-compose.yml similarity index 95% rename from appstore/ollama/0.18.0/docker-compose.yml rename to appstore/ollama/0.18.1/docker-compose.yml index 7dac5b40a..570d903ea 100644 --- a/appstore/ollama/0.18.0/docker-compose.yml +++ b/appstore/ollama/0.18.1/docker-compose.yml @@ -18,7 +18,7 @@ services: - OLLAMA_MAX_QUEUE=512 - OLLAMA_FLASH_ATTENTION=0 - OLLAMA_KV_CACHE_TYPE=f16 - image: ollama/ollama:0.18.0 + image: ollama/ollama:0.18.1 labels: createdBy: Apps networks: diff --git a/appstore/ollama/0.18.0/envs/default.env b/appstore/ollama/0.18.1/envs/default.env similarity index 100% rename from appstore/ollama/0.18.0/envs/default.env rename to appstore/ollama/0.18.1/envs/default.env diff --git a/appstore/ollama/0.18.0/envs/global.env b/appstore/ollama/0.18.1/envs/global.env similarity index 100% rename from appstore/ollama/0.18.0/envs/global.env rename to appstore/ollama/0.18.1/envs/global.env diff --git a/appstore/ollama/0.18.0/scripts/init.sh b/appstore/ollama/0.18.1/scripts/init.sh similarity index 100% rename from appstore/ollama/0.18.0/scripts/init.sh rename to appstore/ollama/0.18.1/scripts/init.sh diff --git a/appstore/ollama/0.18.0/scripts/uninstall.sh b/appstore/ollama/0.18.1/scripts/uninstall.sh similarity index 100% rename from appstore/ollama/0.18.0/scripts/uninstall.sh rename to appstore/ollama/0.18.1/scripts/uninstall.sh diff --git a/appstore/ollama/0.18.0/scripts/upgrade.sh b/appstore/ollama/0.18.1/scripts/upgrade.sh similarity index 100% rename from appstore/ollama/0.18.0/scripts/upgrade.sh rename to appstore/ollama/0.18.1/scripts/upgrade.sh diff --git a/dockge/ammds-ol8/docker-compose.yml b/dockge/ammds-ol8/docker-compose.yml index 9dff85421..3d6e52a28 100644 --- a/dockge/ammds-ol8/docker-compose.yml +++ b/dockge/ammds-ol8/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080} - AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523} - image: qyg2297248353/ammds:v1.6.55-ol8 + image: qyg2297248353/ammds:v1.6.56-ol8 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/dockge/ammds/docker-compose.yml b/dockge/ammds/docker-compose.yml index 732ae49bf..75451c741 100644 --- a/dockge/ammds/docker-compose.yml +++ b/dockge/ammds/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080} - AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523} - image: qyg2297248353/ammds:v1.6.55 + image: qyg2297248353/ammds:v1.6.56 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/dockge/ani-rss_3_0_11/.env b/dockge/ani-rss_3_0_12/.env similarity index 100% rename from dockge/ani-rss_3_0_11/.env rename to dockge/ani-rss_3_0_12/.env diff --git a/dockge/ani-rss_3_0_11/docker-compose.yml b/dockge/ani-rss_3_0_12/docker-compose.yml similarity index 95% rename from dockge/ani-rss_3_0_11/docker-compose.yml rename to dockge/ani-rss_3_0_12/docker-compose.yml index 77826bc99..cf595f43b 100644 --- a/dockge/ani-rss_3_0_11/docker-compose.yml +++ b/dockge/ani-rss_3_0_12/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v3.0.11 + image: wushuo894/ani-rss:v3.0.12 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_3_0_11/envs/default.env b/dockge/ani-rss_3_0_12/envs/default.env similarity index 100% rename from dockge/ani-rss_3_0_11/envs/default.env rename to dockge/ani-rss_3_0_12/envs/default.env diff --git a/dockge/ani-rss_3_0_11/envs/global.env b/dockge/ani-rss_3_0_12/envs/global.env similarity index 100% rename from dockge/ani-rss_3_0_11/envs/global.env rename to dockge/ani-rss_3_0_12/envs/global.env diff --git a/dockge/dujiaonext/.env b/dockge/dujiaonext/.env index e77160ab5..19fc5f516 100644 --- a/dockge/dujiaonext/.env +++ b/dockge/dujiaonext/.env @@ -34,6 +34,3 @@ REDIS_PORT=6379 # Redis 连接密码 REDIS_PASSWORD= -# Redis 数据库索引 [必填] -REDIS_DB=0 - diff --git a/dockge/dujiaonext/config/config.yml b/dockge/dujiaonext/config/config.yml index f5d0712de..ff3e3ade3 100644 --- a/dockge/dujiaonext/config/config.yml +++ b/dockge/dujiaonext/config/config.yml @@ -13,7 +13,7 @@ log: database: driver: sqlite - dsn: ./db/dujiao.db + dsn: ./db/dujiao.db?_busy_timeout=5000&_journal_mode=WAL&_synchronous=NORMAL pool: max_open_conns: 1 max_idle_conns: 1 @@ -21,20 +21,17 @@ database: conn_max_idle_time_seconds: 0 jwt: - secret: your-secret-key-change-in-production-please + secret: "dev-admin-jwt-secret-change-me-please-32chars" expire_hours: 24 user_jwt: - secret: user-secret-key-change-in-production-please + secret: "dev-user-jwt-secret-change-me-please-32chars" expire_hours: 24 remember_me_expire_hours: 168 -telegram_auth: - enabled: false - bot_username: "" - bot_token: "" - login_expire_seconds: 300 - replay_ttl_seconds: 300 +bootstrap: + default_admin_username: "" + default_admin_password: "" redis: enabled: true @@ -104,6 +101,13 @@ security: require_number: true require_special: false +telegram_auth: + enabled: false + bot_username: "" + bot_token: "" + login_expire_seconds: 300 + replay_ttl_seconds: 300 + email: enabled: true host: smtp.xxx.com diff --git a/dockge/dujiaonext/docker-compose.yml b/dockge/dujiaonext/docker-compose.yml index f4fb70ef1..4135cd21e 100644 --- a/dockge/dujiaonext/docker-compose.yml +++ b/dockge/dujiaonext/docker-compose.yml @@ -9,9 +9,6 @@ services: depends_on: dujiaonext-api: condition: service_healthy - env_file: - - ./envs/global.env - - .env environment: - TZ=Asia/Shanghai image: dujiaonext/admin:v0.1.1 @@ -30,7 +27,6 @@ services: - QUEUE_HOST=${REDIS_HOST:-} - QUEUE_PORT=${REDIS_PORT:-} - QUEUE_PASSWORD=${REDIS_PASSWORD:-} - - QUEUE_DB=${REDIS_DB:-} healthcheck: interval: 10s retries: 10 @@ -58,9 +54,6 @@ services: depends_on: dujiaonext-api: condition: service_healthy - env_file: - - ./envs/global.env - - .env environment: - TZ=Asia/Shanghai image: dujiaonext/user:v0.1.1 diff --git a/dockge/ollama/docker-compose.yml b/dockge/ollama/docker-compose.yml index 7dac5b40a..570d903ea 100644 --- a/dockge/ollama/docker-compose.yml +++ b/dockge/ollama/docker-compose.yml @@ -18,7 +18,7 @@ services: - OLLAMA_MAX_QUEUE=512 - OLLAMA_FLASH_ATTENTION=0 - OLLAMA_KV_CACHE_TYPE=f16 - image: ollama/ollama:0.18.0 + image: ollama/ollama:0.18.1 labels: createdBy: Apps networks: