diff --git a/apps/astrbot-napcat/4.17.52/docker-compose.yml b/apps/astrbot-napcat/4.17.52/docker-compose.yml index e6ea29013..da139618a 100644 --- a/apps/astrbot-napcat/4.17.52/docker-compose.yml +++ b/apps/astrbot-napcat/4.17.52/docker-compose.yml @@ -24,7 +24,7 @@ services: - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} astrbot: - image: soulter/astrbot:v4.20.0 + image: soulter/astrbot:v4.20.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/astrbot/4.20.0/data.yml b/apps/astrbot/4.20.1/data.yml similarity index 100% rename from apps/astrbot/4.20.0/data.yml rename to apps/astrbot/4.20.1/data.yml diff --git a/apps/astrbot/4.20.0/docker-compose.yml b/apps/astrbot/4.20.1/docker-compose.yml similarity index 94% rename from apps/astrbot/4.20.0/docker-compose.yml rename to apps/astrbot/4.20.1/docker-compose.yml index 72c0e3d9c..f0e7a4e7e 100644 --- a/apps/astrbot/4.20.0/docker-compose.yml +++ b/apps/astrbot/4.20.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: astrbot: - image: soulter/astrbot:v4.20.0 + image: soulter/astrbot:v4.20.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/astrbot/4.20.0/envs/default.env b/apps/astrbot/4.20.1/envs/default.env similarity index 100% rename from apps/astrbot/4.20.0/envs/default.env rename to apps/astrbot/4.20.1/envs/default.env diff --git a/apps/astrbot/4.20.0/envs/global.env b/apps/astrbot/4.20.1/envs/global.env similarity index 100% rename from apps/astrbot/4.20.0/envs/global.env rename to apps/astrbot/4.20.1/envs/global.env diff --git a/apps/astrbot/4.20.0/scripts/init.sh b/apps/astrbot/4.20.1/scripts/init.sh similarity index 100% rename from apps/astrbot/4.20.0/scripts/init.sh rename to apps/astrbot/4.20.1/scripts/init.sh diff --git a/apps/astrbot/4.20.0/scripts/uninstall.sh b/apps/astrbot/4.20.1/scripts/uninstall.sh similarity index 100% rename from apps/astrbot/4.20.0/scripts/uninstall.sh rename to apps/astrbot/4.20.1/scripts/uninstall.sh diff --git a/apps/astrbot/4.20.0/scripts/upgrade.sh b/apps/astrbot/4.20.1/scripts/upgrade.sh similarity index 100% rename from apps/astrbot/4.20.0/scripts/upgrade.sh rename to apps/astrbot/4.20.1/scripts/upgrade.sh diff --git a/apps/clouddrive2/1.0.0/data.yml b/apps/clouddrive2/1.0.1/data.yml similarity index 100% rename from apps/clouddrive2/1.0.0/data.yml rename to apps/clouddrive2/1.0.1/data.yml diff --git a/apps/clouddrive2/1.0.0/docker-compose.yml b/apps/clouddrive2/1.0.1/docker-compose.yml similarity index 95% rename from apps/clouddrive2/1.0.0/docker-compose.yml rename to apps/clouddrive2/1.0.1/docker-compose.yml index 1ce2daee0..2f200e799 100644 --- a/apps/clouddrive2/1.0.0/docker-compose.yml +++ b/apps/clouddrive2/1.0.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: clouddrive2: - image: cloudnas/clouddrive2:1.0.0 + image: cloudnas/clouddrive2:1.0.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/clouddrive2/1.0.0/envs/default.env b/apps/clouddrive2/1.0.1/envs/default.env similarity index 100% rename from apps/clouddrive2/1.0.0/envs/default.env rename to apps/clouddrive2/1.0.1/envs/default.env diff --git a/apps/clouddrive2/1.0.0/envs/global.env b/apps/clouddrive2/1.0.1/envs/global.env similarity index 100% rename from apps/clouddrive2/1.0.0/envs/global.env rename to apps/clouddrive2/1.0.1/envs/global.env diff --git a/apps/clouddrive2/1.0.0/scripts/init.sh b/apps/clouddrive2/1.0.1/scripts/init.sh similarity index 100% rename from apps/clouddrive2/1.0.0/scripts/init.sh rename to apps/clouddrive2/1.0.1/scripts/init.sh diff --git a/apps/clouddrive2/1.0.0/scripts/uninstall.sh b/apps/clouddrive2/1.0.1/scripts/uninstall.sh similarity index 100% rename from apps/clouddrive2/1.0.0/scripts/uninstall.sh rename to apps/clouddrive2/1.0.1/scripts/uninstall.sh diff --git a/apps/clouddrive2/1.0.0/scripts/upgrade.sh b/apps/clouddrive2/1.0.1/scripts/upgrade.sh similarity index 100% rename from apps/clouddrive2/1.0.0/scripts/upgrade.sh rename to apps/clouddrive2/1.0.1/scripts/upgrade.sh diff --git a/apps/ech0/4.1.3/data.yml b/apps/ech0/4.1.4/data.yml similarity index 100% rename from apps/ech0/4.1.3/data.yml rename to apps/ech0/4.1.4/data.yml diff --git a/apps/ech0/4.1.3/docker-compose.yml b/apps/ech0/4.1.4/docker-compose.yml similarity index 94% rename from apps/ech0/4.1.3/docker-compose.yml rename to apps/ech0/4.1.4/docker-compose.yml index 5819a5ca2..1caffb271 100644 --- a/apps/ech0/4.1.3/docker-compose.yml +++ b/apps/ech0/4.1.4/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: app_name: - image: sn0wl1n/ech0:v4.1.3 + image: sn0wl1n/ech0:v4.1.4 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/ech0/4.1.3/envs/default.env b/apps/ech0/4.1.4/envs/default.env similarity index 100% rename from apps/ech0/4.1.3/envs/default.env rename to apps/ech0/4.1.4/envs/default.env diff --git a/apps/ech0/4.1.3/envs/global.env b/apps/ech0/4.1.4/envs/global.env similarity index 100% rename from apps/ech0/4.1.3/envs/global.env rename to apps/ech0/4.1.4/envs/global.env diff --git a/apps/ech0/4.1.3/scripts/init.sh b/apps/ech0/4.1.4/scripts/init.sh similarity index 100% rename from apps/ech0/4.1.3/scripts/init.sh rename to apps/ech0/4.1.4/scripts/init.sh diff --git a/apps/ech0/4.1.3/scripts/uninstall.sh b/apps/ech0/4.1.4/scripts/uninstall.sh similarity index 100% rename from apps/ech0/4.1.3/scripts/uninstall.sh rename to apps/ech0/4.1.4/scripts/uninstall.sh diff --git a/apps/ech0/4.1.3/scripts/upgrade.sh b/apps/ech0/4.1.4/scripts/upgrade.sh similarity index 100% rename from apps/ech0/4.1.3/scripts/upgrade.sh rename to apps/ech0/4.1.4/scripts/upgrade.sh diff --git a/apps/emby-pulse/1.2.0.728/data.yml b/apps/emby-pulse/1.2.0.735/data.yml similarity index 100% rename from apps/emby-pulse/1.2.0.728/data.yml rename to apps/emby-pulse/1.2.0.735/data.yml diff --git a/apps/emby-pulse/1.2.0.728/docker-compose.yml b/apps/emby-pulse/1.2.0.735/docker-compose.yml similarity index 93% rename from apps/emby-pulse/1.2.0.728/docker-compose.yml rename to apps/emby-pulse/1.2.0.735/docker-compose.yml index 5af194e7c..0ee8c010a 100644 --- a/apps/emby-pulse/1.2.0.728/docker-compose.yml +++ b/apps/emby-pulse/1.2.0.735/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: emby-pulse: - image: zeyu8023/emby-stats:1.2.0.728 + image: zeyu8023/emby-stats:1.2.0.735 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/emby-pulse/1.2.0.728/envs/default.env b/apps/emby-pulse/1.2.0.735/envs/default.env similarity index 100% rename from apps/emby-pulse/1.2.0.728/envs/default.env rename to apps/emby-pulse/1.2.0.735/envs/default.env diff --git a/apps/emby-pulse/1.2.0.728/envs/global.env b/apps/emby-pulse/1.2.0.735/envs/global.env similarity index 100% rename from apps/emby-pulse/1.2.0.728/envs/global.env rename to apps/emby-pulse/1.2.0.735/envs/global.env diff --git a/apps/emby-pulse/1.2.0.728/scripts/init.sh b/apps/emby-pulse/1.2.0.735/scripts/init.sh similarity index 100% rename from apps/emby-pulse/1.2.0.728/scripts/init.sh rename to apps/emby-pulse/1.2.0.735/scripts/init.sh diff --git a/apps/emby-pulse/1.2.0.728/scripts/uninstall.sh b/apps/emby-pulse/1.2.0.735/scripts/uninstall.sh similarity index 100% rename from apps/emby-pulse/1.2.0.728/scripts/uninstall.sh rename to apps/emby-pulse/1.2.0.735/scripts/uninstall.sh diff --git a/apps/emby-pulse/1.2.0.728/scripts/upgrade.sh b/apps/emby-pulse/1.2.0.735/scripts/upgrade.sh similarity index 100% rename from apps/emby-pulse/1.2.0.728/scripts/upgrade.sh rename to apps/emby-pulse/1.2.0.735/scripts/upgrade.sh diff --git a/apps/omnibox/2.0.2/data.yml b/apps/omnibox/2.0.3/data.yml similarity index 100% rename from apps/omnibox/2.0.2/data.yml rename to apps/omnibox/2.0.3/data.yml diff --git a/apps/omnibox/2.0.2/docker-compose.yml b/apps/omnibox/2.0.3/docker-compose.yml similarity index 93% rename from apps/omnibox/2.0.2/docker-compose.yml rename to apps/omnibox/2.0.3/docker-compose.yml index beabe2b48..0c86fe76d 100644 --- a/apps/omnibox/2.0.2/docker-compose.yml +++ b/apps/omnibox/2.0.3/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: omnibox: - image: lampon/omnibox:v2.0.2 + image: lampon/omnibox:2.0.3 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/omnibox/2.0.2/envs/default.env b/apps/omnibox/2.0.3/envs/default.env similarity index 100% rename from apps/omnibox/2.0.2/envs/default.env rename to apps/omnibox/2.0.3/envs/default.env diff --git a/apps/omnibox/2.0.2/envs/global.env b/apps/omnibox/2.0.3/envs/global.env similarity index 100% rename from apps/omnibox/2.0.2/envs/global.env rename to apps/omnibox/2.0.3/envs/global.env diff --git a/apps/omnibox/2.0.2/scripts/init.sh b/apps/omnibox/2.0.3/scripts/init.sh similarity index 100% rename from apps/omnibox/2.0.2/scripts/init.sh rename to apps/omnibox/2.0.3/scripts/init.sh diff --git a/apps/omnibox/2.0.2/scripts/uninstall.sh b/apps/omnibox/2.0.3/scripts/uninstall.sh similarity index 100% rename from apps/omnibox/2.0.2/scripts/uninstall.sh rename to apps/omnibox/2.0.3/scripts/uninstall.sh diff --git a/apps/omnibox/2.0.2/scripts/upgrade.sh b/apps/omnibox/2.0.3/scripts/upgrade.sh similarity index 100% rename from apps/omnibox/2.0.2/scripts/upgrade.sh rename to apps/omnibox/2.0.3/scripts/upgrade.sh diff --git a/appstore/astrbot-napcat/4.17.52/docker-compose.yml b/appstore/astrbot-napcat/4.17.52/docker-compose.yml index b61ce3fde..f7cb8588b 100644 --- a/appstore/astrbot-napcat/4.17.52/docker-compose.yml +++ b/appstore/astrbot-napcat/4.17.52/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.20.0 + image: soulter/astrbot:v4.20.1 labels: createdBy: Apps networks: diff --git a/appstore/astrbot/4.20.0/.env b/appstore/astrbot/4.20.1/.env similarity index 100% rename from appstore/astrbot/4.20.0/.env rename to appstore/astrbot/4.20.1/.env diff --git a/appstore/astrbot/4.20.0/data.yml b/appstore/astrbot/4.20.1/data.yml similarity index 100% rename from appstore/astrbot/4.20.0/data.yml rename to appstore/astrbot/4.20.1/data.yml diff --git a/appstore/astrbot/4.20.0/docker-compose.yml b/appstore/astrbot/4.20.1/docker-compose.yml similarity index 94% rename from appstore/astrbot/4.20.0/docker-compose.yml rename to appstore/astrbot/4.20.1/docker-compose.yml index 6c88a8fc4..f3503b435 100644 --- a/appstore/astrbot/4.20.0/docker-compose.yml +++ b/appstore/astrbot/4.20.1/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.20.0 + image: soulter/astrbot:v4.20.1 labels: createdBy: Apps networks: diff --git a/appstore/astrbot/4.20.0/envs/default.env b/appstore/astrbot/4.20.1/envs/default.env similarity index 100% rename from appstore/astrbot/4.20.0/envs/default.env rename to appstore/astrbot/4.20.1/envs/default.env diff --git a/appstore/astrbot/4.20.0/envs/global.env b/appstore/astrbot/4.20.1/envs/global.env similarity index 100% rename from appstore/astrbot/4.20.0/envs/global.env rename to appstore/astrbot/4.20.1/envs/global.env diff --git a/appstore/astrbot/4.20.0/scripts/init.sh b/appstore/astrbot/4.20.1/scripts/init.sh similarity index 100% rename from appstore/astrbot/4.20.0/scripts/init.sh rename to appstore/astrbot/4.20.1/scripts/init.sh diff --git a/appstore/astrbot/4.20.0/scripts/uninstall.sh b/appstore/astrbot/4.20.1/scripts/uninstall.sh similarity index 100% rename from appstore/astrbot/4.20.0/scripts/uninstall.sh rename to appstore/astrbot/4.20.1/scripts/uninstall.sh diff --git a/appstore/astrbot/4.20.0/scripts/upgrade.sh b/appstore/astrbot/4.20.1/scripts/upgrade.sh similarity index 100% rename from appstore/astrbot/4.20.0/scripts/upgrade.sh rename to appstore/astrbot/4.20.1/scripts/upgrade.sh diff --git a/appstore/clouddrive2/0.9.24/.env b/appstore/clouddrive2/1.0.1/.env similarity index 100% rename from appstore/clouddrive2/0.9.24/.env rename to appstore/clouddrive2/1.0.1/.env diff --git a/appstore/clouddrive2/0.9.24/data.yml b/appstore/clouddrive2/1.0.1/data.yml similarity index 100% rename from appstore/clouddrive2/0.9.24/data.yml rename to appstore/clouddrive2/1.0.1/data.yml diff --git a/appstore/clouddrive2/0.9.24/docker-compose.yml b/appstore/clouddrive2/1.0.1/docker-compose.yml similarity index 94% rename from appstore/clouddrive2/0.9.24/docker-compose.yml rename to appstore/clouddrive2/1.0.1/docker-compose.yml index 3849c9415..d2161ac30 100644 --- a/appstore/clouddrive2/0.9.24/docker-compose.yml +++ b/appstore/clouddrive2/1.0.1/docker-compose.yml @@ -14,7 +14,7 @@ services: environment: - TZ=Asia/Shanghai - CLOUDDRIVE_HOME=/Config - image: cloudnas/clouddrive2:0.9.24 + image: cloudnas/clouddrive2:1.0.1 labels: createdBy: Apps networks: diff --git a/appstore/clouddrive2/0.9.24/envs/default.env b/appstore/clouddrive2/1.0.1/envs/default.env similarity index 100% rename from appstore/clouddrive2/0.9.24/envs/default.env rename to appstore/clouddrive2/1.0.1/envs/default.env diff --git a/appstore/clouddrive2/0.9.24/envs/global.env b/appstore/clouddrive2/1.0.1/envs/global.env similarity index 100% rename from appstore/clouddrive2/0.9.24/envs/global.env rename to appstore/clouddrive2/1.0.1/envs/global.env diff --git a/appstore/clouddrive2/0.9.24/scripts/init.sh b/appstore/clouddrive2/1.0.1/scripts/init.sh similarity index 100% rename from appstore/clouddrive2/0.9.24/scripts/init.sh rename to appstore/clouddrive2/1.0.1/scripts/init.sh diff --git a/appstore/clouddrive2/0.9.24/scripts/uninstall.sh b/appstore/clouddrive2/1.0.1/scripts/uninstall.sh similarity index 100% rename from appstore/clouddrive2/0.9.24/scripts/uninstall.sh rename to appstore/clouddrive2/1.0.1/scripts/uninstall.sh diff --git a/appstore/clouddrive2/0.9.24/scripts/upgrade.sh b/appstore/clouddrive2/1.0.1/scripts/upgrade.sh similarity index 100% rename from appstore/clouddrive2/0.9.24/scripts/upgrade.sh rename to appstore/clouddrive2/1.0.1/scripts/upgrade.sh diff --git a/appstore/dujiaonext/0.1.1/docker-compose.yml b/appstore/dujiaonext/0.1.1/docker-compose.yml index c96ff19ff..f4fb70ef1 100644 --- a/appstore/dujiaonext/0.1.1/docker-compose.yml +++ b/appstore/dujiaonext/0.1.1/docker-compose.yml @@ -14,7 +14,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: dujiaonext/admin:v0.1.0 + image: dujiaonext/admin:v0.1.1 networks: - dujiao-net ports: diff --git a/appstore/ech0/4.1.3/.env b/appstore/ech0/4.1.4/.env similarity index 100% rename from appstore/ech0/4.1.3/.env rename to appstore/ech0/4.1.4/.env diff --git a/appstore/ech0/4.1.3/data.yml b/appstore/ech0/4.1.4/data.yml similarity index 100% rename from appstore/ech0/4.1.3/data.yml rename to appstore/ech0/4.1.4/data.yml diff --git a/dockge/ech0_3_1_4/docker-compose.yml b/appstore/ech0/4.1.4/docker-compose.yml similarity index 93% rename from dockge/ech0_3_1_4/docker-compose.yml rename to appstore/ech0/4.1.4/docker-compose.yml index ab7bb4f72..e6da7bcd0 100644 --- a/dockge/ech0_3_1_4/docker-compose.yml +++ b/appstore/ech0/4.1.4/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - HTTPS_PROXY=${HTTP_PROXY} - image: sn0wl1n/ech0:v3.1.4 + image: sn0wl1n/ech0:v4.1.4 labels: createdBy: Apps networks: diff --git a/appstore/ech0/4.1.3/envs/default.env b/appstore/ech0/4.1.4/envs/default.env similarity index 100% rename from appstore/ech0/4.1.3/envs/default.env rename to appstore/ech0/4.1.4/envs/default.env diff --git a/appstore/ech0/4.1.3/envs/global.env b/appstore/ech0/4.1.4/envs/global.env similarity index 100% rename from appstore/ech0/4.1.3/envs/global.env rename to appstore/ech0/4.1.4/envs/global.env diff --git a/appstore/ech0/4.1.3/scripts/init.sh b/appstore/ech0/4.1.4/scripts/init.sh similarity index 100% rename from appstore/ech0/4.1.3/scripts/init.sh rename to appstore/ech0/4.1.4/scripts/init.sh diff --git a/appstore/ech0/4.1.3/scripts/uninstall.sh b/appstore/ech0/4.1.4/scripts/uninstall.sh similarity index 100% rename from appstore/ech0/4.1.3/scripts/uninstall.sh rename to appstore/ech0/4.1.4/scripts/uninstall.sh diff --git a/appstore/ech0/4.1.3/scripts/upgrade.sh b/appstore/ech0/4.1.4/scripts/upgrade.sh similarity index 100% rename from appstore/ech0/4.1.3/scripts/upgrade.sh rename to appstore/ech0/4.1.4/scripts/upgrade.sh diff --git a/appstore/emby-pulse/1.2.0.725/.env b/appstore/emby-pulse/1.2.0.735/.env similarity index 100% rename from appstore/emby-pulse/1.2.0.725/.env rename to appstore/emby-pulse/1.2.0.735/.env diff --git a/appstore/emby-pulse/1.2.0.725/data.yml b/appstore/emby-pulse/1.2.0.735/data.yml similarity index 100% rename from appstore/emby-pulse/1.2.0.725/data.yml rename to appstore/emby-pulse/1.2.0.735/data.yml diff --git a/appstore/emby-pulse/1.2.0.725/docker-compose.yml b/appstore/emby-pulse/1.2.0.735/docker-compose.yml similarity index 92% rename from appstore/emby-pulse/1.2.0.725/docker-compose.yml rename to appstore/emby-pulse/1.2.0.735/docker-compose.yml index 141c7bfa4..9e82153a7 100644 --- a/appstore/emby-pulse/1.2.0.725/docker-compose.yml +++ b/appstore/emby-pulse/1.2.0.735/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - DB_PATH=/emby-data/playback_reporting.db - playback_data_mode=sqlite - image: zeyu8023/emby-stats:1.2.0.725 + image: zeyu8023/emby-stats:1.2.0.735 labels: createdBy: Apps networks: diff --git a/appstore/emby-pulse/1.2.0.725/envs/default.env b/appstore/emby-pulse/1.2.0.735/envs/default.env similarity index 100% rename from appstore/emby-pulse/1.2.0.725/envs/default.env rename to appstore/emby-pulse/1.2.0.735/envs/default.env diff --git a/appstore/emby-pulse/1.2.0.725/envs/global.env b/appstore/emby-pulse/1.2.0.735/envs/global.env similarity index 100% rename from appstore/emby-pulse/1.2.0.725/envs/global.env rename to appstore/emby-pulse/1.2.0.735/envs/global.env diff --git a/appstore/emby-pulse/1.2.0.725/scripts/init.sh b/appstore/emby-pulse/1.2.0.735/scripts/init.sh similarity index 100% rename from appstore/emby-pulse/1.2.0.725/scripts/init.sh rename to appstore/emby-pulse/1.2.0.735/scripts/init.sh diff --git a/appstore/emby-pulse/1.2.0.725/scripts/uninstall.sh b/appstore/emby-pulse/1.2.0.735/scripts/uninstall.sh similarity index 100% rename from appstore/emby-pulse/1.2.0.725/scripts/uninstall.sh rename to appstore/emby-pulse/1.2.0.735/scripts/uninstall.sh diff --git a/appstore/emby-pulse/1.2.0.725/scripts/upgrade.sh b/appstore/emby-pulse/1.2.0.735/scripts/upgrade.sh similarity index 100% rename from appstore/emby-pulse/1.2.0.725/scripts/upgrade.sh rename to appstore/emby-pulse/1.2.0.735/scripts/upgrade.sh diff --git a/appstore/omnibox/2.0.2/.env b/appstore/omnibox/2.0.3/.env similarity index 100% rename from appstore/omnibox/2.0.2/.env rename to appstore/omnibox/2.0.3/.env diff --git a/appstore/omnibox/2.0.2/data.yml b/appstore/omnibox/2.0.3/data.yml similarity index 100% rename from appstore/omnibox/2.0.2/data.yml rename to appstore/omnibox/2.0.3/data.yml diff --git a/dockge/omnibox_2_0_2/docker-compose.yml b/appstore/omnibox/2.0.3/docker-compose.yml similarity index 91% rename from dockge/omnibox_2_0_2/docker-compose.yml rename to appstore/omnibox/2.0.3/docker-compose.yml index caf7583c9..b3ab37b5f 100644 --- a/dockge/omnibox_2_0_2/docker-compose.yml +++ b/appstore/omnibox/2.0.3/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: lampon/omnibox:v2.0.2 + image: lampon/omnibox:2.0.3 labels: createdBy: Apps networks: diff --git a/appstore/omnibox/2.0.2/envs/default.env b/appstore/omnibox/2.0.3/envs/default.env similarity index 100% rename from appstore/omnibox/2.0.2/envs/default.env rename to appstore/omnibox/2.0.3/envs/default.env diff --git a/appstore/omnibox/2.0.2/envs/global.env b/appstore/omnibox/2.0.3/envs/global.env similarity index 100% rename from appstore/omnibox/2.0.2/envs/global.env rename to appstore/omnibox/2.0.3/envs/global.env diff --git a/appstore/omnibox/2.0.2/scripts/init.sh b/appstore/omnibox/2.0.3/scripts/init.sh similarity index 100% rename from appstore/omnibox/2.0.2/scripts/init.sh rename to appstore/omnibox/2.0.3/scripts/init.sh diff --git a/appstore/omnibox/2.0.2/scripts/uninstall.sh b/appstore/omnibox/2.0.3/scripts/uninstall.sh similarity index 100% rename from appstore/omnibox/2.0.2/scripts/uninstall.sh rename to appstore/omnibox/2.0.3/scripts/uninstall.sh diff --git a/appstore/omnibox/2.0.2/scripts/upgrade.sh b/appstore/omnibox/2.0.3/scripts/upgrade.sh similarity index 100% rename from appstore/omnibox/2.0.2/scripts/upgrade.sh rename to appstore/omnibox/2.0.3/scripts/upgrade.sh diff --git a/appstore/rustfs/1.0.0-alpha.86/.env b/appstore/rustfs/1.0.0-alpha.86/.env new file mode 100644 index 000000000..db9166f2c --- /dev/null +++ b/appstore/rustfs/1.0.0-alpha.86/.env @@ -0,0 +1,21 @@ +# 数据持久化路径 [必填] +RUSTFS_ROOT_PATH=/home/rustfs + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=9001 + +# API 端口 [必填] +PANEL_APP_PORT_API=9000 + +# 管理员账号 [必填] +RUSTFS_ACCESS_KEY=rustfsadmin + +# 管理员密码 [必填] +RUSTFS_SECRET_KEY=rustfsadmin + +# 域名 +RUSTFS_SERVER_DOMAINS=example.com + +# 启用控制台 [必填] +RUSTFS_CONSOLE_ENABLE=true + diff --git a/appstore/rustfs/1.0.0-alpha.86/data.yml b/appstore/rustfs/1.0.0-alpha.86/data.yml new file mode 100644 index 000000000..bba75c769 --- /dev/null +++ b/appstore/rustfs/1.0.0-alpha.86/data.yml @@ -0,0 +1,58 @@ +additionalProperties: + formFields: + - default: "/home/rustfs" + edit: true + envKey: RUSTFS_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 9001 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: 9000 + edit: true + envKey: PANEL_APP_PORT_API + labelZh: API 端口 + labelEn: API port + required: true + rule: paramPort + type: number + - default: "rustfsadmin" + edit: true + envKey: RUSTFS_ACCESS_KEY + labelZh: 管理员账号 + labelEn: Access Key + required: true + type: text + - default: "rustfsadmin" + edit: true + envKey: RUSTFS_SECRET_KEY + labelZh: 管理员密码 + labelEn: Secret Key + required: true + type: password + - default: "example.com" + edit: true + envKey: RUSTFS_SERVER_DOMAINS + labelZh: 域名 + labelEn: Domains + required: false + type: text + - default: "true" + edit: true + envKey: RUSTFS_CONSOLE_ENABLE + labelZh: 启用控制台 + labelEn: Enable Console + required: true + type: select + values: + - label: 启用 + value: "true" + - label: 禁用 + value: "false" diff --git a/appstore/rustfs/1.0.0-alpha.86/docker-compose.yml b/appstore/rustfs/1.0.0-alpha.86/docker-compose.yml new file mode 100644 index 000000000..2136a7b1f --- /dev/null +++ b/appstore/rustfs/1.0.0-alpha.86/docker-compose.yml @@ -0,0 +1,48 @@ +networks: + 1panel-network: + external: true +services: + rustfs: + container_name: rustfs + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - RUSTFS_VOLUMES=/data/rustfs{0...3} + - RUSTFS_ADDRESS=0.0.0.0:9000 + - RUSTFS_CONSOLE_ADDRESS=0.0.0.0:9001 + - RUSTFS_CONSOLE_ENABLE=true + - RUSTFS_CORS_ALLOWED_ORIGINS=* + - RUSTFS_CONSOLE_CORS_ALLOWED_ORIGINS=* + - RUSTFS_OBS_LOGGER_LEVEL=info + - RUSTFS_TLS_PATH=/opt/tls + - RUSTFS_OBJECT_CACHE_ENABLE=true + - RUSTFS_OBJECT_CACHE_TTL_SECS=300 + healthcheck: + interval: 30s + retries: 3 + start_period: 40s + test: + - CMD + - sh + - -c + - curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9001/rustfs/console/health + timeout: 10s + image: rustfs/rustfs:1.0.0-alpha.86 + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_API}:9000 + - ${PANEL_APP_PORT_HTTP}:9001 + restart: always + security_opt: + - no-new-privileges:true + volumes: + - ${RUSTFS_ROOT_PATH}/logs:/app/logs + - ${RUSTFS_ROOT_PATH}/data/rustfs0:/data/rustfs0 + - ${RUSTFS_ROOT_PATH}/data/rustfs1:/data/rustfs1 + - ${RUSTFS_ROOT_PATH}/data/rustfs2:/data/rustfs2 + - ${RUSTFS_ROOT_PATH}/data/rustfs3:/data/rustfs3 diff --git a/dockge/ech0_3_1_4/envs/default.env b/appstore/rustfs/1.0.0-alpha.86/envs/default.env similarity index 100% rename from dockge/ech0_3_1_4/envs/default.env rename to appstore/rustfs/1.0.0-alpha.86/envs/default.env diff --git a/dockge/ech0_3_1_4/envs/global.env b/appstore/rustfs/1.0.0-alpha.86/envs/global.env similarity index 100% rename from dockge/ech0_3_1_4/envs/global.env rename to appstore/rustfs/1.0.0-alpha.86/envs/global.env diff --git a/appstore/rustfs/1.0.0-alpha.86/scripts/init.sh b/appstore/rustfs/1.0.0-alpha.86/scripts/init.sh new file mode 100644 index 000000000..8622d8706 --- /dev/null +++ b/appstore/rustfs/1.0.0-alpha.86/scripts/init.sh @@ -0,0 +1,28 @@ +#!/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 + + + mkdir -p "$RUSTFS_ROOT_PATH" + mkdir -p "$RUSTFS_ROOT_PATH/logs" + mkdir -p "$RUSTFS_ROOT_PATH/data" + mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs0" + mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs1" + mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs2" + mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs3" + + chown -R 10001:10001 "$RUSTFS_ROOT_PATH" + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/rustfs/1.0.0-alpha.86/scripts/uninstall.sh b/appstore/rustfs/1.0.0-alpha.86/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/appstore/rustfs/1.0.0-alpha.86/scripts/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/rustfs/1.0.0-alpha.86/scripts/upgrade.sh b/appstore/rustfs/1.0.0-alpha.86/scripts/upgrade.sh new file mode 100644 index 000000000..9aebd56fa --- /dev/null +++ b/appstore/rustfs/1.0.0-alpha.86/scripts/upgrade.sh @@ -0,0 +1,19 @@ +#!/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 + + chown -R 10001:10001 "$RUSTFS_ROOT_PATH" + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/rustfs/latest/.env b/appstore/rustfs/latest/.env index 720d1a4b2..db9166f2c 100644 --- a/appstore/rustfs/latest/.env +++ b/appstore/rustfs/latest/.env @@ -2,7 +2,10 @@ RUSTFS_ROOT_PATH=/home/rustfs # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=9000 +PANEL_APP_PORT_HTTP=9001 + +# API 端口 [必填] +PANEL_APP_PORT_API=9000 # 管理员账号 [必填] RUSTFS_ACCESS_KEY=rustfsadmin @@ -11,17 +14,8 @@ RUSTFS_ACCESS_KEY=rustfsadmin RUSTFS_SECRET_KEY=rustfsadmin # 域名 -RUSTFS_SERVER_DOMAINS=127.0.0.1:9000 +RUSTFS_SERVER_DOMAINS=example.com # 启用控制台 [必填] RUSTFS_CONSOLE_ENABLE=true -# 自定义挂载目录 1 -CUSTOM_MOUNT_DIRECTORY_1= - -# 自定义挂载目录 2 -CUSTOM_MOUNT_DIRECTORY_2= - -# 自定义挂载目录 3 -CUSTOM_MOUNT_DIRECTORY_3= - diff --git a/appstore/rustfs/latest/data.yml b/appstore/rustfs/latest/data.yml index 41e89e557..bba75c769 100644 --- a/appstore/rustfs/latest/data.yml +++ b/appstore/rustfs/latest/data.yml @@ -7,7 +7,7 @@ additionalProperties: labelEn: Data persistence path required: true type: text - - default: 9000 + - default: 9001 edit: true envKey: PANEL_APP_PORT_HTTP labelZh: WebUI 端口 @@ -15,6 +15,14 @@ additionalProperties: required: true rule: paramPort type: number + - default: 9000 + edit: true + envKey: PANEL_APP_PORT_API + labelZh: API 端口 + labelEn: API port + required: true + rule: paramPort + type: number - default: "rustfsadmin" edit: true envKey: RUSTFS_ACCESS_KEY @@ -29,7 +37,7 @@ additionalProperties: labelEn: Secret Key required: true type: password - - default: "127.0.0.1:9000" + - default: "example.com" edit: true envKey: RUSTFS_SERVER_DOMAINS labelZh: 域名 @@ -48,24 +56,3 @@ additionalProperties: value: "true" - label: 禁用 value: "false" - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_1 - labelEn: Custom mount directory 1 - labelZh: 自定义挂载目录 1 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_2 - labelEn: Custom mount directory 2 - labelZh: 自定义挂载目录 2 - required: false - type: text - - default: "" - edit: true - envKey: CUSTOM_MOUNT_DIRECTORY_3 - labelEn: Custom mount directory 3 - labelZh: 自定义挂载目录 3 - required: false - type: text diff --git a/appstore/rustfs/latest/docker-compose.yml b/appstore/rustfs/latest/docker-compose.yml index da82b74d3..24ca00a75 100644 --- a/appstore/rustfs/latest/docker-compose.yml +++ b/appstore/rustfs/latest/docker-compose.yml @@ -9,17 +9,40 @@ services: - .env environment: - TZ=Asia/Shanghai - - RUSTFS_ADDRESS=:9000 + - RUSTFS_VOLUMES=/data/rustfs{0...3} + - RUSTFS_ADDRESS=0.0.0.0:9000 + - RUSTFS_CONSOLE_ADDRESS=0.0.0.0:9001 + - RUSTFS_CONSOLE_ENABLE=true + - RUSTFS_CORS_ALLOWED_ORIGINS=* + - RUSTFS_CONSOLE_CORS_ALLOWED_ORIGINS=* + - RUSTFS_OBS_LOGGER_LEVEL=info + - RUSTFS_TLS_PATH=/opt/tls + - RUSTFS_OBJECT_CACHE_ENABLE=true + - RUSTFS_OBJECT_CACHE_TTL_SECS=300 + healthcheck: + interval: 30s + retries: 3 + start_period: 40s + test: + - CMD + - sh + - -c + - curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9001/rustfs/console/health + timeout: 10s image: rustfs/rustfs:latest labels: createdBy: Apps networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:9000 + - ${PANEL_APP_PORT_API}:9000 + - ${PANEL_APP_PORT_HTTP}:9001 restart: always + security_opt: + - no-new-privileges:true volumes: - - ${RUSTFS_ROOT_PATH}/data:/etc/rustfs - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} + - ${RUSTFS_ROOT_PATH}/logs:/app/logs + - ${RUSTFS_ROOT_PATH}/data/rustfs0:/data/rustfs0 + - ${RUSTFS_ROOT_PATH}/data/rustfs1:/data/rustfs1 + - ${RUSTFS_ROOT_PATH}/data/rustfs2:/data/rustfs2 + - ${RUSTFS_ROOT_PATH}/data/rustfs3:/data/rustfs3 diff --git a/appstore/rustfs/latest/scripts/init.sh b/appstore/rustfs/latest/scripts/init.sh index 07fb8c3fe..8622d8706 100644 --- a/appstore/rustfs/latest/scripts/init.sh +++ b/appstore/rustfs/latest/scripts/init.sh @@ -10,6 +10,17 @@ if [ -f .env ]; then echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + mkdir -p "$RUSTFS_ROOT_PATH" + mkdir -p "$RUSTFS_ROOT_PATH/logs" + mkdir -p "$RUSTFS_ROOT_PATH/data" + mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs0" + mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs1" + mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs2" + mkdir -p "$RUSTFS_ROOT_PATH/data/rustfs3" + + chown -R 10001:10001 "$RUSTFS_ROOT_PATH" + echo "Check Finish." else diff --git a/appstore/rustfs/latest/scripts/upgrade.sh b/appstore/rustfs/latest/scripts/upgrade.sh index 07fb8c3fe..9aebd56fa 100644 --- a/appstore/rustfs/latest/scripts/upgrade.sh +++ b/appstore/rustfs/latest/scripts/upgrade.sh @@ -10,6 +10,8 @@ if [ -f .env ]; then echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + chown -R 10001:10001 "$RUSTFS_ROOT_PATH" + echo "Check Finish." else diff --git a/dockge/astrbot-napcat/docker-compose.yml b/dockge/astrbot-napcat/docker-compose.yml index b61ce3fde..f7cb8588b 100644 --- a/dockge/astrbot-napcat/docker-compose.yml +++ b/dockge/astrbot-napcat/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.20.0 + image: soulter/astrbot:v4.20.1 labels: createdBy: Apps networks: diff --git a/dockge/astrbot/docker-compose.yml b/dockge/astrbot/docker-compose.yml index 6c88a8fc4..f3503b435 100644 --- a/dockge/astrbot/docker-compose.yml +++ b/dockge/astrbot/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.20.0 + image: soulter/astrbot:v4.20.1 labels: createdBy: Apps networks: diff --git a/dockge/clouddrive2/docker-compose.yml b/dockge/clouddrive2/docker-compose.yml index 3849c9415..d2161ac30 100644 --- a/dockge/clouddrive2/docker-compose.yml +++ b/dockge/clouddrive2/docker-compose.yml @@ -14,7 +14,7 @@ services: environment: - TZ=Asia/Shanghai - CLOUDDRIVE_HOME=/Config - image: cloudnas/clouddrive2:0.9.24 + image: cloudnas/clouddrive2:1.0.1 labels: createdBy: Apps networks: diff --git a/dockge/dujiaonext/docker-compose.yml b/dockge/dujiaonext/docker-compose.yml index c96ff19ff..f4fb70ef1 100644 --- a/dockge/dujiaonext/docker-compose.yml +++ b/dockge/dujiaonext/docker-compose.yml @@ -14,7 +14,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: dujiaonext/admin:v0.1.0 + image: dujiaonext/admin:v0.1.1 networks: - dujiao-net ports: diff --git a/dockge/ech0/docker-compose.yml b/dockge/ech0/docker-compose.yml index 55b760230..ab7bb4f72 100644 --- a/dockge/ech0/docker-compose.yml +++ b/dockge/ech0/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - HTTPS_PROXY=${HTTP_PROXY} - image: sn0wl1n/ech0:v4.1.3 + image: sn0wl1n/ech0:v3.1.4 labels: createdBy: Apps networks: diff --git a/dockge/ech0_3_1_4/.env b/dockge/ech0_4_1_4/.env similarity index 100% rename from dockge/ech0_3_1_4/.env rename to dockge/ech0_4_1_4/.env diff --git a/appstore/ech0/4.1.3/docker-compose.yml b/dockge/ech0_4_1_4/docker-compose.yml similarity index 93% rename from appstore/ech0/4.1.3/docker-compose.yml rename to dockge/ech0_4_1_4/docker-compose.yml index 55b760230..e6da7bcd0 100644 --- a/appstore/ech0/4.1.3/docker-compose.yml +++ b/dockge/ech0_4_1_4/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - HTTPS_PROXY=${HTTP_PROXY} - image: sn0wl1n/ech0:v4.1.3 + image: sn0wl1n/ech0:v4.1.4 labels: createdBy: Apps networks: diff --git a/dockge/omnibox_2_0_2/envs/default.env b/dockge/ech0_4_1_4/envs/default.env similarity index 100% rename from dockge/omnibox_2_0_2/envs/default.env rename to dockge/ech0_4_1_4/envs/default.env diff --git a/dockge/omnibox_2_0_2/envs/global.env b/dockge/ech0_4_1_4/envs/global.env similarity index 100% rename from dockge/omnibox_2_0_2/envs/global.env rename to dockge/ech0_4_1_4/envs/global.env diff --git a/dockge/emby-pulse/docker-compose.yml b/dockge/emby-pulse/docker-compose.yml index 141c7bfa4..9e82153a7 100644 --- a/dockge/emby-pulse/docker-compose.yml +++ b/dockge/emby-pulse/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - DB_PATH=/emby-data/playback_reporting.db - playback_data_mode=sqlite - image: zeyu8023/emby-stats:1.2.0.725 + image: zeyu8023/emby-stats:1.2.0.735 labels: createdBy: Apps networks: diff --git a/dockge/omnibox_2_0_2/.env b/dockge/omnibox_2_0_3/.env similarity index 100% rename from dockge/omnibox_2_0_2/.env rename to dockge/omnibox_2_0_3/.env diff --git a/appstore/omnibox/2.0.2/docker-compose.yml b/dockge/omnibox_2_0_3/docker-compose.yml similarity index 91% rename from appstore/omnibox/2.0.2/docker-compose.yml rename to dockge/omnibox_2_0_3/docker-compose.yml index caf7583c9..b3ab37b5f 100644 --- a/appstore/omnibox/2.0.2/docker-compose.yml +++ b/dockge/omnibox_2_0_3/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: lampon/omnibox:v2.0.2 + image: lampon/omnibox:2.0.3 labels: createdBy: Apps networks: diff --git a/dockge/omnibox_2_0_3/envs/default.env b/dockge/omnibox_2_0_3/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/omnibox_2_0_3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/omnibox_2_0_3/envs/global.env b/dockge/omnibox_2_0_3/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/omnibox_2_0_3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/rustfs/.env b/dockge/rustfs/.env index 720d1a4b2..db9166f2c 100644 --- a/dockge/rustfs/.env +++ b/dockge/rustfs/.env @@ -2,7 +2,10 @@ RUSTFS_ROOT_PATH=/home/rustfs # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=9000 +PANEL_APP_PORT_HTTP=9001 + +# API 端口 [必填] +PANEL_APP_PORT_API=9000 # 管理员账号 [必填] RUSTFS_ACCESS_KEY=rustfsadmin @@ -11,17 +14,8 @@ RUSTFS_ACCESS_KEY=rustfsadmin RUSTFS_SECRET_KEY=rustfsadmin # 域名 -RUSTFS_SERVER_DOMAINS=127.0.0.1:9000 +RUSTFS_SERVER_DOMAINS=example.com # 启用控制台 [必填] RUSTFS_CONSOLE_ENABLE=true -# 自定义挂载目录 1 -CUSTOM_MOUNT_DIRECTORY_1= - -# 自定义挂载目录 2 -CUSTOM_MOUNT_DIRECTORY_2= - -# 自定义挂载目录 3 -CUSTOM_MOUNT_DIRECTORY_3= - diff --git a/dockge/rustfs/docker-compose.yml b/dockge/rustfs/docker-compose.yml index da82b74d3..2136a7b1f 100644 --- a/dockge/rustfs/docker-compose.yml +++ b/dockge/rustfs/docker-compose.yml @@ -9,17 +9,40 @@ services: - .env environment: - TZ=Asia/Shanghai - - RUSTFS_ADDRESS=:9000 - image: rustfs/rustfs:latest + - RUSTFS_VOLUMES=/data/rustfs{0...3} + - RUSTFS_ADDRESS=0.0.0.0:9000 + - RUSTFS_CONSOLE_ADDRESS=0.0.0.0:9001 + - RUSTFS_CONSOLE_ENABLE=true + - RUSTFS_CORS_ALLOWED_ORIGINS=* + - RUSTFS_CONSOLE_CORS_ALLOWED_ORIGINS=* + - RUSTFS_OBS_LOGGER_LEVEL=info + - RUSTFS_TLS_PATH=/opt/tls + - RUSTFS_OBJECT_CACHE_ENABLE=true + - RUSTFS_OBJECT_CACHE_TTL_SECS=300 + healthcheck: + interval: 30s + retries: 3 + start_period: 40s + test: + - CMD + - sh + - -c + - curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9001/rustfs/console/health + timeout: 10s + image: rustfs/rustfs:1.0.0-alpha.86 labels: createdBy: Apps networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:9000 + - ${PANEL_APP_PORT_API}:9000 + - ${PANEL_APP_PORT_HTTP}:9001 restart: always + security_opt: + - no-new-privileges:true volumes: - - ${RUSTFS_ROOT_PATH}/data:/etc/rustfs - - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} - - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} - - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} + - ${RUSTFS_ROOT_PATH}/logs:/app/logs + - ${RUSTFS_ROOT_PATH}/data/rustfs0:/data/rustfs0 + - ${RUSTFS_ROOT_PATH}/data/rustfs1:/data/rustfs1 + - ${RUSTFS_ROOT_PATH}/data/rustfs2:/data/rustfs2 + - ${RUSTFS_ROOT_PATH}/data/rustfs3:/data/rustfs3 diff --git a/dockge/rustfs_latest/.env b/dockge/rustfs_latest/.env new file mode 100644 index 000000000..db9166f2c --- /dev/null +++ b/dockge/rustfs_latest/.env @@ -0,0 +1,21 @@ +# 数据持久化路径 [必填] +RUSTFS_ROOT_PATH=/home/rustfs + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=9001 + +# API 端口 [必填] +PANEL_APP_PORT_API=9000 + +# 管理员账号 [必填] +RUSTFS_ACCESS_KEY=rustfsadmin + +# 管理员密码 [必填] +RUSTFS_SECRET_KEY=rustfsadmin + +# 域名 +RUSTFS_SERVER_DOMAINS=example.com + +# 启用控制台 [必填] +RUSTFS_CONSOLE_ENABLE=true + diff --git a/dockge/rustfs_latest/docker-compose.yml b/dockge/rustfs_latest/docker-compose.yml new file mode 100644 index 000000000..24ca00a75 --- /dev/null +++ b/dockge/rustfs_latest/docker-compose.yml @@ -0,0 +1,48 @@ +networks: + 1panel-network: + external: true +services: + rustfs: + container_name: rustfs + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - RUSTFS_VOLUMES=/data/rustfs{0...3} + - RUSTFS_ADDRESS=0.0.0.0:9000 + - RUSTFS_CONSOLE_ADDRESS=0.0.0.0:9001 + - RUSTFS_CONSOLE_ENABLE=true + - RUSTFS_CORS_ALLOWED_ORIGINS=* + - RUSTFS_CONSOLE_CORS_ALLOWED_ORIGINS=* + - RUSTFS_OBS_LOGGER_LEVEL=info + - RUSTFS_TLS_PATH=/opt/tls + - RUSTFS_OBJECT_CACHE_ENABLE=true + - RUSTFS_OBJECT_CACHE_TTL_SECS=300 + healthcheck: + interval: 30s + retries: 3 + start_period: 40s + test: + - CMD + - sh + - -c + - curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9001/rustfs/console/health + timeout: 10s + image: rustfs/rustfs:latest + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_API}:9000 + - ${PANEL_APP_PORT_HTTP}:9001 + restart: always + security_opt: + - no-new-privileges:true + volumes: + - ${RUSTFS_ROOT_PATH}/logs:/app/logs + - ${RUSTFS_ROOT_PATH}/data/rustfs0:/data/rustfs0 + - ${RUSTFS_ROOT_PATH}/data/rustfs1:/data/rustfs1 + - ${RUSTFS_ROOT_PATH}/data/rustfs2:/data/rustfs2 + - ${RUSTFS_ROOT_PATH}/data/rustfs3:/data/rustfs3 diff --git a/dockge/rustfs_latest/envs/default.env b/dockge/rustfs_latest/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/rustfs_latest/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/rustfs_latest/envs/global.env b/dockge/rustfs_latest/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/rustfs_latest/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai