diff --git a/apps/ammds-ol8/1.6.15/data.yml b/apps/ammds-ol8/1.6.18/data.yml similarity index 100% rename from apps/ammds-ol8/1.6.15/data.yml rename to apps/ammds-ol8/1.6.18/data.yml diff --git a/apps/ammds-ol8/1.6.15/docker-compose.yml b/apps/ammds-ol8/1.6.18/docker-compose.yml similarity index 96% rename from apps/ammds-ol8/1.6.15/docker-compose.yml rename to apps/ammds-ol8/1.6.18/docker-compose.yml index d1c9f986a..c5a898528 100644 --- a/apps/ammds-ol8/1.6.15/docker-compose.yml +++ b/apps/ammds-ol8/1.6.18/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ammds: - image: qyg2297248353/ammds:v1.6.15-ol8 + image: qyg2297248353/ammds:v1.6.18-ol8 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/ammds-ol8/1.6.15/envs/default.env b/apps/ammds-ol8/1.6.18/envs/default.env similarity index 100% rename from apps/ammds-ol8/1.6.15/envs/default.env rename to apps/ammds-ol8/1.6.18/envs/default.env diff --git a/apps/ammds-ol8/1.6.15/envs/global.env b/apps/ammds-ol8/1.6.18/envs/global.env similarity index 100% rename from apps/ammds-ol8/1.6.15/envs/global.env rename to apps/ammds-ol8/1.6.18/envs/global.env diff --git a/apps/ammds-ol8/1.6.15/scripts/init.sh b/apps/ammds-ol8/1.6.18/scripts/init.sh similarity index 100% rename from apps/ammds-ol8/1.6.15/scripts/init.sh rename to apps/ammds-ol8/1.6.18/scripts/init.sh diff --git a/apps/ammds-ol8/1.6.15/scripts/uninstall.sh b/apps/ammds-ol8/1.6.18/scripts/uninstall.sh similarity index 100% rename from apps/ammds-ol8/1.6.15/scripts/uninstall.sh rename to apps/ammds-ol8/1.6.18/scripts/uninstall.sh diff --git a/apps/ammds-ol8/1.6.15/scripts/upgrade.sh b/apps/ammds-ol8/1.6.18/scripts/upgrade.sh similarity index 100% rename from apps/ammds-ol8/1.6.15/scripts/upgrade.sh rename to apps/ammds-ol8/1.6.18/scripts/upgrade.sh diff --git a/apps/ammds/1.6.14/data.yml b/apps/ammds/1.6.18/data.yml similarity index 100% rename from apps/ammds/1.6.14/data.yml rename to apps/ammds/1.6.18/data.yml diff --git a/apps/ammds/1.6.14/docker-compose.yml b/apps/ammds/1.6.18/docker-compose.yml similarity index 96% rename from apps/ammds/1.6.14/docker-compose.yml rename to apps/ammds/1.6.18/docker-compose.yml index a871d766a..eba0bde95 100644 --- a/apps/ammds/1.6.14/docker-compose.yml +++ b/apps/ammds/1.6.18/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ammds: - image: qyg2297248353/ammds:v1.6.14 + image: qyg2297248353/ammds:v1.6.18 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/ammds/1.6.14/envs/default.env b/apps/ammds/1.6.18/envs/default.env similarity index 100% rename from apps/ammds/1.6.14/envs/default.env rename to apps/ammds/1.6.18/envs/default.env diff --git a/apps/ammds/1.6.14/envs/global.env b/apps/ammds/1.6.18/envs/global.env similarity index 100% rename from apps/ammds/1.6.14/envs/global.env rename to apps/ammds/1.6.18/envs/global.env diff --git a/apps/ammds/1.6.14/scripts/init.sh b/apps/ammds/1.6.18/scripts/init.sh similarity index 100% rename from apps/ammds/1.6.14/scripts/init.sh rename to apps/ammds/1.6.18/scripts/init.sh diff --git a/apps/ammds/1.6.14/scripts/uninstall.sh b/apps/ammds/1.6.18/scripts/uninstall.sh similarity index 100% rename from apps/ammds/1.6.14/scripts/uninstall.sh rename to apps/ammds/1.6.18/scripts/uninstall.sh diff --git a/apps/ammds/1.6.14/scripts/upgrade.sh b/apps/ammds/1.6.18/scripts/upgrade.sh similarity index 100% rename from apps/ammds/1.6.14/scripts/upgrade.sh rename to apps/ammds/1.6.18/scripts/upgrade.sh diff --git a/apps/ani-rss/2.0.13/data.yml b/apps/ani-rss/2.0.14/data.yml similarity index 100% rename from apps/ani-rss/2.0.13/data.yml rename to apps/ani-rss/2.0.14/data.yml diff --git a/apps/ani-rss/2.0.13/docker-compose.yml b/apps/ani-rss/2.0.14/docker-compose.yml similarity index 96% rename from apps/ani-rss/2.0.13/docker-compose.yml rename to apps/ani-rss/2.0.14/docker-compose.yml index 1d4afec44..9d7c0a24e 100644 --- a/apps/ani-rss/2.0.13/docker-compose.yml +++ b/apps/ani-rss/2.0.14/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ani-rss: - image: wushuo894/ani-rss:v2.0.13 + image: wushuo894/ani-rss:v2.0.14 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/ani-rss/2.0.13/envs/default.env b/apps/ani-rss/2.0.14/envs/default.env similarity index 100% rename from apps/ani-rss/2.0.13/envs/default.env rename to apps/ani-rss/2.0.14/envs/default.env diff --git a/apps/ani-rss/2.0.13/envs/global.env b/apps/ani-rss/2.0.14/envs/global.env similarity index 100% rename from apps/ani-rss/2.0.13/envs/global.env rename to apps/ani-rss/2.0.14/envs/global.env diff --git a/apps/ani-rss/2.0.13/scripts/init.sh b/apps/ani-rss/2.0.14/scripts/init.sh similarity index 100% rename from apps/ani-rss/2.0.13/scripts/init.sh rename to apps/ani-rss/2.0.14/scripts/init.sh diff --git a/apps/ani-rss/2.0.13/scripts/uninstall.sh b/apps/ani-rss/2.0.14/scripts/uninstall.sh similarity index 100% rename from apps/ani-rss/2.0.13/scripts/uninstall.sh rename to apps/ani-rss/2.0.14/scripts/uninstall.sh diff --git a/apps/ani-rss/2.0.13/scripts/upgrade.sh b/apps/ani-rss/2.0.14/scripts/upgrade.sh similarity index 100% rename from apps/ani-rss/2.0.13/scripts/upgrade.sh rename to apps/ani-rss/2.0.14/scripts/upgrade.sh diff --git a/apps/bonita/0.9.4/data.yml b/apps/bonita/0.10.0/data.yml similarity index 100% rename from apps/bonita/0.9.4/data.yml rename to apps/bonita/0.10.0/data.yml diff --git a/apps/bonita/0.9.4/docker-compose.yml b/apps/bonita/0.10.0/docker-compose.yml similarity index 94% rename from apps/bonita/0.9.4/docker-compose.yml rename to apps/bonita/0.10.0/docker-compose.yml index c0eee1caf..bfe010676 100644 --- a/apps/bonita/0.9.4/docker-compose.yml +++ b/apps/bonita/0.10.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: bonita: - image: suwmlee/bonita:0.9.4 + image: suwmlee/bonita:0.10.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/bonita/0.9.4/envs/default.env b/apps/bonita/0.10.0/envs/default.env similarity index 100% rename from apps/bonita/0.9.4/envs/default.env rename to apps/bonita/0.10.0/envs/default.env diff --git a/apps/bonita/0.9.4/envs/global.env b/apps/bonita/0.10.0/envs/global.env similarity index 100% rename from apps/bonita/0.9.4/envs/global.env rename to apps/bonita/0.10.0/envs/global.env diff --git a/apps/bonita/0.9.4/scripts/init.sh b/apps/bonita/0.10.0/scripts/init.sh similarity index 100% rename from apps/bonita/0.9.4/scripts/init.sh rename to apps/bonita/0.10.0/scripts/init.sh diff --git a/apps/bonita/0.9.4/scripts/uninstall.sh b/apps/bonita/0.10.0/scripts/uninstall.sh similarity index 100% rename from apps/bonita/0.9.4/scripts/uninstall.sh rename to apps/bonita/0.10.0/scripts/uninstall.sh diff --git a/apps/bonita/0.9.4/scripts/upgrade.sh b/apps/bonita/0.10.0/scripts/upgrade.sh similarity index 100% rename from apps/bonita/0.9.4/scripts/upgrade.sh rename to apps/bonita/0.10.0/scripts/upgrade.sh diff --git a/apps/casdoor/1.947.0/config/init_data.json b/apps/casdoor/1.952.0/config/init_data.json similarity index 100% rename from apps/casdoor/1.947.0/config/init_data.json rename to apps/casdoor/1.952.0/config/init_data.json diff --git a/apps/casdoor/1.947.0/data.yml b/apps/casdoor/1.952.0/data.yml similarity index 100% rename from apps/casdoor/1.947.0/data.yml rename to apps/casdoor/1.952.0/data.yml diff --git a/apps/casdoor/1.947.0/docker-compose.yml b/apps/casdoor/1.952.0/docker-compose.yml similarity index 94% rename from apps/casdoor/1.947.0/docker-compose.yml rename to apps/casdoor/1.952.0/docker-compose.yml index b8baacf0e..c3edc78c3 100644 --- a/apps/casdoor/1.947.0/docker-compose.yml +++ b/apps/casdoor/1.952.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: casdoor: - image: casbin/casdoor:v1.947.0 + image: casbin/casdoor:v1.952.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/casdoor/1.947.0/envs/casdoor.env b/apps/casdoor/1.952.0/envs/casdoor.env similarity index 100% rename from apps/casdoor/1.947.0/envs/casdoor.env rename to apps/casdoor/1.952.0/envs/casdoor.env diff --git a/apps/casdoor/1.947.0/envs/default.env b/apps/casdoor/1.952.0/envs/default.env similarity index 100% rename from apps/casdoor/1.947.0/envs/default.env rename to apps/casdoor/1.952.0/envs/default.env diff --git a/apps/casdoor/1.947.0/envs/global.env b/apps/casdoor/1.952.0/envs/global.env similarity index 100% rename from apps/casdoor/1.947.0/envs/global.env rename to apps/casdoor/1.952.0/envs/global.env diff --git a/apps/casdoor/1.947.0/scripts/init.sh b/apps/casdoor/1.952.0/scripts/init.sh similarity index 100% rename from apps/casdoor/1.947.0/scripts/init.sh rename to apps/casdoor/1.952.0/scripts/init.sh diff --git a/apps/casdoor/1.947.0/scripts/uninstall.sh b/apps/casdoor/1.952.0/scripts/uninstall.sh similarity index 100% rename from apps/casdoor/1.947.0/scripts/uninstall.sh rename to apps/casdoor/1.952.0/scripts/uninstall.sh diff --git a/apps/casdoor/1.947.0/scripts/upgrade.sh b/apps/casdoor/1.952.0/scripts/upgrade.sh similarity index 100% rename from apps/casdoor/1.947.0/scripts/upgrade.sh rename to apps/casdoor/1.952.0/scripts/upgrade.sh diff --git a/apps/cloudreve/4.0.0/data.yml b/apps/cloudreve/4.1.2/data.yml similarity index 100% rename from apps/cloudreve/4.0.0/data.yml rename to apps/cloudreve/4.1.2/data.yml diff --git a/apps/cloudreve/4.0.0/docker-compose.yml b/apps/cloudreve/4.1.2/docker-compose.yml similarity index 92% rename from apps/cloudreve/4.0.0/docker-compose.yml rename to apps/cloudreve/4.1.2/docker-compose.yml index 8bdf569e0..6697de77d 100644 --- a/apps/cloudreve/4.0.0/docker-compose.yml +++ b/apps/cloudreve/4.1.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: cloudreve: - image: cloudreve/cloudreve:4.0.0 + image: cloudreve/cloudreve:4.1.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/cloudreve/4.0.0/envs/default.env b/apps/cloudreve/4.1.2/envs/default.env similarity index 100% rename from apps/cloudreve/4.0.0/envs/default.env rename to apps/cloudreve/4.1.2/envs/default.env diff --git a/apps/cloudreve/4.0.0/envs/global.env b/apps/cloudreve/4.1.2/envs/global.env similarity index 100% rename from apps/cloudreve/4.0.0/envs/global.env rename to apps/cloudreve/4.1.2/envs/global.env diff --git a/apps/cloudreve/4.0.0/scripts/init.sh b/apps/cloudreve/4.1.2/scripts/init.sh similarity index 100% rename from apps/cloudreve/4.0.0/scripts/init.sh rename to apps/cloudreve/4.1.2/scripts/init.sh diff --git a/apps/cloudreve/4.0.0/scripts/uninstall.sh b/apps/cloudreve/4.1.2/scripts/uninstall.sh similarity index 100% rename from apps/cloudreve/4.0.0/scripts/uninstall.sh rename to apps/cloudreve/4.1.2/scripts/uninstall.sh diff --git a/apps/cloudreve/4.0.0/scripts/upgrade.sh b/apps/cloudreve/4.1.2/scripts/upgrade.sh similarity index 100% rename from apps/cloudreve/4.0.0/scripts/upgrade.sh rename to apps/cloudreve/4.1.2/scripts/upgrade.sh diff --git a/apps/dozzle/8.13.2/data.yml b/apps/dozzle/8.13.3/data.yml similarity index 100% rename from apps/dozzle/8.13.2/data.yml rename to apps/dozzle/8.13.3/data.yml diff --git a/apps/dozzle/8.13.2/docker-compose.yml b/apps/dozzle/8.13.3/docker-compose.yml similarity index 95% rename from apps/dozzle/8.13.2/docker-compose.yml rename to apps/dozzle/8.13.3/docker-compose.yml index b4f3dc4b4..fcac58e24 100644 --- a/apps/dozzle/8.13.2/docker-compose.yml +++ b/apps/dozzle/8.13.3/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: dozzle: - image: amir20/dozzle:v8.13.2 + image: amir20/dozzle:v8.13.3 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/dozzle/8.13.2/envs/default.env b/apps/dozzle/8.13.3/envs/default.env similarity index 100% rename from apps/dozzle/8.13.2/envs/default.env rename to apps/dozzle/8.13.3/envs/default.env diff --git a/apps/dozzle/8.13.2/envs/global.env b/apps/dozzle/8.13.3/envs/global.env similarity index 100% rename from apps/dozzle/8.13.2/envs/global.env rename to apps/dozzle/8.13.3/envs/global.env diff --git a/apps/dozzle/8.13.2/scripts/init.sh b/apps/dozzle/8.13.3/scripts/init.sh similarity index 100% rename from apps/dozzle/8.13.2/scripts/init.sh rename to apps/dozzle/8.13.3/scripts/init.sh diff --git a/apps/dozzle/8.13.2/scripts/uninstall.sh b/apps/dozzle/8.13.3/scripts/uninstall.sh similarity index 100% rename from apps/dozzle/8.13.2/scripts/uninstall.sh rename to apps/dozzle/8.13.3/scripts/uninstall.sh diff --git a/apps/dozzle/8.13.2/scripts/upgrade.sh b/apps/dozzle/8.13.3/scripts/upgrade.sh similarity index 100% rename from apps/dozzle/8.13.2/scripts/upgrade.sh rename to apps/dozzle/8.13.3/scripts/upgrade.sh diff --git a/apps/emby/4.9.1.1/data.yml b/apps/emby/4.9.1.3/data.yml similarity index 100% rename from apps/emby/4.9.1.1/data.yml rename to apps/emby/4.9.1.3/data.yml diff --git a/apps/emby/4.9.1.1/docker-compose.yml b/apps/emby/4.9.1.3/docker-compose.yml similarity index 97% rename from apps/emby/4.9.1.1/docker-compose.yml rename to apps/emby/4.9.1.3/docker-compose.yml index 6562bad9e..667c9f828 100644 --- a/apps/emby/4.9.1.1/docker-compose.yml +++ b/apps/emby/4.9.1.3/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: emby: - image: emby/embyserver:4.9.1.1 + image: emby/embyserver:4.9.1.3 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/emby/4.9.1.1/envs/default.env b/apps/emby/4.9.1.3/envs/default.env similarity index 100% rename from apps/emby/4.9.1.1/envs/default.env rename to apps/emby/4.9.1.3/envs/default.env diff --git a/apps/emby/4.9.1.1/envs/global.env b/apps/emby/4.9.1.3/envs/global.env similarity index 100% rename from apps/emby/4.9.1.1/envs/global.env rename to apps/emby/4.9.1.3/envs/global.env diff --git a/apps/emby/4.9.1.1/scripts/init.sh b/apps/emby/4.9.1.3/scripts/init.sh similarity index 100% rename from apps/emby/4.9.1.1/scripts/init.sh rename to apps/emby/4.9.1.3/scripts/init.sh diff --git a/apps/emby/4.9.1.1/scripts/uninstall.sh b/apps/emby/4.9.1.3/scripts/uninstall.sh similarity index 100% rename from apps/emby/4.9.1.1/scripts/uninstall.sh rename to apps/emby/4.9.1.3/scripts/uninstall.sh diff --git a/apps/emby/4.9.1.1/scripts/upgrade.sh b/apps/emby/4.9.1.3/scripts/upgrade.sh similarity index 100% rename from apps/emby/4.9.1.1/scripts/upgrade.sh rename to apps/emby/4.9.1.3/scripts/upgrade.sh diff --git a/apps/ghost/5.127.1/data.yml b/apps/ghost/5.127.2/data.yml similarity index 100% rename from apps/ghost/5.127.1/data.yml rename to apps/ghost/5.127.2/data.yml diff --git a/apps/ghost/5.127.1/docker-compose.yml b/apps/ghost/5.127.2/docker-compose.yml similarity index 96% rename from apps/ghost/5.127.1/docker-compose.yml rename to apps/ghost/5.127.2/docker-compose.yml index 7455ce881..4a2302a87 100644 --- a/apps/ghost/5.127.1/docker-compose.yml +++ b/apps/ghost/5.127.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ghost: - image: ghost:5.127.1 + image: ghost:5.127.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/ghost/5.127.1/envs/default.env b/apps/ghost/5.127.2/envs/default.env similarity index 100% rename from apps/ghost/5.127.1/envs/default.env rename to apps/ghost/5.127.2/envs/default.env diff --git a/apps/ghost/5.127.1/envs/global.env b/apps/ghost/5.127.2/envs/global.env similarity index 100% rename from apps/ghost/5.127.1/envs/global.env rename to apps/ghost/5.127.2/envs/global.env diff --git a/apps/ghost/5.127.1/scripts/init.sh b/apps/ghost/5.127.2/scripts/init.sh similarity index 100% rename from apps/ghost/5.127.1/scripts/init.sh rename to apps/ghost/5.127.2/scripts/init.sh diff --git a/apps/ghost/5.127.1/scripts/uninstall.sh b/apps/ghost/5.127.2/scripts/uninstall.sh similarity index 100% rename from apps/ghost/5.127.1/scripts/uninstall.sh rename to apps/ghost/5.127.2/scripts/uninstall.sh diff --git a/apps/ghost/5.127.1/scripts/upgrade.sh b/apps/ghost/5.127.2/scripts/upgrade.sh similarity index 100% rename from apps/ghost/5.127.1/scripts/upgrade.sh rename to apps/ghost/5.127.2/scripts/upgrade.sh diff --git a/apps/gitea-runner/0.2.11/data.yml b/apps/gitea-runner/0.2.12/data.yml similarity index 100% rename from apps/gitea-runner/0.2.11/data.yml rename to apps/gitea-runner/0.2.12/data.yml diff --git a/apps/gitea-runner/0.2.11/docker-compose.yml b/apps/gitea-runner/0.2.12/docker-compose.yml similarity index 93% rename from apps/gitea-runner/0.2.11/docker-compose.yml rename to apps/gitea-runner/0.2.12/docker-compose.yml index dcd12c17f..4452a3d98 100644 --- a/apps/gitea-runner/0.2.11/docker-compose.yml +++ b/apps/gitea-runner/0.2.12/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: gitea: - image: gitea/act_runner:0.2.11 + image: gitea/act_runner:0.2.12 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/gitea-runner/0.2.11/envs/default.env b/apps/gitea-runner/0.2.12/envs/default.env similarity index 100% rename from apps/gitea-runner/0.2.11/envs/default.env rename to apps/gitea-runner/0.2.12/envs/default.env diff --git a/apps/gitea-runner/0.2.11/envs/global.env b/apps/gitea-runner/0.2.12/envs/global.env similarity index 100% rename from apps/gitea-runner/0.2.11/envs/global.env rename to apps/gitea-runner/0.2.12/envs/global.env diff --git a/apps/gitea-runner/0.2.11/scripts/init.sh b/apps/gitea-runner/0.2.12/scripts/init.sh similarity index 100% rename from apps/gitea-runner/0.2.11/scripts/init.sh rename to apps/gitea-runner/0.2.12/scripts/init.sh diff --git a/apps/gitea-runner/0.2.11/scripts/uninstall.sh b/apps/gitea-runner/0.2.12/scripts/uninstall.sh similarity index 100% rename from apps/gitea-runner/0.2.11/scripts/uninstall.sh rename to apps/gitea-runner/0.2.12/scripts/uninstall.sh diff --git a/apps/gitea-runner/0.2.11/scripts/upgrade.sh b/apps/gitea-runner/0.2.12/scripts/upgrade.sh similarity index 100% rename from apps/gitea-runner/0.2.11/scripts/upgrade.sh rename to apps/gitea-runner/0.2.12/scripts/upgrade.sh diff --git a/apps/halo-h2/2.21.1/data.yml b/apps/halo-h2/2.21.2/data.yml similarity index 100% rename from apps/halo-h2/2.21.1/data.yml rename to apps/halo-h2/2.21.2/data.yml diff --git a/apps/halo-h2/2.21.1/docker-compose.yml b/apps/halo-h2/2.21.2/docker-compose.yml similarity index 93% rename from apps/halo-h2/2.21.1/docker-compose.yml rename to apps/halo-h2/2.21.2/docker-compose.yml index b320e97a1..d08f3b114 100644 --- a/apps/halo-h2/2.21.1/docker-compose.yml +++ b/apps/halo-h2/2.21.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: halo: - image: halohub/halo:2.21.1 + image: halohub/halo:2.21.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/halo-h2/2.21.1/envs/default.env b/apps/halo-h2/2.21.2/envs/default.env similarity index 100% rename from apps/halo-h2/2.21.1/envs/default.env rename to apps/halo-h2/2.21.2/envs/default.env diff --git a/apps/halo-h2/2.21.1/envs/global.env b/apps/halo-h2/2.21.2/envs/global.env similarity index 100% rename from apps/halo-h2/2.21.1/envs/global.env rename to apps/halo-h2/2.21.2/envs/global.env diff --git a/apps/halo-h2/2.21.1/scripts/init.sh b/apps/halo-h2/2.21.2/scripts/init.sh similarity index 100% rename from apps/halo-h2/2.21.1/scripts/init.sh rename to apps/halo-h2/2.21.2/scripts/init.sh diff --git a/apps/halo-h2/2.21.1/scripts/uninstall.sh b/apps/halo-h2/2.21.2/scripts/uninstall.sh similarity index 100% rename from apps/halo-h2/2.21.1/scripts/uninstall.sh rename to apps/halo-h2/2.21.2/scripts/uninstall.sh diff --git a/apps/halo-h2/2.21.1/scripts/upgrade.sh b/apps/halo-h2/2.21.2/scripts/upgrade.sh similarity index 100% rename from apps/halo-h2/2.21.1/scripts/upgrade.sh rename to apps/halo-h2/2.21.2/scripts/upgrade.sh diff --git a/apps/halo/2.21.1/data.yml b/apps/halo/2.21.2/data.yml similarity index 100% rename from apps/halo/2.21.1/data.yml rename to apps/halo/2.21.2/data.yml diff --git a/apps/halo/2.21.1/docker-compose.yml b/apps/halo/2.21.2/docker-compose.yml similarity index 95% rename from apps/halo/2.21.1/docker-compose.yml rename to apps/halo/2.21.2/docker-compose.yml index 5ce890372..6c8f9e262 100644 --- a/apps/halo/2.21.1/docker-compose.yml +++ b/apps/halo/2.21.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: halo: - image: halohub/halo:2.21.1 + image: halohub/halo:2.21.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/halo/2.21.1/envs/default.env b/apps/halo/2.21.2/envs/default.env similarity index 100% rename from apps/halo/2.21.1/envs/default.env rename to apps/halo/2.21.2/envs/default.env diff --git a/apps/halo/2.21.1/envs/global.env b/apps/halo/2.21.2/envs/global.env similarity index 100% rename from apps/halo/2.21.1/envs/global.env rename to apps/halo/2.21.2/envs/global.env diff --git a/apps/halo/2.21.1/scripts/init.sh b/apps/halo/2.21.2/scripts/init.sh similarity index 100% rename from apps/halo/2.21.1/scripts/init.sh rename to apps/halo/2.21.2/scripts/init.sh diff --git a/apps/halo/2.21.1/scripts/uninstall.sh b/apps/halo/2.21.2/scripts/uninstall.sh similarity index 100% rename from apps/halo/2.21.1/scripts/uninstall.sh rename to apps/halo/2.21.2/scripts/uninstall.sh diff --git a/apps/halo/2.21.1/scripts/upgrade.sh b/apps/halo/2.21.2/scripts/upgrade.sh similarity index 100% rename from apps/halo/2.21.1/scripts/upgrade.sh rename to apps/halo/2.21.2/scripts/upgrade.sh diff --git a/apps/logto/1.28.0/data.yml b/apps/logto/1.29.0/data.yml similarity index 100% rename from apps/logto/1.28.0/data.yml rename to apps/logto/1.29.0/data.yml diff --git a/apps/logto/1.28.0/docker-compose.yml b/apps/logto/1.29.0/docker-compose.yml similarity index 96% rename from apps/logto/1.28.0/docker-compose.yml rename to apps/logto/1.29.0/docker-compose.yml index b225f589c..7c1ca1ac3 100644 --- a/apps/logto/1.28.0/docker-compose.yml +++ b/apps/logto/1.29.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: logto: - image: svhd/logto:1.28.0 + image: svhd/logto:1.29.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/logto/1.28.0/envs/default.env b/apps/logto/1.29.0/envs/default.env similarity index 100% rename from apps/logto/1.28.0/envs/default.env rename to apps/logto/1.29.0/envs/default.env diff --git a/apps/logto/1.28.0/envs/global.env b/apps/logto/1.29.0/envs/global.env similarity index 100% rename from apps/logto/1.28.0/envs/global.env rename to apps/logto/1.29.0/envs/global.env diff --git a/apps/logto/1.28.0/scripts/init.sh b/apps/logto/1.29.0/scripts/init.sh similarity index 100% rename from apps/logto/1.28.0/scripts/init.sh rename to apps/logto/1.29.0/scripts/init.sh diff --git a/apps/logto/1.28.0/scripts/uninstall.sh b/apps/logto/1.29.0/scripts/uninstall.sh similarity index 100% rename from apps/logto/1.28.0/scripts/uninstall.sh rename to apps/logto/1.29.0/scripts/uninstall.sh diff --git a/apps/logto/1.28.0/scripts/upgrade.sh b/apps/logto/1.29.0/scripts/upgrade.sh similarity index 100% rename from apps/logto/1.28.0/scripts/upgrade.sh rename to apps/logto/1.29.0/scripts/upgrade.sh diff --git a/apps/mdc-ng/1.3.0/data.yml b/apps/mdc-ng/1.8.0/data.yml similarity index 100% rename from apps/mdc-ng/1.3.0/data.yml rename to apps/mdc-ng/1.8.0/data.yml diff --git a/apps/mdc-ng/1.3.0/docker-compose.yml b/apps/mdc-ng/1.8.0/docker-compose.yml similarity index 96% rename from apps/mdc-ng/1.3.0/docker-compose.yml rename to apps/mdc-ng/1.8.0/docker-compose.yml index 0345a59dd..5a98d0d4c 100644 --- a/apps/mdc-ng/1.3.0/docker-compose.yml +++ b/apps/mdc-ng/1.8.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: mdc-ng: - image: mdcng/mdc:1.3.0 + image: mdcng/mdc:1.8.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/mdc-ng/1.3.0/envs/default.env b/apps/mdc-ng/1.8.0/envs/default.env similarity index 100% rename from apps/mdc-ng/1.3.0/envs/default.env rename to apps/mdc-ng/1.8.0/envs/default.env diff --git a/apps/mdc-ng/1.3.0/envs/global.env b/apps/mdc-ng/1.8.0/envs/global.env similarity index 100% rename from apps/mdc-ng/1.3.0/envs/global.env rename to apps/mdc-ng/1.8.0/envs/global.env diff --git a/apps/mdc-ng/1.3.0/scripts/init.sh b/apps/mdc-ng/1.8.0/scripts/init.sh similarity index 100% rename from apps/mdc-ng/1.3.0/scripts/init.sh rename to apps/mdc-ng/1.8.0/scripts/init.sh diff --git a/apps/mdc-ng/1.3.0/scripts/uninstall.sh b/apps/mdc-ng/1.8.0/scripts/uninstall.sh similarity index 100% rename from apps/mdc-ng/1.3.0/scripts/uninstall.sh rename to apps/mdc-ng/1.8.0/scripts/uninstall.sh diff --git a/apps/mdc-ng/1.3.0/scripts/upgrade.sh b/apps/mdc-ng/1.8.0/scripts/upgrade.sh similarity index 100% rename from apps/mdc-ng/1.3.0/scripts/upgrade.sh rename to apps/mdc-ng/1.8.0/scripts/upgrade.sh diff --git a/apps/movie-pilot/2.5.8/data.yml b/apps/movie-pilot/2.5.9/data.yml similarity index 100% rename from apps/movie-pilot/2.5.8/data.yml rename to apps/movie-pilot/2.5.9/data.yml diff --git a/apps/movie-pilot/2.5.8/docker-compose.yml b/apps/movie-pilot/2.5.9/docker-compose.yml similarity index 97% rename from apps/movie-pilot/2.5.8/docker-compose.yml rename to apps/movie-pilot/2.5.9/docker-compose.yml index 86bc5c12f..6bd3f4a92 100644 --- a/apps/movie-pilot/2.5.8/docker-compose.yml +++ b/apps/movie-pilot/2.5.9/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: movie-pilot-v2: - image: jxxghp/moviepilot-v2:2.5.8 + image: jxxghp/moviepilot-v2:2.5.9 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/movie-pilot/2.5.8/envs/default.env b/apps/movie-pilot/2.5.9/envs/default.env similarity index 100% rename from apps/movie-pilot/2.5.8/envs/default.env rename to apps/movie-pilot/2.5.9/envs/default.env diff --git a/apps/movie-pilot/2.5.8/envs/global.env b/apps/movie-pilot/2.5.9/envs/global.env similarity index 100% rename from apps/movie-pilot/2.5.8/envs/global.env rename to apps/movie-pilot/2.5.9/envs/global.env diff --git a/apps/movie-pilot/2.5.8/envs/movie-pilot.env b/apps/movie-pilot/2.5.9/envs/movie-pilot.env similarity index 100% rename from apps/movie-pilot/2.5.8/envs/movie-pilot.env rename to apps/movie-pilot/2.5.9/envs/movie-pilot.env diff --git a/apps/movie-pilot/2.5.8/scripts/init.sh b/apps/movie-pilot/2.5.9/scripts/init.sh similarity index 100% rename from apps/movie-pilot/2.5.8/scripts/init.sh rename to apps/movie-pilot/2.5.9/scripts/init.sh diff --git a/apps/movie-pilot/2.5.8/scripts/uninstall.sh b/apps/movie-pilot/2.5.9/scripts/uninstall.sh similarity index 100% rename from apps/movie-pilot/2.5.8/scripts/uninstall.sh rename to apps/movie-pilot/2.5.9/scripts/uninstall.sh diff --git a/apps/movie-pilot/2.5.8/scripts/upgrade.sh b/apps/movie-pilot/2.5.9/scripts/upgrade.sh similarity index 100% rename from apps/movie-pilot/2.5.8/scripts/upgrade.sh rename to apps/movie-pilot/2.5.9/scripts/upgrade.sh diff --git a/apps/n8n/1.100.0/data.yml b/apps/n8n/1.100.1/data.yml similarity index 100% rename from apps/n8n/1.100.0/data.yml rename to apps/n8n/1.100.1/data.yml diff --git a/apps/n8n/1.100.0/docker-compose.yml b/apps/n8n/1.100.1/docker-compose.yml similarity index 95% rename from apps/n8n/1.100.0/docker-compose.yml rename to apps/n8n/1.100.1/docker-compose.yml index 979c1bb96..c3aa10724 100644 --- a/apps/n8n/1.100.0/docker-compose.yml +++ b/apps/n8n/1.100.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: n8n: - image: n8nio/n8n:1.100.0 + image: n8nio/n8n:1.100.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/n8n/1.100.0/envs/default.env b/apps/n8n/1.100.1/envs/default.env similarity index 100% rename from apps/n8n/1.100.0/envs/default.env rename to apps/n8n/1.100.1/envs/default.env diff --git a/apps/n8n/1.100.0/envs/global.env b/apps/n8n/1.100.1/envs/global.env similarity index 100% rename from apps/n8n/1.100.0/envs/global.env rename to apps/n8n/1.100.1/envs/global.env diff --git a/apps/n8n/1.100.0/scripts/init.sh b/apps/n8n/1.100.1/scripts/init.sh similarity index 100% rename from apps/n8n/1.100.0/scripts/init.sh rename to apps/n8n/1.100.1/scripts/init.sh diff --git a/apps/n8n/1.100.0/scripts/uninstall.sh b/apps/n8n/1.100.1/scripts/uninstall.sh similarity index 100% rename from apps/n8n/1.100.0/scripts/uninstall.sh rename to apps/n8n/1.100.1/scripts/uninstall.sh diff --git a/apps/n8n/1.100.0/scripts/upgrade.sh b/apps/n8n/1.100.1/scripts/upgrade.sh similarity index 100% rename from apps/n8n/1.100.0/scripts/upgrade.sh rename to apps/n8n/1.100.1/scripts/upgrade.sh diff --git a/apps/nacos-derby/3.0.1/data.yml b/apps/nacos-derby/3.0.2/data.yml similarity index 100% rename from apps/nacos-derby/3.0.1/data.yml rename to apps/nacos-derby/3.0.2/data.yml diff --git a/apps/nacos-derby/3.0.1/docker-compose.yml b/apps/nacos-derby/3.0.2/docker-compose.yml similarity index 95% rename from apps/nacos-derby/3.0.1/docker-compose.yml rename to apps/nacos-derby/3.0.2/docker-compose.yml index 3bcd68c05..eac457c1a 100644 --- a/apps/nacos-derby/3.0.1/docker-compose.yml +++ b/apps/nacos-derby/3.0.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nacos: - image: nacos/nacos-server:v3.0.1 + image: nacos/nacos-server:v3.0.2 container_name: ${CONTAINER_NAME} restart: always labels: diff --git a/apps/nacos-derby/3.0.1/envs/default.env b/apps/nacos-derby/3.0.2/envs/default.env similarity index 100% rename from apps/nacos-derby/3.0.1/envs/default.env rename to apps/nacos-derby/3.0.2/envs/default.env diff --git a/apps/nacos-derby/3.0.1/envs/global.env b/apps/nacos-derby/3.0.2/envs/global.env similarity index 100% rename from apps/nacos-derby/3.0.1/envs/global.env rename to apps/nacos-derby/3.0.2/envs/global.env diff --git a/apps/nacos-derby/3.0.1/init/mysql-schema.sql b/apps/nacos-derby/3.0.2/init/mysql-schema.sql similarity index 100% rename from apps/nacos-derby/3.0.1/init/mysql-schema.sql rename to apps/nacos-derby/3.0.2/init/mysql-schema.sql diff --git a/apps/nacos-derby/3.0.1/scripts/init.sh b/apps/nacos-derby/3.0.2/scripts/init.sh similarity index 100% rename from apps/nacos-derby/3.0.1/scripts/init.sh rename to apps/nacos-derby/3.0.2/scripts/init.sh diff --git a/apps/nacos-derby/3.0.1/scripts/uninstall.sh b/apps/nacos-derby/3.0.2/scripts/uninstall.sh similarity index 100% rename from apps/nacos-derby/3.0.1/scripts/uninstall.sh rename to apps/nacos-derby/3.0.2/scripts/uninstall.sh diff --git a/apps/nacos-derby/3.0.1/scripts/upgrade.sh b/apps/nacos-derby/3.0.2/scripts/upgrade.sh similarity index 100% rename from apps/nacos-derby/3.0.1/scripts/upgrade.sh rename to apps/nacos-derby/3.0.2/scripts/upgrade.sh diff --git a/apps/nacos/3.0.1/data.yml b/apps/nacos/3.0.2/data.yml similarity index 100% rename from apps/nacos/3.0.1/data.yml rename to apps/nacos/3.0.2/data.yml diff --git a/apps/nacos/3.0.1/docker-compose.yml b/apps/nacos/3.0.2/docker-compose.yml similarity index 95% rename from apps/nacos/3.0.1/docker-compose.yml rename to apps/nacos/3.0.2/docker-compose.yml index 5cbd6af95..704fcd7d7 100644 --- a/apps/nacos/3.0.1/docker-compose.yml +++ b/apps/nacos/3.0.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nacos: - image: nacos/nacos-server:v3.0.1 + image: nacos/nacos-server:v3.0.2 container_name: ${CONTAINER_NAME} restart: always labels: diff --git a/apps/nacos/3.0.1/envs/default.env b/apps/nacos/3.0.2/envs/default.env similarity index 100% rename from apps/nacos/3.0.1/envs/default.env rename to apps/nacos/3.0.2/envs/default.env diff --git a/apps/nacos/3.0.1/envs/global.env b/apps/nacos/3.0.2/envs/global.env similarity index 100% rename from apps/nacos/3.0.1/envs/global.env rename to apps/nacos/3.0.2/envs/global.env diff --git a/apps/nacos/3.0.1/init/mysql-schema.sql b/apps/nacos/3.0.2/init/mysql-schema.sql similarity index 100% rename from apps/nacos/3.0.1/init/mysql-schema.sql rename to apps/nacos/3.0.2/init/mysql-schema.sql diff --git a/apps/nacos/3.0.1/scripts/init.sh b/apps/nacos/3.0.2/scripts/init.sh similarity index 100% rename from apps/nacos/3.0.1/scripts/init.sh rename to apps/nacos/3.0.2/scripts/init.sh diff --git a/apps/nacos/3.0.1/scripts/uninstall.sh b/apps/nacos/3.0.2/scripts/uninstall.sh similarity index 100% rename from apps/nacos/3.0.1/scripts/uninstall.sh rename to apps/nacos/3.0.2/scripts/uninstall.sh diff --git a/apps/nacos/3.0.1/scripts/upgrade.sh b/apps/nacos/3.0.2/scripts/upgrade.sh similarity index 100% rename from apps/nacos/3.0.1/scripts/upgrade.sh rename to apps/nacos/3.0.2/scripts/upgrade.sh diff --git a/apps/nodepassdash/2.0.2/data.yml b/apps/nodepassdash/2.1.0/data.yml similarity index 100% rename from apps/nodepassdash/2.0.2/data.yml rename to apps/nodepassdash/2.1.0/data.yml diff --git a/apps/nodepassdash/2.0.2/docker-compose.yml b/apps/nodepassdash/2.1.0/docker-compose.yml similarity index 91% rename from apps/nodepassdash/2.0.2/docker-compose.yml rename to apps/nodepassdash/2.1.0/docker-compose.yml index 7c8f507a0..041758610 100644 --- a/apps/nodepassdash/2.0.2/docker-compose.yml +++ b/apps/nodepassdash/2.1.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nodepassdash: - image: ghcr.io/nodepassproject/nodepassdash:2.0.2 + image: ghcr.io/nodepassproject/nodepassdash:2.1.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/nodepassdash/2.0.2/envs/default.env b/apps/nodepassdash/2.1.0/envs/default.env similarity index 100% rename from apps/nodepassdash/2.0.2/envs/default.env rename to apps/nodepassdash/2.1.0/envs/default.env diff --git a/apps/nodepassdash/2.0.2/envs/global.env b/apps/nodepassdash/2.1.0/envs/global.env similarity index 100% rename from apps/nodepassdash/2.0.2/envs/global.env rename to apps/nodepassdash/2.1.0/envs/global.env diff --git a/apps/nodepassdash/2.0.2/scripts/init.sh b/apps/nodepassdash/2.1.0/scripts/init.sh similarity index 100% rename from apps/nodepassdash/2.0.2/scripts/init.sh rename to apps/nodepassdash/2.1.0/scripts/init.sh diff --git a/apps/nodepassdash/2.0.2/scripts/uninstall.sh b/apps/nodepassdash/2.1.0/scripts/uninstall.sh similarity index 100% rename from apps/nodepassdash/2.0.2/scripts/uninstall.sh rename to apps/nodepassdash/2.1.0/scripts/uninstall.sh diff --git a/apps/nodepassdash/2.0.2/scripts/upgrade.sh b/apps/nodepassdash/2.1.0/scripts/upgrade.sh similarity index 100% rename from apps/nodepassdash/2.0.2/scripts/upgrade.sh rename to apps/nodepassdash/2.1.0/scripts/upgrade.sh diff --git a/apps/ollama/0.9.2/data.yml b/apps/ollama/0.9.3/data.yml similarity index 100% rename from apps/ollama/0.9.2/data.yml rename to apps/ollama/0.9.3/data.yml diff --git a/apps/ollama/0.9.2/docker-compose.yml b/apps/ollama/0.9.3/docker-compose.yml similarity index 97% rename from apps/ollama/0.9.2/docker-compose.yml rename to apps/ollama/0.9.3/docker-compose.yml index 3205c3f6c..994ec233b 100644 --- a/apps/ollama/0.9.2/docker-compose.yml +++ b/apps/ollama/0.9.3/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: ollama: - image: ollama/ollama:0.9.2 + image: ollama/ollama:0.9.3 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/ollama/0.9.2/envs/default.env b/apps/ollama/0.9.3/envs/default.env similarity index 100% rename from apps/ollama/0.9.2/envs/default.env rename to apps/ollama/0.9.3/envs/default.env diff --git a/apps/ollama/0.9.2/envs/global.env b/apps/ollama/0.9.3/envs/global.env similarity index 100% rename from apps/ollama/0.9.2/envs/global.env rename to apps/ollama/0.9.3/envs/global.env diff --git a/apps/ollama/0.9.2/scripts/init.sh b/apps/ollama/0.9.3/scripts/init.sh similarity index 100% rename from apps/ollama/0.9.2/scripts/init.sh rename to apps/ollama/0.9.3/scripts/init.sh diff --git a/apps/ollama/0.9.2/scripts/uninstall.sh b/apps/ollama/0.9.3/scripts/uninstall.sh similarity index 100% rename from apps/ollama/0.9.2/scripts/uninstall.sh rename to apps/ollama/0.9.3/scripts/uninstall.sh diff --git a/apps/ollama/0.9.2/scripts/upgrade.sh b/apps/ollama/0.9.3/scripts/upgrade.sh similarity index 100% rename from apps/ollama/0.9.2/scripts/upgrade.sh rename to apps/ollama/0.9.3/scripts/upgrade.sh diff --git a/apps/onedev/11.11.1/data.yml b/apps/onedev/11.11.2/data.yml similarity index 100% rename from apps/onedev/11.11.1/data.yml rename to apps/onedev/11.11.2/data.yml diff --git a/apps/onedev/11.11.1/docker-compose.yml b/apps/onedev/11.11.2/docker-compose.yml similarity index 96% rename from apps/onedev/11.11.1/docker-compose.yml rename to apps/onedev/11.11.2/docker-compose.yml index fe3c187e9..4d45d3448 100644 --- a/apps/onedev/11.11.1/docker-compose.yml +++ b/apps/onedev/11.11.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: onedev: - image: 1dev/server:11.11.1 + image: 1dev/server:11.11.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/onedev/11.11.1/envs/default.env b/apps/onedev/11.11.2/envs/default.env similarity index 100% rename from apps/onedev/11.11.1/envs/default.env rename to apps/onedev/11.11.2/envs/default.env diff --git a/apps/onedev/11.11.1/envs/global.env b/apps/onedev/11.11.2/envs/global.env similarity index 100% rename from apps/onedev/11.11.1/envs/global.env rename to apps/onedev/11.11.2/envs/global.env diff --git a/apps/onedev/11.11.1/envs/onedev.env b/apps/onedev/11.11.2/envs/onedev.env similarity index 100% rename from apps/onedev/11.11.1/envs/onedev.env rename to apps/onedev/11.11.2/envs/onedev.env diff --git a/apps/onedev/11.11.1/scripts/init.sh b/apps/onedev/11.11.2/scripts/init.sh similarity index 100% rename from apps/onedev/11.11.1/scripts/init.sh rename to apps/onedev/11.11.2/scripts/init.sh diff --git a/apps/onedev/11.11.1/scripts/uninstall.sh b/apps/onedev/11.11.2/scripts/uninstall.sh similarity index 100% rename from apps/onedev/11.11.1/scripts/uninstall.sh rename to apps/onedev/11.11.2/scripts/uninstall.sh diff --git a/apps/onedev/11.11.1/scripts/upgrade.sh b/apps/onedev/11.11.2/scripts/upgrade.sh similarity index 100% rename from apps/onedev/11.11.1/scripts/upgrade.sh rename to apps/onedev/11.11.2/scripts/upgrade.sh diff --git a/apps/qinglong/2.19.1/data.yml b/apps/qinglong/2.19.2/data.yml similarity index 100% rename from apps/qinglong/2.19.1/data.yml rename to apps/qinglong/2.19.2/data.yml diff --git a/apps/qinglong/2.19.1/docker-compose.yml b/apps/qinglong/2.19.2/docker-compose.yml similarity index 91% rename from apps/qinglong/2.19.1/docker-compose.yml rename to apps/qinglong/2.19.2/docker-compose.yml index 7fa619c23..f1249abfc 100644 --- a/apps/qinglong/2.19.1/docker-compose.yml +++ b/apps/qinglong/2.19.2/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: qinglong: - image: whyour/qinglong:2.19.1 + image: whyour/qinglong:2.19.2 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/qinglong/2.19.1/envs/default.env b/apps/qinglong/2.19.2/envs/default.env similarity index 100% rename from apps/qinglong/2.19.1/envs/default.env rename to apps/qinglong/2.19.2/envs/default.env diff --git a/apps/qinglong/2.19.1/envs/global.env b/apps/qinglong/2.19.2/envs/global.env similarity index 100% rename from apps/qinglong/2.19.1/envs/global.env rename to apps/qinglong/2.19.2/envs/global.env diff --git a/apps/qinglong/2.19.1/scripts/init.sh b/apps/qinglong/2.19.2/scripts/init.sh similarity index 100% rename from apps/qinglong/2.19.1/scripts/init.sh rename to apps/qinglong/2.19.2/scripts/init.sh diff --git a/apps/qinglong/2.19.1/scripts/uninstall.sh b/apps/qinglong/2.19.2/scripts/uninstall.sh similarity index 100% rename from apps/qinglong/2.19.1/scripts/uninstall.sh rename to apps/qinglong/2.19.2/scripts/uninstall.sh diff --git a/apps/qinglong/2.19.1/scripts/upgrade.sh b/apps/qinglong/2.19.2/scripts/upgrade.sh similarity index 100% rename from apps/qinglong/2.19.1/scripts/upgrade.sh rename to apps/qinglong/2.19.2/scripts/upgrade.sh diff --git a/apps/rsshub/2025-06-25/data.yml b/apps/rsshub/2025-06-28/data.yml similarity index 100% rename from apps/rsshub/2025-06-25/data.yml rename to apps/rsshub/2025-06-28/data.yml diff --git a/apps/rsshub/2025-06-25/docker-compose.yml b/apps/rsshub/2025-06-28/docker-compose.yml similarity index 97% rename from apps/rsshub/2025-06-25/docker-compose.yml rename to apps/rsshub/2025-06-28/docker-compose.yml index 0c53e17b5..a5400a4a3 100644 --- a/apps/rsshub/2025-06-25/docker-compose.yml +++ b/apps/rsshub/2025-06-28/docker-compose.yml @@ -23,7 +23,7 @@ services: timeout: 10s retries: 3 rsshub: - image: diygod/rsshub:2025-06-25 + image: diygod/rsshub:2025-06-28 container_name: rsshub-${CONTAINER_NAME} depends_on: - browserless diff --git a/apps/rsshub/2025-06-25/envs/default.env b/apps/rsshub/2025-06-28/envs/default.env similarity index 100% rename from apps/rsshub/2025-06-25/envs/default.env rename to apps/rsshub/2025-06-28/envs/default.env diff --git a/apps/rsshub/2025-06-25/envs/global.env b/apps/rsshub/2025-06-28/envs/global.env similarity index 100% rename from apps/rsshub/2025-06-25/envs/global.env rename to apps/rsshub/2025-06-28/envs/global.env diff --git a/apps/rsshub/2025-06-25/scripts/init.sh b/apps/rsshub/2025-06-28/scripts/init.sh similarity index 100% rename from apps/rsshub/2025-06-25/scripts/init.sh rename to apps/rsshub/2025-06-28/scripts/init.sh diff --git a/apps/rsshub/2025-06-25/scripts/uninstall.sh b/apps/rsshub/2025-06-28/scripts/uninstall.sh similarity index 100% rename from apps/rsshub/2025-06-25/scripts/uninstall.sh rename to apps/rsshub/2025-06-28/scripts/uninstall.sh diff --git a/apps/rsshub/2025-06-25/scripts/upgrade.sh b/apps/rsshub/2025-06-28/scripts/upgrade.sh similarity index 100% rename from apps/rsshub/2025-06-25/scripts/upgrade.sh rename to apps/rsshub/2025-06-28/scripts/upgrade.sh diff --git a/apps/slink/1.4.9/data.yml b/apps/slink/1.5.0/data.yml similarity index 100% rename from apps/slink/1.4.9/data.yml rename to apps/slink/1.5.0/data.yml diff --git a/apps/slink/1.4.9/docker-compose.yml b/apps/slink/1.5.0/docker-compose.yml similarity index 95% rename from apps/slink/1.4.9/docker-compose.yml rename to apps/slink/1.5.0/docker-compose.yml index 630768259..ef92e5b3b 100644 --- a/apps/slink/1.4.9/docker-compose.yml +++ b/apps/slink/1.5.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: slink: - image: anirdev/slink:v1.4.9 + image: anirdev/slink:v1.5.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/slink/1.4.9/envs/default.env b/apps/slink/1.5.0/envs/default.env similarity index 100% rename from apps/slink/1.4.9/envs/default.env rename to apps/slink/1.5.0/envs/default.env diff --git a/apps/slink/1.4.9/envs/global.env b/apps/slink/1.5.0/envs/global.env similarity index 100% rename from apps/slink/1.4.9/envs/global.env rename to apps/slink/1.5.0/envs/global.env diff --git a/apps/slink/1.4.9/scripts/init.sh b/apps/slink/1.5.0/scripts/init.sh similarity index 100% rename from apps/slink/1.4.9/scripts/init.sh rename to apps/slink/1.5.0/scripts/init.sh diff --git a/apps/slink/1.4.9/scripts/uninstall.sh b/apps/slink/1.5.0/scripts/uninstall.sh similarity index 100% rename from apps/slink/1.4.9/scripts/uninstall.sh rename to apps/slink/1.5.0/scripts/uninstall.sh diff --git a/apps/slink/1.4.9/scripts/upgrade.sh b/apps/slink/1.5.0/scripts/upgrade.sh similarity index 100% rename from apps/slink/1.4.9/scripts/upgrade.sh rename to apps/slink/1.5.0/scripts/upgrade.sh diff --git a/appstore/ammds/1.6.14/.env b/appstore/ammds-ol8/1.6.18/.env similarity index 100% rename from appstore/ammds/1.6.14/.env rename to appstore/ammds-ol8/1.6.18/.env diff --git a/appstore/ammds/1.6.14/data.yml b/appstore/ammds-ol8/1.6.18/data.yml similarity index 100% rename from appstore/ammds/1.6.14/data.yml rename to appstore/ammds-ol8/1.6.18/data.yml diff --git a/appstore/ammds-ol8/1.6.18/docker-compose.yml b/appstore/ammds-ol8/1.6.18/docker-compose.yml new file mode 100644 index 000000000..22fa20995 --- /dev/null +++ b/appstore/ammds-ol8/1.6.18/docker-compose.yml @@ -0,0 +1,33 @@ +networks: + 1panel-network: + external: true +services: + ammds: + container_name: ammds-ol8 + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080} + - AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523} + image: qyg2297248353/ammds:v1.6.18-ol8 + labels: + createdBy: Apps + network_mode: ${NETWORK_MODE:-host} + ports: + - ${PANEL_APP_PORT_HTTP:-8080}:${PANEL_APP_PORT_HTTP:-8080} + restart: always + stdin_open: true + tty: true + ulimits: + nofile: + hard: 524288 + soft: 524288 + volumes: + - ${AMMDS_ROOT_PATH}/data:/ammds/data + - ${AMMDS_ROOT_PATH}/db:/ammds/db + - ${AMMDS_ROOT_PATH}/download:/ammds/download + - ${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} diff --git a/appstore/ammds/1.6.14/envs/default.env b/appstore/ammds-ol8/1.6.18/envs/default.env similarity index 100% rename from appstore/ammds/1.6.14/envs/default.env rename to appstore/ammds-ol8/1.6.18/envs/default.env diff --git a/appstore/ammds/1.6.14/envs/global.env b/appstore/ammds-ol8/1.6.18/envs/global.env similarity index 100% rename from appstore/ammds/1.6.14/envs/global.env rename to appstore/ammds-ol8/1.6.18/envs/global.env diff --git a/appstore/ammds/1.6.14/scripts/init.sh b/appstore/ammds-ol8/1.6.18/scripts/init.sh similarity index 100% rename from appstore/ammds/1.6.14/scripts/init.sh rename to appstore/ammds-ol8/1.6.18/scripts/init.sh diff --git a/appstore/ammds/1.6.14/scripts/uninstall.sh b/appstore/ammds-ol8/1.6.18/scripts/uninstall.sh similarity index 100% rename from appstore/ammds/1.6.14/scripts/uninstall.sh rename to appstore/ammds-ol8/1.6.18/scripts/uninstall.sh diff --git a/appstore/ammds/1.6.14/scripts/upgrade.sh b/appstore/ammds-ol8/1.6.18/scripts/upgrade.sh similarity index 100% rename from appstore/ammds/1.6.14/scripts/upgrade.sh rename to appstore/ammds-ol8/1.6.18/scripts/upgrade.sh diff --git a/appstore/ammds-ol8/README.md b/appstore/ammds-ol8/README.md new file mode 100644 index 000000000..9332d96f9 --- /dev/null +++ b/appstore/ammds-ol8/README.md @@ -0,0 +1,77 @@ +# AMMDS (兼容版) + +个人影视数据管理平台 + +![AMMDS](https://file.lifebus.top/imgs/ammds_cover.png) + +AMMDS(Adult Movie MetaData Scraper)是一款私人专属数据管理平台,专注于帮助用户轻松管理和整理个人影视库。通过智能刮削元数据、演员识别、多源数据匹配等功能,打造专属的家庭影院体验。 + +![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) + +
+
+ ⚠️ +
+ 温馨提示
+ 该软件为离线产品,数据来源由使用者手动录入。 + 请勿在国内宣传该产品,如有需要请使用简称:AMMDS +
+
+
+ +
+
+ ⚠️ +
+ 插件提示
+ 集成插件需要网络功能 + 如开启任一集成插件,将视为您已同意接入网络连接 +
+
+
+ +## 🎬 主要特性 + +### 影视管理 + +- 支持多种视频格式,轻松管理个人影视库。 +- 自动刮削影片信息,提供封面、简介、评分等元数据。 + +### 👤 演员识别 + +- 自动识别影视作品中的演员信息。 +- 提供详细的演员资料和作品列表,方便查找和浏览。 + +### 📄 元数据获取 + +- 自动从互联网获取影视作品的元数据。 +- 确保影视库信息全面丰富。 + +### 📤 影视分享 + +- 支持影视库分享功能,轻松共享你的影视收藏。 +- 适用于家庭影院和私人影视社群。 + +### 🔌 插件集成 + +- 提供丰富的插件支持,扩展更多功能。 +- 可轻松集成到现有的媒体服务器或播放器中。 + +### 🌐 多源刮削 + +- 支持多个数据源(如 TMDB、豆瓣等)获取影视信息。 +- 确保数据的全面性和准确性。 + +### 🤖 智能匹配 + +- 通过智能算法自动匹配本地文件与在线元数据。 +- 降低手动操作成本,提高整理效率。 + +### 🖥️ 跨平台支持 + +- 兼容 **Windows、macOS、Linux** 等操作系统。 +- 随时随地管理你的影视库。 + +--- + +![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/appstore/ammds-ol8/data.yml b/appstore/ammds-ol8/data.yml new file mode 100644 index 000000000..cc35a8969 --- /dev/null +++ b/appstore/ammds-ol8/data.yml @@ -0,0 +1,14 @@ +additionalProperties: + key: ammds-ol8 + name: AMMDS (兼容版) + tags: + - WebSite + - Local + shortDescZh: 个人影视数据管理平台 + shortDescEn: Personal movie and TV data management platform + type: website + crossVersionUpdate: true + limit: 0 + website: https://ammds.lifebus.top/ + github: https://github.com/QYG2297248353/AMMDS-Docker/ + document: https://ammds.lifebus.top/ diff --git a/appstore/ammds-ol8/logo.png b/appstore/ammds-ol8/logo.png new file mode 100644 index 000000000..0e0b9a189 Binary files /dev/null and b/appstore/ammds-ol8/logo.png differ diff --git a/appstore/ammds/1.6.18/.env b/appstore/ammds/1.6.18/.env new file mode 100644 index 000000000..8a28c6046 --- /dev/null +++ b/appstore/ammds/1.6.18/.env @@ -0,0 +1,45 @@ +# 网络模式 [必填] +NETWORK_MODE=1panel-network + +# 数据持久化路径 [必填] +AMMDS_ROOT_PATH=/home/ammds + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8080 + +# API 端口 [必填] +PANEL_APP_PORT_API=9523 + +# MetaTube URL +AMMDS_METATUBE_URL= + +# MetaTube 密钥 +AMMDS_METATUBE_TOKEN= + +# Prowlarr URL +AMMDS_PROWLARR_URL= + +# Prowlarr 密钥 +AMMDS_PROWLARR_TOKEN= + +# IYUU 密钥 +AMMDS_IYUU_TOKEN= + +# qBittorrent URL +AMMDS_QBITTORRENT_URL= + +# qBittorrent 用户名 +AMMDS_QBITTORRENT_USERNAME= + +# qBittorrent 密码 +AMMDS_QBITTORRENT_PASSWORD= + +# 自定义挂载目录 1 +CUSTOM_MOUNT_DIRECTORY_1= + +# 自定义挂载目录 2 +CUSTOM_MOUNT_DIRECTORY_2= + +# 自定义挂载目录 3 +CUSTOM_MOUNT_DIRECTORY_3= + diff --git a/appstore/ammds/1.6.18/data.yml b/appstore/ammds/1.6.18/data.yml new file mode 100644 index 000000000..dddda8115 --- /dev/null +++ b/appstore/ammds/1.6.18/data.yml @@ -0,0 +1,118 @@ +additionalProperties: + formFields: + - default: "1panel-network" + edit: true + envKey: NETWORK_MODE + labelZh: 网络模式 + labelEn: Network mode + required: true + type: select + values: + - label: 主机网络模式 + value: "host" + - label: 桥接网络模式 + value: "bridge" + - label: 无网络模式 + value: "none" + - label: 1panel-network + value: "1panel-network" + - default: "/home/ammds" + edit: true + envKey: AMMDS_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 8080 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: 9523 + edit: true + envKey: PANEL_APP_PORT_API + labelZh: API 端口 + labelEn: API port + required: true + rule: paramPort + type: number + - default: "" + edit: true + envKey: AMMDS_METATUBE_URL + labelZh: MetaTube URL + labelEn: MetaTube URL + required: false + type: text + - default: "" + edit: true + envKey: AMMDS_METATUBE_TOKEN + labelZh: MetaTube 密钥 + labelEn: MetaTube token + required: false + type: text + - default: "" + edit: true + envKey: AMMDS_PROWLARR_URL + labelZh: Prowlarr URL + labelEn: Prowlarr URL + required: false + type: text + - default: "" + edit: true + envKey: AMMDS_PROWLARR_TOKEN + labelZh: Prowlarr 密钥 + labelEn: Prowlarr token + required: false + type: text + - default: "" + edit: true + envKey: AMMDS_IYUU_TOKEN + labelZh: IYUU 密钥 + labelEn: IYUU token + required: false + type: text + - default: "" + edit: true + envKey: AMMDS_QBITTORRENT_URL + labelZh: qBittorrent URL + labelEn: qBittorrent URL + required: false + type: text + - default: "" + edit: true + envKey: AMMDS_QBITTORRENT_USERNAME + labelZh: qBittorrent 用户名 + labelEn: qBittorrent Username + required: false + type: text + - default: "" + edit: true + envKey: AMMDS_QBITTORRENT_PASSWORD + labelZh: qBittorrent 密码 + labelEn: qBittorrent Password + required: false + type: text + - 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/ammds/1.6.14/docker-compose.yml b/appstore/ammds/1.6.18/docker-compose.yml similarity index 96% rename from appstore/ammds/1.6.14/docker-compose.yml rename to appstore/ammds/1.6.18/docker-compose.yml index 2d8b94a1a..c5e9b458b 100644 --- a/appstore/ammds/1.6.14/docker-compose.yml +++ b/appstore/ammds/1.6.18/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.14 + image: qyg2297248353/ammds:v1.6.18 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/appstore/casdoor/1.946.0/envs/default.env b/appstore/ammds/1.6.18/envs/default.env similarity index 100% rename from appstore/casdoor/1.946.0/envs/default.env rename to appstore/ammds/1.6.18/envs/default.env diff --git a/appstore/casdoor/1.946.0/envs/global.env b/appstore/ammds/1.6.18/envs/global.env similarity index 100% rename from appstore/casdoor/1.946.0/envs/global.env rename to appstore/ammds/1.6.18/envs/global.env diff --git a/appstore/cloudreve/4.0.0/scripts/init.sh b/appstore/ammds/1.6.18/scripts/init.sh similarity index 100% rename from appstore/cloudreve/4.0.0/scripts/init.sh rename to appstore/ammds/1.6.18/scripts/init.sh diff --git a/appstore/casdoor/1.946.0/scripts/uninstall.sh b/appstore/ammds/1.6.18/scripts/uninstall.sh similarity index 100% rename from appstore/casdoor/1.946.0/scripts/uninstall.sh rename to appstore/ammds/1.6.18/scripts/uninstall.sh diff --git a/appstore/cloudreve/4.0.0/scripts/upgrade.sh b/appstore/ammds/1.6.18/scripts/upgrade.sh similarity index 100% rename from appstore/cloudreve/4.0.0/scripts/upgrade.sh rename to appstore/ammds/1.6.18/scripts/upgrade.sh diff --git a/appstore/casdoor/1.946.0/.env b/appstore/casdoor/1.951.0/.env similarity index 100% rename from appstore/casdoor/1.946.0/.env rename to appstore/casdoor/1.951.0/.env diff --git a/appstore/casdoor/1.946.0/config/init_data.json b/appstore/casdoor/1.951.0/config/init_data.json similarity index 100% rename from appstore/casdoor/1.946.0/config/init_data.json rename to appstore/casdoor/1.951.0/config/init_data.json diff --git a/appstore/casdoor/1.946.0/data.yml b/appstore/casdoor/1.951.0/data.yml similarity index 100% rename from appstore/casdoor/1.946.0/data.yml rename to appstore/casdoor/1.951.0/data.yml diff --git a/appstore/casdoor/1.946.0/docker-compose.yml b/appstore/casdoor/1.951.0/docker-compose.yml similarity index 93% rename from appstore/casdoor/1.946.0/docker-compose.yml rename to appstore/casdoor/1.951.0/docker-compose.yml index 02d583e37..a451117cf 100644 --- a/appstore/casdoor/1.946.0/docker-compose.yml +++ b/appstore/casdoor/1.951.0/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v1.946.0 + image: casbin/casdoor:v1.951.0 labels: createdBy: Apps networks: diff --git a/appstore/casdoor/1.946.0/envs/casdoor.env b/appstore/casdoor/1.951.0/envs/casdoor.env similarity index 100% rename from appstore/casdoor/1.946.0/envs/casdoor.env rename to appstore/casdoor/1.951.0/envs/casdoor.env diff --git a/appstore/cloudreve/4.0.0/envs/default.env b/appstore/casdoor/1.951.0/envs/default.env similarity index 100% rename from appstore/cloudreve/4.0.0/envs/default.env rename to appstore/casdoor/1.951.0/envs/default.env diff --git a/appstore/cloudreve/4.0.0/envs/global.env b/appstore/casdoor/1.951.0/envs/global.env similarity index 100% rename from appstore/cloudreve/4.0.0/envs/global.env rename to appstore/casdoor/1.951.0/envs/global.env diff --git a/appstore/casdoor/1.946.0/scripts/init.sh b/appstore/casdoor/1.951.0/scripts/init.sh similarity index 100% rename from appstore/casdoor/1.946.0/scripts/init.sh rename to appstore/casdoor/1.951.0/scripts/init.sh diff --git a/appstore/cloudreve/4.0.0/scripts/uninstall.sh b/appstore/casdoor/1.951.0/scripts/uninstall.sh similarity index 100% rename from appstore/cloudreve/4.0.0/scripts/uninstall.sh rename to appstore/casdoor/1.951.0/scripts/uninstall.sh diff --git a/appstore/casdoor/1.946.0/scripts/upgrade.sh b/appstore/casdoor/1.951.0/scripts/upgrade.sh similarity index 100% rename from appstore/casdoor/1.946.0/scripts/upgrade.sh rename to appstore/casdoor/1.951.0/scripts/upgrade.sh diff --git a/appstore/cloudreve/4.0.0/.env b/appstore/cloudreve/4.1.2/.env similarity index 100% rename from appstore/cloudreve/4.0.0/.env rename to appstore/cloudreve/4.1.2/.env diff --git a/appstore/cloudreve/4.0.0/data.yml b/appstore/cloudreve/4.1.2/data.yml similarity index 100% rename from appstore/cloudreve/4.0.0/data.yml rename to appstore/cloudreve/4.1.2/data.yml diff --git a/appstore/cloudreve/4.0.0/docker-compose.yml b/appstore/cloudreve/4.1.2/docker-compose.yml similarity index 91% rename from appstore/cloudreve/4.0.0/docker-compose.yml rename to appstore/cloudreve/4.1.2/docker-compose.yml index 33a475685..b49aef9cb 100644 --- a/appstore/cloudreve/4.0.0/docker-compose.yml +++ b/appstore/cloudreve/4.1.2/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: cloudreve/cloudreve:4.0.0 + image: cloudreve/cloudreve:4.1.2 labels: createdBy: Apps networks: diff --git a/appstore/dozzle/8.13.2/envs/default.env b/appstore/cloudreve/4.1.2/envs/default.env similarity index 100% rename from appstore/dozzle/8.13.2/envs/default.env rename to appstore/cloudreve/4.1.2/envs/default.env diff --git a/appstore/dozzle/8.13.2/envs/global.env b/appstore/cloudreve/4.1.2/envs/global.env similarity index 100% rename from appstore/dozzle/8.13.2/envs/global.env rename to appstore/cloudreve/4.1.2/envs/global.env diff --git a/appstore/dozzle/8.13.2/scripts/init.sh b/appstore/cloudreve/4.1.2/scripts/init.sh similarity index 100% rename from appstore/dozzle/8.13.2/scripts/init.sh rename to appstore/cloudreve/4.1.2/scripts/init.sh diff --git a/appstore/dozzle/8.13.2/scripts/uninstall.sh b/appstore/cloudreve/4.1.2/scripts/uninstall.sh similarity index 100% rename from appstore/dozzle/8.13.2/scripts/uninstall.sh rename to appstore/cloudreve/4.1.2/scripts/uninstall.sh diff --git a/appstore/dozzle/8.13.2/scripts/upgrade.sh b/appstore/cloudreve/4.1.2/scripts/upgrade.sh similarity index 100% rename from appstore/dozzle/8.13.2/scripts/upgrade.sh rename to appstore/cloudreve/4.1.2/scripts/upgrade.sh diff --git a/appstore/dozzle/8.13.2/.env b/appstore/dozzle/8.13.3/.env similarity index 100% rename from appstore/dozzle/8.13.2/.env rename to appstore/dozzle/8.13.3/.env diff --git a/appstore/dozzle/8.13.2/data.yml b/appstore/dozzle/8.13.3/data.yml similarity index 100% rename from appstore/dozzle/8.13.2/data.yml rename to appstore/dozzle/8.13.3/data.yml diff --git a/appstore/dozzle/8.13.2/docker-compose.yml b/appstore/dozzle/8.13.3/docker-compose.yml similarity index 94% rename from appstore/dozzle/8.13.2/docker-compose.yml rename to appstore/dozzle/8.13.3/docker-compose.yml index ca75ee2b4..6c276f177 100644 --- a/appstore/dozzle/8.13.2/docker-compose.yml +++ b/appstore/dozzle/8.13.3/docker-compose.yml @@ -20,7 +20,7 @@ services: - /dozzle - healthcheck timeout: 30s - image: amir20/dozzle:v8.13.2 + image: amir20/dozzle:v8.13.3 labels: createdBy: Apps networks: diff --git a/appstore/emby/4.9.1.1/envs/default.env b/appstore/dozzle/8.13.3/envs/default.env similarity index 100% rename from appstore/emby/4.9.1.1/envs/default.env rename to appstore/dozzle/8.13.3/envs/default.env diff --git a/appstore/emby/4.9.1.1/envs/global.env b/appstore/dozzle/8.13.3/envs/global.env similarity index 100% rename from appstore/emby/4.9.1.1/envs/global.env rename to appstore/dozzle/8.13.3/envs/global.env diff --git a/appstore/emby/4.9.1.1/scripts/init.sh b/appstore/dozzle/8.13.3/scripts/init.sh similarity index 100% rename from appstore/emby/4.9.1.1/scripts/init.sh rename to appstore/dozzle/8.13.3/scripts/init.sh diff --git a/appstore/emby/4.9.1.1/scripts/uninstall.sh b/appstore/dozzle/8.13.3/scripts/uninstall.sh similarity index 100% rename from appstore/emby/4.9.1.1/scripts/uninstall.sh rename to appstore/dozzle/8.13.3/scripts/uninstall.sh diff --git a/appstore/emby/4.9.1.1/scripts/upgrade.sh b/appstore/dozzle/8.13.3/scripts/upgrade.sh similarity index 100% rename from appstore/emby/4.9.1.1/scripts/upgrade.sh rename to appstore/dozzle/8.13.3/scripts/upgrade.sh diff --git a/appstore/emby/4.9.1.1/.env b/appstore/emby/4.9.1.3/.env similarity index 100% rename from appstore/emby/4.9.1.1/.env rename to appstore/emby/4.9.1.3/.env diff --git a/appstore/emby/4.9.1.1/data.yml b/appstore/emby/4.9.1.3/data.yml similarity index 100% rename from appstore/emby/4.9.1.1/data.yml rename to appstore/emby/4.9.1.3/data.yml diff --git a/appstore/emby/4.9.1.1/docker-compose.yml b/appstore/emby/4.9.1.3/docker-compose.yml similarity index 96% rename from appstore/emby/4.9.1.1/docker-compose.yml rename to appstore/emby/4.9.1.3/docker-compose.yml index e2d892aa1..8859201b7 100644 --- a/appstore/emby/4.9.1.1/docker-compose.yml +++ b/appstore/emby/4.9.1.3/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.1.1 + image: emby/embyserver:4.9.1.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/ghost/5.126.0/envs/default.env b/appstore/emby/4.9.1.3/envs/default.env similarity index 100% rename from appstore/ghost/5.126.0/envs/default.env rename to appstore/emby/4.9.1.3/envs/default.env diff --git a/appstore/ghost/5.126.0/envs/global.env b/appstore/emby/4.9.1.3/envs/global.env similarity index 100% rename from appstore/ghost/5.126.0/envs/global.env rename to appstore/emby/4.9.1.3/envs/global.env diff --git a/appstore/ghost/5.126.0/scripts/init.sh b/appstore/emby/4.9.1.3/scripts/init.sh similarity index 100% rename from appstore/ghost/5.126.0/scripts/init.sh rename to appstore/emby/4.9.1.3/scripts/init.sh diff --git a/appstore/ghost/5.126.0/scripts/uninstall.sh b/appstore/emby/4.9.1.3/scripts/uninstall.sh similarity index 100% rename from appstore/ghost/5.126.0/scripts/uninstall.sh rename to appstore/emby/4.9.1.3/scripts/uninstall.sh diff --git a/appstore/ghost/5.126.0/scripts/upgrade.sh b/appstore/emby/4.9.1.3/scripts/upgrade.sh similarity index 100% rename from appstore/ghost/5.126.0/scripts/upgrade.sh rename to appstore/emby/4.9.1.3/scripts/upgrade.sh diff --git a/appstore/ghost/5.126.0/.env b/appstore/ghost/5.127.2/.env similarity index 100% rename from appstore/ghost/5.126.0/.env rename to appstore/ghost/5.127.2/.env diff --git a/appstore/ghost/5.126.0/data.yml b/appstore/ghost/5.127.2/data.yml similarity index 100% rename from appstore/ghost/5.126.0/data.yml rename to appstore/ghost/5.127.2/data.yml diff --git a/appstore/ghost/5.126.0/docker-compose.yml b/appstore/ghost/5.127.2/docker-compose.yml similarity index 95% rename from appstore/ghost/5.126.0/docker-compose.yml rename to appstore/ghost/5.127.2/docker-compose.yml index ea5cc3463..95674ea2c 100644 --- a/appstore/ghost/5.126.0/docker-compose.yml +++ b/appstore/ghost/5.127.2/docker-compose.yml @@ -14,7 +14,7 @@ services: - database__client=mysql - mail__options__service=Email - mail__options__secure=true - image: ghost:5.126.0 + image: ghost:5.127.2 labels: createdBy: Apps networks: diff --git a/appstore/gitea-runner/0.2.11/envs/default.env b/appstore/ghost/5.127.2/envs/default.env similarity index 100% rename from appstore/gitea-runner/0.2.11/envs/default.env rename to appstore/ghost/5.127.2/envs/default.env diff --git a/appstore/gitea-runner/0.2.11/envs/global.env b/appstore/ghost/5.127.2/envs/global.env similarity index 100% rename from appstore/gitea-runner/0.2.11/envs/global.env rename to appstore/ghost/5.127.2/envs/global.env diff --git a/appstore/halo-h2/2.21.1/scripts/init.sh b/appstore/ghost/5.127.2/scripts/init.sh similarity index 100% rename from appstore/halo-h2/2.21.1/scripts/init.sh rename to appstore/ghost/5.127.2/scripts/init.sh diff --git a/appstore/gitea-runner/0.2.11/scripts/uninstall.sh b/appstore/ghost/5.127.2/scripts/uninstall.sh similarity index 100% rename from appstore/gitea-runner/0.2.11/scripts/uninstall.sh rename to appstore/ghost/5.127.2/scripts/uninstall.sh diff --git a/appstore/halo-h2/2.21.1/scripts/upgrade.sh b/appstore/ghost/5.127.2/scripts/upgrade.sh similarity index 100% rename from appstore/halo-h2/2.21.1/scripts/upgrade.sh rename to appstore/ghost/5.127.2/scripts/upgrade.sh diff --git a/appstore/gitea-runner/0.2.11/.env b/appstore/gitea-runner/0.2.12/.env similarity index 100% rename from appstore/gitea-runner/0.2.11/.env rename to appstore/gitea-runner/0.2.12/.env diff --git a/appstore/gitea-runner/0.2.11/data.yml b/appstore/gitea-runner/0.2.12/data.yml similarity index 100% rename from appstore/gitea-runner/0.2.11/data.yml rename to appstore/gitea-runner/0.2.12/data.yml diff --git a/appstore/gitea-runner/0.2.11/docker-compose.yml b/appstore/gitea-runner/0.2.12/docker-compose.yml similarity index 92% rename from appstore/gitea-runner/0.2.11/docker-compose.yml rename to appstore/gitea-runner/0.2.12/docker-compose.yml index cc71e196f..1b571689a 100644 --- a/appstore/gitea-runner/0.2.11/docker-compose.yml +++ b/appstore/gitea-runner/0.2.12/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: gitea/act_runner:0.2.11 + image: gitea/act_runner:0.2.12 labels: createdBy: Apps networks: diff --git a/appstore/halo-h2/2.21.1/envs/default.env b/appstore/gitea-runner/0.2.12/envs/default.env similarity index 100% rename from appstore/halo-h2/2.21.1/envs/default.env rename to appstore/gitea-runner/0.2.12/envs/default.env diff --git a/appstore/halo-h2/2.21.1/envs/global.env b/appstore/gitea-runner/0.2.12/envs/global.env similarity index 100% rename from appstore/halo-h2/2.21.1/envs/global.env rename to appstore/gitea-runner/0.2.12/envs/global.env diff --git a/appstore/gitea-runner/0.2.11/scripts/init.sh b/appstore/gitea-runner/0.2.12/scripts/init.sh similarity index 100% rename from appstore/gitea-runner/0.2.11/scripts/init.sh rename to appstore/gitea-runner/0.2.12/scripts/init.sh diff --git a/appstore/halo-h2/2.21.1/scripts/uninstall.sh b/appstore/gitea-runner/0.2.12/scripts/uninstall.sh similarity index 100% rename from appstore/halo-h2/2.21.1/scripts/uninstall.sh rename to appstore/gitea-runner/0.2.12/scripts/uninstall.sh diff --git a/appstore/gitea-runner/0.2.11/scripts/upgrade.sh b/appstore/gitea-runner/0.2.12/scripts/upgrade.sh similarity index 100% rename from appstore/gitea-runner/0.2.11/scripts/upgrade.sh rename to appstore/gitea-runner/0.2.12/scripts/upgrade.sh diff --git a/appstore/halo-h2/2.21.1/.env b/appstore/halo-h2/2.21.2/.env similarity index 100% rename from appstore/halo-h2/2.21.1/.env rename to appstore/halo-h2/2.21.2/.env diff --git a/appstore/halo-h2/2.21.1/data.yml b/appstore/halo-h2/2.21.2/data.yml similarity index 100% rename from appstore/halo-h2/2.21.1/data.yml rename to appstore/halo-h2/2.21.2/data.yml diff --git a/appstore/halo-h2/2.21.1/docker-compose.yml b/appstore/halo-h2/2.21.2/docker-compose.yml similarity index 93% rename from appstore/halo-h2/2.21.1/docker-compose.yml rename to appstore/halo-h2/2.21.2/docker-compose.yml index 0839b2f3a..a832ced56 100644 --- a/appstore/halo-h2/2.21.1/docker-compose.yml +++ b/appstore/halo-h2/2.21.2/docker-compose.yml @@ -9,7 +9,7 @@ services: container_name: halo-h2 environment: - JVM_OPTS=-Xmx256m -Xms256m - image: halohub/halo:2.21.1 + image: halohub/halo:2.21.2 labels: createdBy: Apps networks: diff --git a/appstore/halo/2.21.1/envs/default.env b/appstore/halo-h2/2.21.2/envs/default.env similarity index 100% rename from appstore/halo/2.21.1/envs/default.env rename to appstore/halo-h2/2.21.2/envs/default.env diff --git a/appstore/halo/2.21.1/envs/global.env b/appstore/halo-h2/2.21.2/envs/global.env similarity index 100% rename from appstore/halo/2.21.1/envs/global.env rename to appstore/halo-h2/2.21.2/envs/global.env diff --git a/appstore/halo/2.21.1/scripts/init.sh b/appstore/halo-h2/2.21.2/scripts/init.sh similarity index 100% rename from appstore/halo/2.21.1/scripts/init.sh rename to appstore/halo-h2/2.21.2/scripts/init.sh diff --git a/appstore/halo/2.21.1/scripts/uninstall.sh b/appstore/halo-h2/2.21.2/scripts/uninstall.sh similarity index 100% rename from appstore/halo/2.21.1/scripts/uninstall.sh rename to appstore/halo-h2/2.21.2/scripts/uninstall.sh diff --git a/appstore/halo/2.21.1/scripts/upgrade.sh b/appstore/halo-h2/2.21.2/scripts/upgrade.sh similarity index 100% rename from appstore/halo/2.21.1/scripts/upgrade.sh rename to appstore/halo-h2/2.21.2/scripts/upgrade.sh diff --git a/appstore/halo/2.21.1/.env b/appstore/halo/2.21.2/.env similarity index 100% rename from appstore/halo/2.21.1/.env rename to appstore/halo/2.21.2/.env diff --git a/appstore/halo/2.21.1/data.yml b/appstore/halo/2.21.2/data.yml similarity index 100% rename from appstore/halo/2.21.1/data.yml rename to appstore/halo/2.21.2/data.yml diff --git a/appstore/halo/2.21.1/docker-compose.yml b/appstore/halo/2.21.2/docker-compose.yml similarity index 95% rename from appstore/halo/2.21.1/docker-compose.yml rename to appstore/halo/2.21.2/docker-compose.yml index c033cbd90..13fe712b5 100644 --- a/appstore/halo/2.21.1/docker-compose.yml +++ b/appstore/halo/2.21.2/docker-compose.yml @@ -11,7 +11,7 @@ services: - --halo.external-url=${HALO_EXTERNAL_URL} - --halo.security.remember-me.token-validity=${HALO_REMEMBER_ME_TOKEN_VALIDITY} container_name: halo - image: halohub/halo:2.21.1 + image: halohub/halo:2.21.2 labels: createdBy: Apps networks: diff --git a/appstore/logto/1.28.0/envs/default.env b/appstore/halo/2.21.2/envs/default.env similarity index 100% rename from appstore/logto/1.28.0/envs/default.env rename to appstore/halo/2.21.2/envs/default.env diff --git a/appstore/logto/1.28.0/envs/global.env b/appstore/halo/2.21.2/envs/global.env similarity index 100% rename from appstore/logto/1.28.0/envs/global.env rename to appstore/halo/2.21.2/envs/global.env diff --git a/appstore/logto/1.28.0/scripts/init.sh b/appstore/halo/2.21.2/scripts/init.sh similarity index 100% rename from appstore/logto/1.28.0/scripts/init.sh rename to appstore/halo/2.21.2/scripts/init.sh diff --git a/appstore/logto/1.28.0/scripts/uninstall.sh b/appstore/halo/2.21.2/scripts/uninstall.sh similarity index 100% rename from appstore/logto/1.28.0/scripts/uninstall.sh rename to appstore/halo/2.21.2/scripts/uninstall.sh diff --git a/appstore/logto/1.28.0/scripts/upgrade.sh b/appstore/halo/2.21.2/scripts/upgrade.sh similarity index 100% rename from appstore/logto/1.28.0/scripts/upgrade.sh rename to appstore/halo/2.21.2/scripts/upgrade.sh diff --git a/appstore/logto/1.28.0/.env b/appstore/logto/1.29.0/.env similarity index 100% rename from appstore/logto/1.28.0/.env rename to appstore/logto/1.29.0/.env diff --git a/appstore/logto/1.28.0/data.yml b/appstore/logto/1.29.0/data.yml similarity index 100% rename from appstore/logto/1.28.0/data.yml rename to appstore/logto/1.29.0/data.yml diff --git a/appstore/logto/1.28.0/docker-compose.yml b/appstore/logto/1.29.0/docker-compose.yml similarity index 95% rename from appstore/logto/1.28.0/docker-compose.yml rename to appstore/logto/1.29.0/docker-compose.yml index 54c747182..775335695 100644 --- a/appstore/logto/1.28.0/docker-compose.yml +++ b/appstore/logto/1.29.0/docker-compose.yml @@ -18,7 +18,7 @@ services: - TRUST_PROXY_HEADER=true - CASE_SENSITIVE_USERNAME=true - DB_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_NAME} - image: svhd/logto:1.28.0 + image: svhd/logto:1.29.0 labels: createdBy: Apps networks: diff --git a/appstore/mdc-ng/1.0.0/envs/default.env b/appstore/logto/1.29.0/envs/default.env similarity index 100% rename from appstore/mdc-ng/1.0.0/envs/default.env rename to appstore/logto/1.29.0/envs/default.env diff --git a/appstore/mdc-ng/1.0.0/envs/global.env b/appstore/logto/1.29.0/envs/global.env similarity index 100% rename from appstore/mdc-ng/1.0.0/envs/global.env rename to appstore/logto/1.29.0/envs/global.env diff --git a/appstore/mdc-ng/1.0.0/scripts/init.sh b/appstore/logto/1.29.0/scripts/init.sh similarity index 100% rename from appstore/mdc-ng/1.0.0/scripts/init.sh rename to appstore/logto/1.29.0/scripts/init.sh diff --git a/appstore/mdc-ng/1.0.0/scripts/uninstall.sh b/appstore/logto/1.29.0/scripts/uninstall.sh similarity index 100% rename from appstore/mdc-ng/1.0.0/scripts/uninstall.sh rename to appstore/logto/1.29.0/scripts/uninstall.sh diff --git a/appstore/mdc-ng/1.0.0/scripts/upgrade.sh b/appstore/logto/1.29.0/scripts/upgrade.sh similarity index 100% rename from appstore/mdc-ng/1.0.0/scripts/upgrade.sh rename to appstore/logto/1.29.0/scripts/upgrade.sh diff --git a/appstore/mdc-ng/1.0.0/.env b/appstore/mdc-ng/1.8.0/.env similarity index 100% rename from appstore/mdc-ng/1.0.0/.env rename to appstore/mdc-ng/1.8.0/.env diff --git a/appstore/mdc-ng/1.0.0/data.yml b/appstore/mdc-ng/1.8.0/data.yml similarity index 100% rename from appstore/mdc-ng/1.0.0/data.yml rename to appstore/mdc-ng/1.8.0/data.yml diff --git a/appstore/mdc-ng/1.0.0/docker-compose.yml b/appstore/mdc-ng/1.8.0/docker-compose.yml similarity index 96% rename from appstore/mdc-ng/1.0.0/docker-compose.yml rename to appstore/mdc-ng/1.8.0/docker-compose.yml index 4ccc4b97e..95f006a2c 100644 --- a/appstore/mdc-ng/1.0.0/docker-compose.yml +++ b/appstore/mdc-ng/1.8.0/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: mdcng/mdc:1.0.0 + image: mdcng/mdc:1.8.0 labels: createdBy: Apps networks: diff --git a/appstore/n8n/1.100.0/envs/default.env b/appstore/mdc-ng/1.8.0/envs/default.env similarity index 100% rename from appstore/n8n/1.100.0/envs/default.env rename to appstore/mdc-ng/1.8.0/envs/default.env diff --git a/appstore/n8n/1.100.0/envs/global.env b/appstore/mdc-ng/1.8.0/envs/global.env similarity index 100% rename from appstore/n8n/1.100.0/envs/global.env rename to appstore/mdc-ng/1.8.0/envs/global.env diff --git a/appstore/ollama/0.9.2/scripts/init.sh b/appstore/mdc-ng/1.8.0/scripts/init.sh similarity index 100% rename from appstore/ollama/0.9.2/scripts/init.sh rename to appstore/mdc-ng/1.8.0/scripts/init.sh diff --git a/appstore/n8n/1.100.0/scripts/uninstall.sh b/appstore/mdc-ng/1.8.0/scripts/uninstall.sh similarity index 100% rename from appstore/n8n/1.100.0/scripts/uninstall.sh rename to appstore/mdc-ng/1.8.0/scripts/uninstall.sh diff --git a/appstore/n8n/1.100.0/scripts/upgrade.sh b/appstore/mdc-ng/1.8.0/scripts/upgrade.sh similarity index 100% rename from appstore/n8n/1.100.0/scripts/upgrade.sh rename to appstore/mdc-ng/1.8.0/scripts/upgrade.sh diff --git a/appstore/n8n/1.100.0/.env b/appstore/n8n/1.100.1/.env similarity index 100% rename from appstore/n8n/1.100.0/.env rename to appstore/n8n/1.100.1/.env diff --git a/appstore/n8n/1.100.0/data.yml b/appstore/n8n/1.100.1/data.yml similarity index 100% rename from appstore/n8n/1.100.0/data.yml rename to appstore/n8n/1.100.1/data.yml diff --git a/appstore/n8n/1.100.0/docker-compose.yml b/appstore/n8n/1.100.1/docker-compose.yml similarity index 94% rename from appstore/n8n/1.100.0/docker-compose.yml rename to appstore/n8n/1.100.1/docker-compose.yml index acafe3446..82c9159d7 100644 --- a/appstore/n8n/1.100.0/docker-compose.yml +++ b/appstore/n8n/1.100.1/docker-compose.yml @@ -14,7 +14,7 @@ services: - N8N_PROTOCOL=http - N8N_DIAGNOSTICS_ENABLED=false - N8N_SECURE_COOKIE=false - image: n8nio/n8n:1.100.0 + image: n8nio/n8n:1.100.1 labels: createdBy: Apps networks: diff --git a/appstore/nacos-derby/3.0.1/envs/default.env b/appstore/n8n/1.100.1/envs/default.env similarity index 100% rename from appstore/nacos-derby/3.0.1/envs/default.env rename to appstore/n8n/1.100.1/envs/default.env diff --git a/appstore/nacos-derby/3.0.1/envs/global.env b/appstore/n8n/1.100.1/envs/global.env similarity index 100% rename from appstore/nacos-derby/3.0.1/envs/global.env rename to appstore/n8n/1.100.1/envs/global.env diff --git a/appstore/n8n/1.100.0/scripts/init.sh b/appstore/n8n/1.100.1/scripts/init.sh similarity index 100% rename from appstore/n8n/1.100.0/scripts/init.sh rename to appstore/n8n/1.100.1/scripts/init.sh diff --git a/appstore/nacos-derby/3.0.1/scripts/uninstall.sh b/appstore/n8n/1.100.1/scripts/uninstall.sh similarity index 100% rename from appstore/nacos-derby/3.0.1/scripts/uninstall.sh rename to appstore/n8n/1.100.1/scripts/uninstall.sh diff --git a/appstore/nacos-derby/3.0.1/scripts/upgrade.sh b/appstore/n8n/1.100.1/scripts/upgrade.sh similarity index 100% rename from appstore/nacos-derby/3.0.1/scripts/upgrade.sh rename to appstore/n8n/1.100.1/scripts/upgrade.sh diff --git a/appstore/nacos-derby/3.0.1/.env b/appstore/nacos-derby/3.0.2/.env similarity index 100% rename from appstore/nacos-derby/3.0.1/.env rename to appstore/nacos-derby/3.0.2/.env diff --git a/appstore/nacos-derby/3.0.1/data.yml b/appstore/nacos-derby/3.0.2/data.yml similarity index 100% rename from appstore/nacos-derby/3.0.1/data.yml rename to appstore/nacos-derby/3.0.2/data.yml diff --git a/appstore/nacos-derby/3.0.1/docker-compose.yml b/appstore/nacos-derby/3.0.2/docker-compose.yml similarity index 94% rename from appstore/nacos-derby/3.0.1/docker-compose.yml rename to appstore/nacos-derby/3.0.2/docker-compose.yml index 36baffdcf..b4360ceb1 100644 --- a/appstore/nacos-derby/3.0.1/docker-compose.yml +++ b/appstore/nacos-derby/3.0.2/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_CONSOLE_PORT=${PANEL_APP_PORT_HTTP:-8080} - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - image: nacos/nacos-server:v3.0.1 + image: nacos/nacos-server:v3.0.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/nacos/3.0.1/envs/default.env b/appstore/nacos-derby/3.0.2/envs/default.env similarity index 100% rename from appstore/nacos/3.0.1/envs/default.env rename to appstore/nacos-derby/3.0.2/envs/default.env diff --git a/appstore/nacos/3.0.1/envs/global.env b/appstore/nacos-derby/3.0.2/envs/global.env similarity index 100% rename from appstore/nacos/3.0.1/envs/global.env rename to appstore/nacos-derby/3.0.2/envs/global.env diff --git a/appstore/nacos-derby/3.0.1/init/mysql-schema.sql b/appstore/nacos-derby/3.0.2/init/mysql-schema.sql similarity index 100% rename from appstore/nacos-derby/3.0.1/init/mysql-schema.sql rename to appstore/nacos-derby/3.0.2/init/mysql-schema.sql diff --git a/appstore/nacos-derby/3.0.1/scripts/init.sh b/appstore/nacos-derby/3.0.2/scripts/init.sh similarity index 100% rename from appstore/nacos-derby/3.0.1/scripts/init.sh rename to appstore/nacos-derby/3.0.2/scripts/init.sh diff --git a/appstore/nacos/3.0.1/scripts/uninstall.sh b/appstore/nacos-derby/3.0.2/scripts/uninstall.sh similarity index 100% rename from appstore/nacos/3.0.1/scripts/uninstall.sh rename to appstore/nacos-derby/3.0.2/scripts/uninstall.sh diff --git a/appstore/nacos/3.0.1/scripts/upgrade.sh b/appstore/nacos-derby/3.0.2/scripts/upgrade.sh similarity index 100% rename from appstore/nacos/3.0.1/scripts/upgrade.sh rename to appstore/nacos-derby/3.0.2/scripts/upgrade.sh diff --git a/appstore/nacos/3.0.1/.env b/appstore/nacos/3.0.2/.env similarity index 100% rename from appstore/nacos/3.0.1/.env rename to appstore/nacos/3.0.2/.env diff --git a/appstore/nacos/3.0.1/data.yml b/appstore/nacos/3.0.2/data.yml similarity index 100% rename from appstore/nacos/3.0.1/data.yml rename to appstore/nacos/3.0.2/data.yml diff --git a/appstore/nacos/3.0.1/docker-compose.yml b/appstore/nacos/3.0.2/docker-compose.yml similarity index 95% rename from appstore/nacos/3.0.1/docker-compose.yml rename to appstore/nacos/3.0.2/docker-compose.yml index c256c4cbb..76ef8b9fd 100644 --- a/appstore/nacos/3.0.1/docker-compose.yml +++ b/appstore/nacos/3.0.2/docker-compose.yml @@ -13,7 +13,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v3.0.1 + image: nacos/nacos-server:v3.0.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/ollama/0.9.2/envs/default.env b/appstore/nacos/3.0.2/envs/default.env similarity index 100% rename from appstore/ollama/0.9.2/envs/default.env rename to appstore/nacos/3.0.2/envs/default.env diff --git a/appstore/ollama/0.9.2/envs/global.env b/appstore/nacos/3.0.2/envs/global.env similarity index 100% rename from appstore/ollama/0.9.2/envs/global.env rename to appstore/nacos/3.0.2/envs/global.env diff --git a/appstore/nacos/3.0.1/init/mysql-schema.sql b/appstore/nacos/3.0.2/init/mysql-schema.sql similarity index 100% rename from appstore/nacos/3.0.1/init/mysql-schema.sql rename to appstore/nacos/3.0.2/init/mysql-schema.sql diff --git a/appstore/nacos/3.0.1/scripts/init.sh b/appstore/nacos/3.0.2/scripts/init.sh similarity index 100% rename from appstore/nacos/3.0.1/scripts/init.sh rename to appstore/nacos/3.0.2/scripts/init.sh diff --git a/appstore/ollama/0.9.2/scripts/uninstall.sh b/appstore/nacos/3.0.2/scripts/uninstall.sh similarity index 100% rename from appstore/ollama/0.9.2/scripts/uninstall.sh rename to appstore/nacos/3.0.2/scripts/uninstall.sh diff --git a/appstore/ollama/0.9.2/scripts/upgrade.sh b/appstore/nacos/3.0.2/scripts/upgrade.sh similarity index 100% rename from appstore/ollama/0.9.2/scripts/upgrade.sh rename to appstore/nacos/3.0.2/scripts/upgrade.sh diff --git a/appstore/nodepassdash/2.0.6/.env b/appstore/nodepassdash/2.0.6/.env new file mode 100644 index 000000000..a1eba4f62 --- /dev/null +++ b/appstore/nodepassdash/2.0.6/.env @@ -0,0 +1,9 @@ +# 网络模式 [必填] +NETWORK_MODE=host + +# 数据持久化路径 [必填] +NODEPASSDASH_ROOT_PATH=/home/nodepassdash + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3000 + diff --git a/appstore/nodepassdash/2.0.6/data.yml b/appstore/nodepassdash/2.0.6/data.yml new file mode 100644 index 000000000..ad4bc5870 --- /dev/null +++ b/appstore/nodepassdash/2.0.6/data.yml @@ -0,0 +1,33 @@ +additionalProperties: + formFields: + - default: "host" + edit: true + envKey: NETWORK_MODE + labelZh: 网络模式 + labelEn: Network mode + required: true + type: select + values: + - label: 主机网络模式 + value: "host" + - label: 桥接网络模式 + value: "bridge" + - label: 无网络模式 + value: "none" + - label: 1panel-network + value: "1panel-network" + - default: "/home/nodepassdash" + edit: true + envKey: NODEPASSDASH_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 diff --git a/appstore/nodepassdash/2.0.6/docker-compose.yml b/appstore/nodepassdash/2.0.6/docker-compose.yml new file mode 100644 index 000000000..9fadcad30 --- /dev/null +++ b/appstore/nodepassdash/2.0.6/docker-compose.yml @@ -0,0 +1,22 @@ +networks: + 1panel-network: + external: true +services: + nodepassdash: + container_name: nodepassdash + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - PORT=${PANEL_APP_PORT_HTTP} + image: ghcr.io/nodepassproject/nodepassdash:2.0.6 + labels: + createdBy: Apps + network_mode: ${NETWORK_MODE} + ports: + - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} + restart: always + volumes: + - ${NODEPASSDASH_ROOT_PATH}/logs:/app/logs + - ${NODEPASSDASH_ROOT_PATH}/public:/app/public diff --git a/appstore/qinglong/2.19.1/envs/default.env b/appstore/nodepassdash/2.0.6/envs/default.env similarity index 100% rename from appstore/qinglong/2.19.1/envs/default.env rename to appstore/nodepassdash/2.0.6/envs/default.env diff --git a/appstore/qinglong/2.19.1/envs/global.env b/appstore/nodepassdash/2.0.6/envs/global.env similarity index 100% rename from appstore/qinglong/2.19.1/envs/global.env rename to appstore/nodepassdash/2.0.6/envs/global.env diff --git a/appstore/rsshub/2025-06-24/scripts/init.sh b/appstore/nodepassdash/2.0.6/scripts/init.sh similarity index 100% rename from appstore/rsshub/2025-06-24/scripts/init.sh rename to appstore/nodepassdash/2.0.6/scripts/init.sh diff --git a/appstore/qinglong/2.19.1/scripts/uninstall.sh b/appstore/nodepassdash/2.0.6/scripts/uninstall.sh similarity index 100% rename from appstore/qinglong/2.19.1/scripts/uninstall.sh rename to appstore/nodepassdash/2.0.6/scripts/uninstall.sh diff --git a/appstore/rsshub/2025-06-24/scripts/upgrade.sh b/appstore/nodepassdash/2.0.6/scripts/upgrade.sh similarity index 100% rename from appstore/rsshub/2025-06-24/scripts/upgrade.sh rename to appstore/nodepassdash/2.0.6/scripts/upgrade.sh diff --git a/appstore/nodepassdash/README.md b/appstore/nodepassdash/README.md new file mode 100644 index 000000000..7d91e87f3 --- /dev/null +++ b/appstore/nodepassdash/README.md @@ -0,0 +1,41 @@ +# NodePassDash + +NodePassDash是一个现代化的 NodePass 管理界面,基于 Go 后端 + Next.js 14、HeroUI 和 TypeScript 构建。提供实时隧道监控、流量统计和端点管理功能。 + +![NodePassDash](https://file.lifebus.top/imgs/nodepassdash_cover.png) + +![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) + +## 初始化 + +通过日志获取 + +## 特性 + +🚀 高性能 Go 后端: 完全重构的 Go 后端,性能提升 300%+,内存占用降低 60% + +🎯 实时监控: 通过 Server-Sent Events (SSE) 实现实时隧道状态更新 + +📊 流量统计: 可视化显示隧道流量数据和性能指标 + +🎨 现代UI: 基于 HeroUI 的响应式设计,支持深色/浅色主题 + +📱 移动适配: 完整的移动端响应式布局,支持各种设备访问 + +🐳 容器化: 开箱即用的 Docker 部署方案 + +🔧 命令行工具: 支持密码重置和自定义端口等管理功能 + +## 快捷操作 + +以下命令行均在容器中执行 + +### 密码重置 + +```shell +./nodepassdash --reset-pwd +``` + +--- + +![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/appstore/nodepassdash/data.yml b/appstore/nodepassdash/data.yml new file mode 100644 index 000000000..4ad377a81 --- /dev/null +++ b/appstore/nodepassdash/data.yml @@ -0,0 +1,14 @@ +additionalProperties: + key: nodepassdash + name: NodePassDash + tags: + - WebSite + - Local + shortDescZh: 现代化的 NodePass 管理界面 + shortDescEn: NodePass Dashboard + type: website + crossVersionUpdate: true + limit: 0 + website: https://github.com/NodePassProject/NodePassDash/ + github: https://github.com/NodePassProject/NodePassDash/ + document: https://github.com/NodePassProject/NodePassDash/ diff --git a/appstore/nodepassdash/logo.png b/appstore/nodepassdash/logo.png new file mode 100644 index 000000000..e3c0a9a7c Binary files /dev/null and b/appstore/nodepassdash/logo.png differ diff --git a/appstore/nodepassdash/logo.svg b/appstore/nodepassdash/logo.svg new file mode 100644 index 000000000..af2372bf8 --- /dev/null +++ b/appstore/nodepassdash/logo.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/appstore/ollama/0.9.2/.env b/appstore/ollama/0.9.3/.env similarity index 100% rename from appstore/ollama/0.9.2/.env rename to appstore/ollama/0.9.3/.env diff --git a/appstore/ollama/0.9.2/data.yml b/appstore/ollama/0.9.3/data.yml similarity index 100% rename from appstore/ollama/0.9.2/data.yml rename to appstore/ollama/0.9.3/data.yml diff --git a/appstore/ollama/0.9.2/docker-compose.yml b/appstore/ollama/0.9.3/docker-compose.yml similarity index 95% rename from appstore/ollama/0.9.2/docker-compose.yml rename to appstore/ollama/0.9.3/docker-compose.yml index c8edbfdc7..98d812028 100644 --- a/appstore/ollama/0.9.2/docker-compose.yml +++ b/appstore/ollama/0.9.3/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.9.2 + image: ollama/ollama:0.9.3 labels: createdBy: Apps networks: diff --git a/appstore/rsshub/2025-06-24/envs/default.env b/appstore/ollama/0.9.3/envs/default.env similarity index 100% rename from appstore/rsshub/2025-06-24/envs/default.env rename to appstore/ollama/0.9.3/envs/default.env diff --git a/appstore/rsshub/2025-06-24/envs/global.env b/appstore/ollama/0.9.3/envs/global.env similarity index 100% rename from appstore/rsshub/2025-06-24/envs/global.env rename to appstore/ollama/0.9.3/envs/global.env diff --git a/appstore/ollama/0.9.3/scripts/init.sh b/appstore/ollama/0.9.3/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/ollama/0.9.3/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/rsshub/2025-06-24/scripts/uninstall.sh b/appstore/ollama/0.9.3/scripts/uninstall.sh similarity index 100% rename from appstore/rsshub/2025-06-24/scripts/uninstall.sh rename to appstore/ollama/0.9.3/scripts/uninstall.sh diff --git a/appstore/ollama/0.9.3/scripts/upgrade.sh b/appstore/ollama/0.9.3/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/ollama/0.9.3/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/qinglong/2.19.1/.env b/appstore/qinglong/2.19.2/.env similarity index 100% rename from appstore/qinglong/2.19.1/.env rename to appstore/qinglong/2.19.2/.env diff --git a/appstore/qinglong/2.19.1/data.yml b/appstore/qinglong/2.19.2/data.yml similarity index 100% rename from appstore/qinglong/2.19.1/data.yml rename to appstore/qinglong/2.19.2/data.yml diff --git a/appstore/qinglong/2.19.1/docker-compose.yml b/appstore/qinglong/2.19.2/docker-compose.yml similarity index 91% rename from appstore/qinglong/2.19.1/docker-compose.yml rename to appstore/qinglong/2.19.2/docker-compose.yml index 722d30ff0..bd436dc35 100644 --- a/appstore/qinglong/2.19.1/docker-compose.yml +++ b/appstore/qinglong/2.19.2/docker-compose.yml @@ -7,7 +7,7 @@ services: environment: - QlPort=5700 - QlBaseUrl=${QINGLONG_BASE_URL:-/} - image: whyour/qinglong:2.19.1 + image: whyour/qinglong:2.19.2 labels: createdBy: Apps networks: diff --git a/appstore/super-productivity/13.1.2/envs/default.env b/appstore/qinglong/2.19.2/envs/default.env similarity index 100% rename from appstore/super-productivity/13.1.2/envs/default.env rename to appstore/qinglong/2.19.2/envs/default.env diff --git a/appstore/super-productivity/13.1.2/envs/global.env b/appstore/qinglong/2.19.2/envs/global.env similarity index 100% rename from appstore/super-productivity/13.1.2/envs/global.env rename to appstore/qinglong/2.19.2/envs/global.env diff --git a/appstore/qinglong/2.19.1/scripts/init.sh b/appstore/qinglong/2.19.2/scripts/init.sh similarity index 100% rename from appstore/qinglong/2.19.1/scripts/init.sh rename to appstore/qinglong/2.19.2/scripts/init.sh diff --git a/appstore/super-productivity/13.1.2/scripts/uninstall.sh b/appstore/qinglong/2.19.2/scripts/uninstall.sh similarity index 100% rename from appstore/super-productivity/13.1.2/scripts/uninstall.sh rename to appstore/qinglong/2.19.2/scripts/uninstall.sh diff --git a/appstore/qinglong/2.19.1/scripts/upgrade.sh b/appstore/qinglong/2.19.2/scripts/upgrade.sh similarity index 100% rename from appstore/qinglong/2.19.1/scripts/upgrade.sh rename to appstore/qinglong/2.19.2/scripts/upgrade.sh diff --git a/appstore/rsshub/2025-06-24/.env b/appstore/rsshub/2025-06-27/.env similarity index 100% rename from appstore/rsshub/2025-06-24/.env rename to appstore/rsshub/2025-06-27/.env diff --git a/appstore/rsshub/2025-06-24/data.yml b/appstore/rsshub/2025-06-27/data.yml similarity index 100% rename from appstore/rsshub/2025-06-24/data.yml rename to appstore/rsshub/2025-06-27/data.yml diff --git a/appstore/rsshub/2025-06-24/docker-compose.yml b/appstore/rsshub/2025-06-27/docker-compose.yml similarity index 97% rename from appstore/rsshub/2025-06-24/docker-compose.yml rename to appstore/rsshub/2025-06-27/docker-compose.yml index 750c7ddc4..61335eeed 100644 --- a/appstore/rsshub/2025-06-24/docker-compose.yml +++ b/appstore/rsshub/2025-06-27/docker-compose.yml @@ -57,7 +57,7 @@ services: - -f - http://localhost:1200/healthz?key=${ACCESS_KEY} timeout: 10s - image: diygod/rsshub:2025-06-24 + image: diygod/rsshub:2025-06-27 labels: createdBy: Apps networks: diff --git a/dockge/alist-aria2_3_41_0/envs/default.env b/appstore/rsshub/2025-06-27/envs/default.env similarity index 100% rename from dockge/alist-aria2_3_41_0/envs/default.env rename to appstore/rsshub/2025-06-27/envs/default.env diff --git a/dockge/alist-aria2_3_41_0/envs/global.env b/appstore/rsshub/2025-06-27/envs/global.env similarity index 100% rename from dockge/alist-aria2_3_41_0/envs/global.env rename to appstore/rsshub/2025-06-27/envs/global.env diff --git a/appstore/rsshub/2025-06-27/scripts/init.sh b/appstore/rsshub/2025-06-27/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/rsshub/2025-06-27/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/rsshub/2025-06-27/scripts/uninstall.sh b/appstore/rsshub/2025-06-27/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/appstore/rsshub/2025-06-27/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/rsshub/2025-06-27/scripts/upgrade.sh b/appstore/rsshub/2025-06-27/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/rsshub/2025-06-27/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/super-productivity/13.1.2/.env b/appstore/super-productivity/13.1.5/.env similarity index 100% rename from appstore/super-productivity/13.1.2/.env rename to appstore/super-productivity/13.1.5/.env diff --git a/appstore/super-productivity/13.1.2/conf/webdav.yaml b/appstore/super-productivity/13.1.5/conf/webdav.yaml similarity index 100% rename from appstore/super-productivity/13.1.2/conf/webdav.yaml rename to appstore/super-productivity/13.1.5/conf/webdav.yaml diff --git a/appstore/super-productivity/13.1.2/data.yml b/appstore/super-productivity/13.1.5/data.yml similarity index 100% rename from appstore/super-productivity/13.1.2/data.yml rename to appstore/super-productivity/13.1.5/data.yml diff --git a/appstore/super-productivity/13.1.2/docker-compose.yml b/appstore/super-productivity/13.1.5/docker-compose.yml similarity index 93% rename from appstore/super-productivity/13.1.2/docker-compose.yml rename to appstore/super-productivity/13.1.5/docker-compose.yml index 8685ed11b..d6933b541 100644 --- a/appstore/super-productivity/13.1.2/docker-compose.yml +++ b/appstore/super-productivity/13.1.5/docker-compose.yml @@ -21,7 +21,7 @@ services: environment: - TZ=Asia/Shanghai - WEBDAV_BACKEND=http://sp-webdav - image: johannesjo/super-productivity:v13.1.2 + image: johannesjo/super-productivity:v13.1.5 labels: createdBy: Apps networks: diff --git a/dockge/alist-ffmpeg_3_45_0/envs/default.env b/appstore/super-productivity/13.1.5/envs/default.env similarity index 100% rename from dockge/alist-ffmpeg_3_45_0/envs/default.env rename to appstore/super-productivity/13.1.5/envs/default.env diff --git a/dockge/alist-ffmpeg_3_45_0/envs/global.env b/appstore/super-productivity/13.1.5/envs/global.env similarity index 100% rename from dockge/alist-ffmpeg_3_45_0/envs/global.env rename to appstore/super-productivity/13.1.5/envs/global.env diff --git a/appstore/super-productivity/13.1.2/scripts/init.sh b/appstore/super-productivity/13.1.5/scripts/init.sh similarity index 100% rename from appstore/super-productivity/13.1.2/scripts/init.sh rename to appstore/super-productivity/13.1.5/scripts/init.sh diff --git a/appstore/super-productivity/13.1.5/scripts/uninstall.sh b/appstore/super-productivity/13.1.5/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/appstore/super-productivity/13.1.5/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/super-productivity/13.1.2/scripts/upgrade.sh b/appstore/super-productivity/13.1.5/scripts/upgrade.sh similarity index 100% rename from appstore/super-productivity/13.1.2/scripts/upgrade.sh rename to appstore/super-productivity/13.1.5/scripts/upgrade.sh diff --git a/dockge/alist-aria2/docker-compose.yml b/dockge/alist-aria2/docker-compose.yml index a6913980a..987544dc1 100644 --- a/dockge/alist-aria2/docker-compose.yml +++ b/dockge/alist-aria2/docker-compose.yml @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: qyg2297248353/alist-aria2:v3.40.0 + image: xhofe/alist-aria2:v3.41.0 labels: createdBy: Apps networks: diff --git a/dockge/alist-aria2_3_41_0/.env b/dockge/alist-aria2_3_40_0/.env similarity index 100% rename from dockge/alist-aria2_3_41_0/.env rename to dockge/alist-aria2_3_40_0/.env diff --git a/dockge/alist-aria2_3_41_0/docker-compose.yml b/dockge/alist-aria2_3_40_0/docker-compose.yml similarity index 94% rename from dockge/alist-aria2_3_41_0/docker-compose.yml rename to dockge/alist-aria2_3_40_0/docker-compose.yml index 987544dc1..a6913980a 100644 --- a/dockge/alist-aria2_3_41_0/docker-compose.yml +++ b/dockge/alist-aria2_3_40_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist-aria2:v3.41.0 + image: qyg2297248353/alist-aria2:v3.40.0 labels: createdBy: Apps networks: diff --git a/dockge/alist_3_45_0/envs/default.env b/dockge/alist-aria2_3_40_0/envs/default.env similarity index 100% rename from dockge/alist_3_45_0/envs/default.env rename to dockge/alist-aria2_3_40_0/envs/default.env diff --git a/dockge/alist_3_45_0/envs/global.env b/dockge/alist-aria2_3_40_0/envs/global.env similarity index 100% rename from dockge/alist_3_45_0/envs/global.env rename to dockge/alist-aria2_3_40_0/envs/global.env diff --git a/dockge/alist-ffmpeg/docker-compose.yml b/dockge/alist-ffmpeg/docker-compose.yml index 8da9f3b40..37149a612 100644 --- a/dockge/alist-ffmpeg/docker-compose.yml +++ b/dockge/alist-ffmpeg/docker-compose.yml @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: qyg2297248353/alist:v3.40.0-ffmpeg + image: xhofe/alist:v3.45.0-ffmpeg labels: createdBy: Apps networks: diff --git a/dockge/alist-ffmpeg_3_45_0/.env b/dockge/alist-ffmpeg_3_40_0/.env similarity index 100% rename from dockge/alist-ffmpeg_3_45_0/.env rename to dockge/alist-ffmpeg_3_40_0/.env diff --git a/dockge/alist-ffmpeg_3_45_0/docker-compose.yml b/dockge/alist-ffmpeg_3_40_0/docker-compose.yml similarity index 93% rename from dockge/alist-ffmpeg_3_45_0/docker-compose.yml rename to dockge/alist-ffmpeg_3_40_0/docker-compose.yml index 37149a612..8da9f3b40 100644 --- a/dockge/alist-ffmpeg_3_45_0/docker-compose.yml +++ b/dockge/alist-ffmpeg_3_40_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0-ffmpeg + image: qyg2297248353/alist:v3.40.0-ffmpeg labels: createdBy: Apps networks: diff --git a/dockge/auto-lady_1_5_3/envs/default.env b/dockge/alist-ffmpeg_3_40_0/envs/default.env similarity index 100% rename from dockge/auto-lady_1_5_3/envs/default.env rename to dockge/alist-ffmpeg_3_40_0/envs/default.env diff --git a/dockge/auto-lady_1_5_3/envs/global.env b/dockge/alist-ffmpeg_3_40_0/envs/global.env similarity index 100% rename from dockge/auto-lady_1_5_3/envs/global.env rename to dockge/alist-ffmpeg_3_40_0/envs/global.env diff --git a/dockge/alist/docker-compose.yml b/dockge/alist/docker-compose.yml index a5363b529..baa8abfb1 100644 --- a/dockge/alist/docker-compose.yml +++ b/dockge/alist/docker-compose.yml @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: qyg2297248353/alist:v3.40.0 + image: xhofe/alist:v3.45.0 labels: createdBy: Apps networks: diff --git a/dockge/alist_3_45_0/.env b/dockge/alist_3_40_0/.env similarity index 100% rename from dockge/alist_3_45_0/.env rename to dockge/alist_3_40_0/.env diff --git a/dockge/alist_3_45_0/docker-compose.yml b/dockge/alist_3_40_0/docker-compose.yml similarity index 94% rename from dockge/alist_3_45_0/docker-compose.yml rename to dockge/alist_3_40_0/docker-compose.yml index baa8abfb1..a5363b529 100644 --- a/dockge/alist_3_45_0/docker-compose.yml +++ b/dockge/alist_3_40_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0 + image: qyg2297248353/alist:v3.40.0 labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_1_6_0/envs/default.env b/dockge/alist_3_40_0/envs/default.env similarity index 100% rename from dockge/bili-fetcher_1_6_0/envs/default.env rename to dockge/alist_3_40_0/envs/default.env diff --git a/dockge/bili-fetcher_1_6_0/envs/global.env b/dockge/alist_3_40_0/envs/global.env similarity index 100% rename from dockge/bili-fetcher_1_6_0/envs/global.env rename to dockge/alist_3_40_0/envs/global.env diff --git a/dockge/ammds-ol8/.env b/dockge/ammds-ol8/.env new file mode 100644 index 000000000..8a28c6046 --- /dev/null +++ b/dockge/ammds-ol8/.env @@ -0,0 +1,45 @@ +# 网络模式 [必填] +NETWORK_MODE=1panel-network + +# 数据持久化路径 [必填] +AMMDS_ROOT_PATH=/home/ammds + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8080 + +# API 端口 [必填] +PANEL_APP_PORT_API=9523 + +# MetaTube URL +AMMDS_METATUBE_URL= + +# MetaTube 密钥 +AMMDS_METATUBE_TOKEN= + +# Prowlarr URL +AMMDS_PROWLARR_URL= + +# Prowlarr 密钥 +AMMDS_PROWLARR_TOKEN= + +# IYUU 密钥 +AMMDS_IYUU_TOKEN= + +# qBittorrent URL +AMMDS_QBITTORRENT_URL= + +# qBittorrent 用户名 +AMMDS_QBITTORRENT_USERNAME= + +# qBittorrent 密码 +AMMDS_QBITTORRENT_PASSWORD= + +# 自定义挂载目录 1 +CUSTOM_MOUNT_DIRECTORY_1= + +# 自定义挂载目录 2 +CUSTOM_MOUNT_DIRECTORY_2= + +# 自定义挂载目录 3 +CUSTOM_MOUNT_DIRECTORY_3= + diff --git a/dockge/ammds-ol8/docker-compose.yml b/dockge/ammds-ol8/docker-compose.yml new file mode 100644 index 000000000..22fa20995 --- /dev/null +++ b/dockge/ammds-ol8/docker-compose.yml @@ -0,0 +1,33 @@ +networks: + 1panel-network: + external: true +services: + ammds: + container_name: ammds-ol8 + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080} + - AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523} + image: qyg2297248353/ammds:v1.6.18-ol8 + labels: + createdBy: Apps + network_mode: ${NETWORK_MODE:-host} + ports: + - ${PANEL_APP_PORT_HTTP:-8080}:${PANEL_APP_PORT_HTTP:-8080} + restart: always + stdin_open: true + tty: true + ulimits: + nofile: + hard: 524288 + soft: 524288 + volumes: + - ${AMMDS_ROOT_PATH}/data:/ammds/data + - ${AMMDS_ROOT_PATH}/db:/ammds/db + - ${AMMDS_ROOT_PATH}/download:/ammds/download + - ${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} diff --git a/dockge/byte-muse_license/envs/default.env b/dockge/ammds-ol8/envs/default.env similarity index 100% rename from dockge/byte-muse_license/envs/default.env rename to dockge/ammds-ol8/envs/default.env diff --git a/dockge/byte-muse_license/envs/global.env b/dockge/ammds-ol8/envs/global.env similarity index 100% rename from dockge/byte-muse_license/envs/global.env rename to dockge/ammds-ol8/envs/global.env diff --git a/dockge/ammds/docker-compose.yml b/dockge/ammds/docker-compose.yml index 2d8b94a1a..c5e9b458b 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.14 + image: qyg2297248353/ammds:v1.6.18 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/dockge/auto-lady/.env b/dockge/auto-lady/.env index a6f1eb1e9..3258da058 100644 --- a/dockge/auto-lady/.env +++ b/dockge/auto-lady/.env @@ -13,3 +13,9 @@ CUSTOM_MOUNT_DIRECTORY_2= # 自定义挂载目录 3 CUSTOM_MOUNT_DIRECTORY_3= +# 网络代理地址 +HTTP_PROXY= + +# 跳过代理地址 +NO_PROXY=localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local + diff --git a/dockge/auto-lady/docker-compose.yml b/dockge/auto-lady/docker-compose.yml index 40b13df53..d9c6c701e 100644 --- a/dockge/auto-lady/docker-compose.yml +++ b/dockge/auto-lady/docker-compose.yml @@ -7,7 +7,11 @@ services: env_file: - ./envs/global.env - .env - image: orekiiiiiiiiiiiii/auto-lady:1.4.5 + environment: + - HTTPS_PROXY=${HTTP_PROXY} + - HTTP_PROXY=${HTTP_PROXY:-} + - NO_PROXY=${NO_PROXY:-} + image: envyafish/byte-muse:1.5.3 labels: createdBy: Apps networks: diff --git a/dockge/auto-lady_1_4_5/.env b/dockge/auto-lady_1_4_5/.env new file mode 100644 index 000000000..a6f1eb1e9 --- /dev/null +++ b/dockge/auto-lady_1_4_5/.env @@ -0,0 +1,15 @@ +# 数据持久化路径 [必填] +AUTO_LADY_ROOT_PATH=/home/auto-lady + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8080 + +# 自定义挂载目录 1 +CUSTOM_MOUNT_DIRECTORY_1= + +# 自定义挂载目录 2 +CUSTOM_MOUNT_DIRECTORY_2= + +# 自定义挂载目录 3 +CUSTOM_MOUNT_DIRECTORY_3= + diff --git a/dockge/auto-lady_1_4_5/docker-compose.yml b/dockge/auto-lady_1_4_5/docker-compose.yml new file mode 100644 index 000000000..40b13df53 --- /dev/null +++ b/dockge/auto-lady_1_4_5/docker-compose.yml @@ -0,0 +1,22 @@ +networks: + 1panel-network: + external: true +services: + auto-lady: + container_name: auto-lady + env_file: + - ./envs/global.env + - .env + image: orekiiiiiiiiiiiii/auto-lady:1.4.5 + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:80 + restart: always + volumes: + - ${AUTO_LADY_ROOT_PATH}/config:/data + - ${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} diff --git a/dockge/emby_4_8_11_0/envs/default.env b/dockge/auto-lady_1_4_5/envs/default.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/default.env rename to dockge/auto-lady_1_4_5/envs/default.env diff --git a/dockge/emby_4_8_11_0/envs/global.env b/dockge/auto-lady_1_4_5/envs/global.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/global.env rename to dockge/auto-lady_1_4_5/envs/global.env diff --git a/dockge/bili-fetcher/docker-compose.yml b/dockge/bili-fetcher/docker-compose.yml index c68c76b14..d6ac7c0ac 100644 --- a/dockge/bili-fetcher/docker-compose.yml +++ b/dockge/bili-fetcher/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:latest + image: qyg2297248353/bili-fetcher:v1.6.0 networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:latest + image: qyg2297248353/bili-fetcher-web:v1.6.0 labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_1_6_0/.env b/dockge/bili-fetcher_latest/.env similarity index 100% rename from dockge/bili-fetcher_1_6_0/.env rename to dockge/bili-fetcher_latest/.env diff --git a/dockge/bili-fetcher_1_6_0/config/categories.json b/dockge/bili-fetcher_latest/config/categories.json similarity index 100% rename from dockge/bili-fetcher_1_6_0/config/categories.json rename to dockge/bili-fetcher_latest/config/categories.json diff --git a/dockge/bili-fetcher_1_6_0/config/config.yaml b/dockge/bili-fetcher_latest/config/config.yaml similarity index 100% rename from dockge/bili-fetcher_1_6_0/config/config.yaml rename to dockge/bili-fetcher_latest/config/config.yaml diff --git a/dockge/bili-fetcher_1_6_0/config/scheduler_config.yaml b/dockge/bili-fetcher_latest/config/scheduler_config.yaml similarity index 100% rename from dockge/bili-fetcher_1_6_0/config/scheduler_config.yaml rename to dockge/bili-fetcher_latest/config/scheduler_config.yaml diff --git a/dockge/bili-fetcher_1_6_0/config/sql_statements_mysql.py b/dockge/bili-fetcher_latest/config/sql_statements_mysql.py similarity index 100% rename from dockge/bili-fetcher_1_6_0/config/sql_statements_mysql.py rename to dockge/bili-fetcher_latest/config/sql_statements_mysql.py diff --git a/dockge/bili-fetcher_1_6_0/config/sql_statements_sqlite.py b/dockge/bili-fetcher_latest/config/sql_statements_sqlite.py similarity index 100% rename from dockge/bili-fetcher_1_6_0/config/sql_statements_sqlite.py rename to dockge/bili-fetcher_latest/config/sql_statements_sqlite.py diff --git a/dockge/bili-fetcher_1_6_0/config/template.html b/dockge/bili-fetcher_latest/config/template.html similarity index 100% rename from dockge/bili-fetcher_1_6_0/config/template.html rename to dockge/bili-fetcher_latest/config/template.html diff --git a/dockge/bili-fetcher_1_6_0/docker-compose.yml b/dockge/bili-fetcher_latest/docker-compose.yml similarity index 88% rename from dockge/bili-fetcher_1_6_0/docker-compose.yml rename to dockge/bili-fetcher_latest/docker-compose.yml index d6ac7c0ac..c68c76b14 100644 --- a/dockge/bili-fetcher_1_6_0/docker-compose.yml +++ b/dockge/bili-fetcher_latest/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:v1.6.0 + image: qyg2297248353/bili-fetcher:latest networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:v1.6.0 + image: qyg2297248353/bili-fetcher-web:latest labels: createdBy: Apps networks: diff --git a/dockge/homarr_0_15_10/envs/default.env b/dockge/bili-fetcher_latest/envs/default.env similarity index 100% rename from dockge/homarr_0_15_10/envs/default.env rename to dockge/bili-fetcher_latest/envs/default.env diff --git a/dockge/homarr_0_15_10/envs/global.env b/dockge/bili-fetcher_latest/envs/global.env similarity index 100% rename from dockge/homarr_0_15_10/envs/global.env rename to dockge/bili-fetcher_latest/envs/global.env diff --git a/dockge/byte-muse/.env b/dockge/byte-muse/.env index 7198039bd..e633719fd 100644 --- a/dockge/byte-muse/.env +++ b/dockge/byte-muse/.env @@ -1,21 +1,3 @@ -# 数据持久化路径 [必填] -AUTO_LADY_ROOT_PATH=/home/byte-muse - # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8080 - -# 自定义挂载目录 1 -CUSTOM_MOUNT_DIRECTORY_1= - -# 自定义挂载目录 2 -CUSTOM_MOUNT_DIRECTORY_2= - -# 自定义挂载目录 3 -CUSTOM_MOUNT_DIRECTORY_3= - -# 网络代理地址 -HTTP_PROXY= - -# 跳过代理地址 -NO_PROXY=localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local +PANEL_APP_PORT_HTTP=5000 diff --git a/dockge/byte-muse/docker-compose.yml b/dockge/byte-muse/docker-compose.yml index 3eb8188b7..e70ac8e43 100644 --- a/dockge/byte-muse/docker-compose.yml +++ b/dockge/byte-muse/docker-compose.yml @@ -2,25 +2,13 @@ networks: 1panel-network: external: true services: - auto-lady: + byte-muse-license: container_name: byte-muse - env_file: - - ./envs/global.env - - .env - environment: - - HTTPS_PROXY=${HTTP_PROXY} - - HTTP_PROXY=${HTTP_PROXY:-} - - NO_PROXY=${NO_PROXY:-} - image: envyafish/byte-muse:1.11.8 + image: envyafish/byte-muse-license:latest labels: createdBy: Apps networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:80 + - ${PANEL_APP_PORT_HTTP}:5000 restart: always - volumes: - - ${AUTO_LADY_ROOT_PATH}/config:/data - - ${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} diff --git a/dockge/auto-lady_1_5_3/.env b/dockge/byte-muse_1_11_8/.env similarity index 91% rename from dockge/auto-lady_1_5_3/.env rename to dockge/byte-muse_1_11_8/.env index 3258da058..7198039bd 100644 --- a/dockge/auto-lady_1_5_3/.env +++ b/dockge/byte-muse_1_11_8/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -AUTO_LADY_ROOT_PATH=/home/auto-lady +AUTO_LADY_ROOT_PATH=/home/byte-muse # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=8080 diff --git a/dockge/auto-lady_1_5_3/docker-compose.yml b/dockge/byte-muse_1_11_8/docker-compose.yml similarity index 91% rename from dockge/auto-lady_1_5_3/docker-compose.yml rename to dockge/byte-muse_1_11_8/docker-compose.yml index d9c6c701e..3eb8188b7 100644 --- a/dockge/auto-lady_1_5_3/docker-compose.yml +++ b/dockge/byte-muse_1_11_8/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: auto-lady: - container_name: auto-lady + container_name: byte-muse env_file: - ./envs/global.env - .env @@ -11,7 +11,7 @@ services: - HTTPS_PROXY=${HTTP_PROXY} - HTTP_PROXY=${HTTP_PROXY:-} - NO_PROXY=${NO_PROXY:-} - image: envyafish/byte-muse:1.5.3 + image: envyafish/byte-muse:1.11.8 labels: createdBy: Apps networks: diff --git a/dockge/immich-machine-learning_1_135_3/envs/default.env b/dockge/byte-muse_1_11_8/envs/default.env similarity index 100% rename from dockge/immich-machine-learning_1_135_3/envs/default.env rename to dockge/byte-muse_1_11_8/envs/default.env diff --git a/dockge/immich-machine-learning_1_135_3/envs/global.env b/dockge/byte-muse_1_11_8/envs/global.env similarity index 100% rename from dockge/immich-machine-learning_1_135_3/envs/global.env rename to dockge/byte-muse_1_11_8/envs/global.env diff --git a/dockge/byte-muse_license/.env b/dockge/byte-muse_license/.env deleted file mode 100644 index e633719fd..000000000 --- a/dockge/byte-muse_license/.env +++ /dev/null @@ -1,3 +0,0 @@ -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=5000 - diff --git a/dockge/byte-muse_license/docker-compose.yml b/dockge/byte-muse_license/docker-compose.yml deleted file mode 100644 index e70ac8e43..000000000 --- a/dockge/byte-muse_license/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -networks: - 1panel-network: - external: true -services: - byte-muse-license: - container_name: byte-muse - image: envyafish/byte-muse-license:latest - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:5000 - restart: always diff --git a/dockge/casdoor/docker-compose.yml b/dockge/casdoor/docker-compose.yml index 02d583e37..a451117cf 100644 --- a/dockge/casdoor/docker-compose.yml +++ b/dockge/casdoor/docker-compose.yml @@ -14,7 +14,7 @@ services: - verificationCodeTimeout=10 - appname=casdoor - authState=casdoor - image: casbin/casdoor:v1.946.0 + image: casbin/casdoor:v1.951.0 labels: createdBy: Apps networks: diff --git a/dockge/cloudreve/docker-compose.yml b/dockge/cloudreve/docker-compose.yml index 33a475685..b49aef9cb 100644 --- a/dockge/cloudreve/docker-compose.yml +++ b/dockge/cloudreve/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: cloudreve/cloudreve:4.0.0 + image: cloudreve/cloudreve:4.1.2 labels: createdBy: Apps networks: diff --git a/dockge/dozzle/docker-compose.yml b/dockge/dozzle/docker-compose.yml index ca75ee2b4..6c276f177 100644 --- a/dockge/dozzle/docker-compose.yml +++ b/dockge/dozzle/docker-compose.yml @@ -20,7 +20,7 @@ services: - /dozzle - healthcheck timeout: 30s - image: amir20/dozzle:v8.13.2 + image: amir20/dozzle:v8.13.3 labels: createdBy: Apps networks: diff --git a/dockge/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index e2d892aa1..a461e63ac 100644 --- a/dockge/emby/docker-compose.yml +++ b/dockge/emby/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.1.1 + image: emby/embyserver:4.8.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/.env b/dockge/emby_4_9_1_3/.env similarity index 100% rename from dockge/emby_4_8_11_0/.env rename to dockge/emby_4_9_1_3/.env diff --git a/dockge/emby_4_8_11_0/docker-compose.yml b/dockge/emby_4_9_1_3/docker-compose.yml similarity index 96% rename from dockge/emby_4_8_11_0/docker-compose.yml rename to dockge/emby_4_9_1_3/docker-compose.yml index a461e63ac..8859201b7 100644 --- a/dockge/emby_4_8_11_0/docker-compose.yml +++ b/dockge/emby_4_9_1_3/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.8.11.0 + image: emby/embyserver:4.9.1.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/immich-no-machine_1_135_3/envs/default.env b/dockge/emby_4_9_1_3/envs/default.env similarity index 100% rename from dockge/immich-no-machine_1_135_3/envs/default.env rename to dockge/emby_4_9_1_3/envs/default.env diff --git a/dockge/immich-no-machine_1_135_3/envs/global.env b/dockge/emby_4_9_1_3/envs/global.env similarity index 100% rename from dockge/immich-no-machine_1_135_3/envs/global.env rename to dockge/emby_4_9_1_3/envs/global.env diff --git a/dockge/ghost/docker-compose.yml b/dockge/ghost/docker-compose.yml index ea5cc3463..95674ea2c 100644 --- a/dockge/ghost/docker-compose.yml +++ b/dockge/ghost/docker-compose.yml @@ -14,7 +14,7 @@ services: - database__client=mysql - mail__options__service=Email - mail__options__secure=true - image: ghost:5.126.0 + image: ghost:5.127.2 labels: createdBy: Apps networks: diff --git a/dockge/gitea-runner/docker-compose.yml b/dockge/gitea-runner/docker-compose.yml index cc71e196f..1b571689a 100644 --- a/dockge/gitea-runner/docker-compose.yml +++ b/dockge/gitea-runner/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: gitea/act_runner:0.2.11 + image: gitea/act_runner:0.2.12 labels: createdBy: Apps networks: diff --git a/dockge/halo-h2/docker-compose.yml b/dockge/halo-h2/docker-compose.yml index 0839b2f3a..a832ced56 100644 --- a/dockge/halo-h2/docker-compose.yml +++ b/dockge/halo-h2/docker-compose.yml @@ -9,7 +9,7 @@ services: container_name: halo-h2 environment: - JVM_OPTS=-Xmx256m -Xms256m - image: halohub/halo:2.21.1 + image: halohub/halo:2.21.2 labels: createdBy: Apps networks: diff --git a/dockge/halo/docker-compose.yml b/dockge/halo/docker-compose.yml index c033cbd90..13fe712b5 100644 --- a/dockge/halo/docker-compose.yml +++ b/dockge/halo/docker-compose.yml @@ -11,7 +11,7 @@ services: - --halo.external-url=${HALO_EXTERNAL_URL} - --halo.security.remember-me.token-validity=${HALO_REMEMBER_ME_TOKEN_VALIDITY} container_name: halo - image: halohub/halo:2.21.1 + image: halohub/halo:2.21.2 labels: createdBy: Apps networks: diff --git a/dockge/homarr/.env b/dockge/homarr/.env index 39cbf2014..ab5a7db42 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -4,6 +4,3 @@ HOMARR_ROOT_PATH=/home/homarr # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=7575 -# 密钥 [必填] -SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 - diff --git a/dockge/homarr/docker-compose.yml b/dockge/homarr/docker-compose.yml index c9303a621..3b26c2c66 100644 --- a/dockge/homarr/docker-compose.yml +++ b/dockge/homarr/docker-compose.yml @@ -16,4 +16,6 @@ services: restart: always volumes: - /var/run/docker.sock:/var/run/docker.sock - - ${HOMARR_ROOT_PATH}/appdata:/appdata + - ${HOMARR_ROOT_PATH}/configs:/app/data/configs + - ${HOMARR_ROOT_PATH}/icons:/app/public/icons + - ${HOMARR_ROOT_PATH}/data:/data diff --git a/dockge/homarr_0_15_10/.env b/dockge/homarr_1_18_1/.env similarity index 52% rename from dockge/homarr_0_15_10/.env rename to dockge/homarr_1_18_1/.env index ab5a7db42..39cbf2014 100644 --- a/dockge/homarr_0_15_10/.env +++ b/dockge/homarr_1_18_1/.env @@ -4,3 +4,6 @@ HOMARR_ROOT_PATH=/home/homarr # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=7575 +# 密钥 [必填] +SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 + diff --git a/dockge/homarr_0_15_10/docker-compose.yml b/dockge/homarr_1_18_1/docker-compose.yml similarity index 73% rename from dockge/homarr_0_15_10/docker-compose.yml rename to dockge/homarr_1_18_1/docker-compose.yml index 3b26c2c66..c9303a621 100644 --- a/dockge/homarr_0_15_10/docker-compose.yml +++ b/dockge/homarr_1_18_1/docker-compose.yml @@ -16,6 +16,4 @@ services: restart: always volumes: - /var/run/docker.sock:/var/run/docker.sock - - ${HOMARR_ROOT_PATH}/configs:/app/data/configs - - ${HOMARR_ROOT_PATH}/icons:/app/public/icons - - ${HOMARR_ROOT_PATH}/data:/data + - ${HOMARR_ROOT_PATH}/appdata:/appdata diff --git a/dockge/immich-server_1_135_3/envs/default.env b/dockge/homarr_1_18_1/envs/default.env similarity index 100% rename from dockge/immich-server_1_135_3/envs/default.env rename to dockge/homarr_1_18_1/envs/default.env diff --git a/dockge/immich-server_1_135_3/envs/global.env b/dockge/homarr_1_18_1/envs/global.env similarity index 100% rename from dockge/immich-server_1_135_3/envs/global.env rename to dockge/homarr_1_18_1/envs/global.env diff --git a/dockge/immich-machine-learning/docker-compose.yml b/dockge/immich-machine-learning/docker-compose.yml index 0c0530ffe..8aa758179 100644 --- a/dockge/immich-machine-learning/docker-compose.yml +++ b/dockge/immich-machine-learning/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 + image: ghcr.io/immich-app/immich-machine-learning:v1.135.3 labels: createdBy: Apps networks: diff --git a/dockge/immich-machine-learning_1_135_3/.env b/dockge/immich-machine-learning_1_132_3/.env similarity index 100% rename from dockge/immich-machine-learning_1_135_3/.env rename to dockge/immich-machine-learning_1_132_3/.env diff --git a/dockge/immich-machine-learning_1_135_3/docker-compose.yml b/dockge/immich-machine-learning_1_132_3/docker-compose.yml similarity index 87% rename from dockge/immich-machine-learning_1_135_3/docker-compose.yml rename to dockge/immich-machine-learning_1_132_3/docker-compose.yml index 8aa758179..0c0530ffe 100644 --- a/dockge/immich-machine-learning_1_135_3/docker-compose.yml +++ b/dockge/immich-machine-learning_1_132_3/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.135.3 + image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 labels: createdBy: Apps networks: diff --git a/dockge/immich_1_135_3/envs/default.env b/dockge/immich-machine-learning_1_132_3/envs/default.env similarity index 100% rename from dockge/immich_1_135_3/envs/default.env rename to dockge/immich-machine-learning_1_132_3/envs/default.env diff --git a/dockge/immich_1_135_3/envs/global.env b/dockge/immich-machine-learning_1_132_3/envs/global.env similarity index 100% rename from dockge/immich_1_135_3/envs/global.env rename to dockge/immich-machine-learning_1_132_3/envs/global.env diff --git a/dockge/immich-no-machine/docker-compose.yml b/dockge/immich-no-machine/docker-compose.yml index 0ad713e57..b174763a8 100644 --- a/dockge/immich-no-machine/docker-compose.yml +++ b/dockge/immich-no-machine/docker-compose.yml @@ -4,36 +4,13 @@ networks: external: true services: immich-pg14-vectors: - command: - - postgres - - -c - - shared_preload_libraries=vectors.so - - -c - - search_path="$$user", public, vectors - - -c - - logging_collector=on - - -c - - max_wal_size=2GB - - -c - - shared_buffers=512MB - - -c - - wal_compression=on container_name: pg14-vectors-immich-no-machine environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - healthcheck: - interval: 5m - start_interval: 30s - start_period: 5m - test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), - 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ - "$$Chksum" = '0' ] || exit 1 - image: tensorchord/pgvecto-rs:pg14-v0.2.0 + image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0 labels: createdBy: Apps networks: @@ -52,7 +29,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 + image: ghcr.io/immich-app/immich-server:v1.135.3 labels: createdBy: Apps networks: diff --git a/dockge/immich-no-machine_1_135_3/.env b/dockge/immich-no-machine_1_132_3/.env similarity index 100% rename from dockge/immich-no-machine_1_135_3/.env rename to dockge/immich-no-machine_1_132_3/.env diff --git a/dockge/immich-no-machine_1_135_3/docker-compose.yml b/dockge/immich-no-machine_1_132_3/docker-compose.yml similarity index 54% rename from dockge/immich-no-machine_1_135_3/docker-compose.yml rename to dockge/immich-no-machine_1_132_3/docker-compose.yml index b174763a8..0ad713e57 100644 --- a/dockge/immich-no-machine_1_135_3/docker-compose.yml +++ b/dockge/immich-no-machine_1_132_3/docker-compose.yml @@ -4,13 +4,36 @@ networks: external: true services: immich-pg14-vectors: + command: + - postgres + - -c + - shared_preload_libraries=vectors.so + - -c + - search_path="$$user", public, vectors + - -c + - logging_collector=on + - -c + - max_wal_size=2GB + - -c + - shared_buffers=512MB + - -c + - wal_compression=on container_name: pg14-vectors-immich-no-machine environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0 + healthcheck: + interval: 5m + start_interval: 30s + start_period: 5m + test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' + || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' + --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), + 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ + "$$Chksum" = '0' ] || exit 1 + image: tensorchord/pgvecto-rs:pg14-v0.2.0 labels: createdBy: Apps networks: @@ -29,7 +52,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.135.3 + image: ghcr.io/immich-app/immich-server:v1.132.3 labels: createdBy: Apps networks: diff --git a/dockge/nacos_3_0_1/envs/default.env b/dockge/immich-no-machine_1_132_3/envs/default.env similarity index 100% rename from dockge/nacos_3_0_1/envs/default.env rename to dockge/immich-no-machine_1_132_3/envs/default.env diff --git a/dockge/nacos_3_0_1/envs/global.env b/dockge/immich-no-machine_1_132_3/envs/global.env similarity index 100% rename from dockge/nacos_3_0_1/envs/global.env rename to dockge/immich-no-machine_1_132_3/envs/global.env diff --git a/dockge/immich-server/docker-compose.yml b/dockge/immich-server/docker-compose.yml index 1f7695a07..a6a472d9a 100644 --- a/dockge/immich-server/docker-compose.yml +++ b/dockge/immich-server/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 + image: ghcr.io/immich-app/immich-server:v1.135.3 labels: createdBy: Apps networks: diff --git a/dockge/immich-server_1_135_3/.env b/dockge/immich-server_1_132_3/.env similarity index 100% rename from dockge/immich-server_1_135_3/.env rename to dockge/immich-server_1_132_3/.env diff --git a/dockge/immich-server_1_135_3/docker-compose.yml b/dockge/immich-server_1_132_3/docker-compose.yml similarity index 89% rename from dockge/immich-server_1_135_3/docker-compose.yml rename to dockge/immich-server_1_132_3/docker-compose.yml index a6a472d9a..1f7695a07 100644 --- a/dockge/immich-server_1_135_3/docker-compose.yml +++ b/dockge/immich-server_1_132_3/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.135.3 + image: ghcr.io/immich-app/immich-server:v1.132.3 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_16_9-alpine/envs/default.env b/dockge/immich-server_1_132_3/envs/default.env similarity index 100% rename from dockge/postgresql_16_9-alpine/envs/default.env rename to dockge/immich-server_1_132_3/envs/default.env diff --git a/dockge/postgresql_16_9-alpine/envs/global.env b/dockge/immich-server_1_132_3/envs/global.env similarity index 100% rename from dockge/postgresql_16_9-alpine/envs/global.env rename to dockge/immich-server_1_132_3/envs/global.env diff --git a/dockge/immich/docker-compose.yml b/dockge/immich/docker-compose.yml index 44a2398ec..680035b9c 100644 --- a/dockge/immich/docker-compose.yml +++ b/dockge/immich/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 + image: ghcr.io/immich-app/immich-machine-learning:v1.135.3 labels: createdBy: Apps networks: @@ -21,36 +21,13 @@ services: volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache immich-pg14-vectors: - command: - - postgres - - -c - - shared_preload_libraries=vectors.so - - -c - - search_path="$$user", public, vectors - - -c - - logging_collector=on - - -c - - max_wal_size=2GB - - -c - - shared_buffers=512MB - - -c - - wal_compression=on container_name: pg14-vectors-immich environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - healthcheck: - interval: 5m - start_interval: 30s - start_period: 5m - test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), - 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ - "$$Chksum" = '0' ] || exit 1 - image: tensorchord/pgvecto-rs:pg14-v0.2.0 + image: ghcr.io/immich-app/postgres:14-vectorchord0.4.1-pgvectors0.2.0 labels: createdBy: Apps networks: @@ -68,7 +45,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 + image: ghcr.io/immich-app/immich-server:v1.135.3 labels: createdBy: Apps networks: diff --git a/dockge/immich_1_135_3/.env b/dockge/immich_1_132_3/.env similarity index 100% rename from dockge/immich_1_135_3/.env rename to dockge/immich_1_132_3/.env diff --git a/dockge/immich_1_135_3/docker-compose.yml b/dockge/immich_1_132_3/docker-compose.yml similarity index 59% rename from dockge/immich_1_135_3/docker-compose.yml rename to dockge/immich_1_132_3/docker-compose.yml index 680035b9c..44a2398ec 100644 --- a/dockge/immich_1_135_3/docker-compose.yml +++ b/dockge/immich_1_132_3/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.135.3 + image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 labels: createdBy: Apps networks: @@ -21,13 +21,36 @@ services: volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache immich-pg14-vectors: + command: + - postgres + - -c + - shared_preload_libraries=vectors.so + - -c + - search_path="$$user", public, vectors + - -c + - logging_collector=on + - -c + - max_wal_size=2GB + - -c + - shared_buffers=512MB + - -c + - wal_compression=on container_name: pg14-vectors-immich environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - image: ghcr.io/immich-app/postgres:14-vectorchord0.4.1-pgvectors0.2.0 + healthcheck: + interval: 5m + start_interval: 30s + start_period: 5m + test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' + || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' + --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), + 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ + "$$Chksum" = '0' ] || exit 1 + image: tensorchord/pgvecto-rs:pg14-v0.2.0 labels: createdBy: Apps networks: @@ -45,7 +68,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.135.3 + image: ghcr.io/immich-app/immich-server:v1.132.3 labels: createdBy: Apps networks: diff --git a/dockge/qbittorrent_5_1_1/envs/default.env b/dockge/immich_1_132_3/envs/default.env similarity index 100% rename from dockge/qbittorrent_5_1_1/envs/default.env rename to dockge/immich_1_132_3/envs/default.env diff --git a/dockge/qbittorrent_5_1_1/envs/global.env b/dockge/immich_1_132_3/envs/global.env similarity index 100% rename from dockge/qbittorrent_5_1_1/envs/global.env rename to dockge/immich_1_132_3/envs/global.env diff --git a/dockge/logto/docker-compose.yml b/dockge/logto/docker-compose.yml index 54c747182..775335695 100644 --- a/dockge/logto/docker-compose.yml +++ b/dockge/logto/docker-compose.yml @@ -18,7 +18,7 @@ services: - TRUST_PROXY_HEADER=true - CASE_SENSITIVE_USERNAME=true - DB_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_NAME} - image: svhd/logto:1.28.0 + image: svhd/logto:1.29.0 labels: createdBy: Apps networks: diff --git a/dockge/mdc-ng/docker-compose.yml b/dockge/mdc-ng/docker-compose.yml index 4ccc4b97e..95f006a2c 100644 --- a/dockge/mdc-ng/docker-compose.yml +++ b/dockge/mdc-ng/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: mdcng/mdc:1.0.0 + image: mdcng/mdc:1.8.0 labels: createdBy: Apps networks: diff --git a/dockge/n8n/docker-compose.yml b/dockge/n8n/docker-compose.yml index acafe3446..82c9159d7 100644 --- a/dockge/n8n/docker-compose.yml +++ b/dockge/n8n/docker-compose.yml @@ -14,7 +14,7 @@ services: - N8N_PROTOCOL=http - N8N_DIAGNOSTICS_ENABLED=false - N8N_SECURE_COOKIE=false - image: n8nio/n8n:1.100.0 + image: n8nio/n8n:1.100.1 labels: createdBy: Apps networks: diff --git a/dockge/nacos-derby/docker-compose.yml b/dockge/nacos-derby/docker-compose.yml index 36baffdcf..b4360ceb1 100644 --- a/dockge/nacos-derby/docker-compose.yml +++ b/dockge/nacos-derby/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_CONSOLE_PORT=${PANEL_APP_PORT_HTTP:-8080} - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - image: nacos/nacos-server:v3.0.1 + image: nacos/nacos-server:v3.0.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nacos_3_0_1/.env b/dockge/nacos_3_0_2/.env similarity index 100% rename from dockge/nacos_3_0_1/.env rename to dockge/nacos_3_0_2/.env diff --git a/dockge/nacos_3_0_1/docker-compose.yml b/dockge/nacos_3_0_2/docker-compose.yml similarity index 95% rename from dockge/nacos_3_0_1/docker-compose.yml rename to dockge/nacos_3_0_2/docker-compose.yml index c256c4cbb..76ef8b9fd 100644 --- a/dockge/nacos_3_0_1/docker-compose.yml +++ b/dockge/nacos_3_0_2/docker-compose.yml @@ -13,7 +13,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v3.0.1 + image: nacos/nacos-server:v3.0.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/redis_6_2_18/envs/default.env b/dockge/nacos_3_0_2/envs/default.env similarity index 100% rename from dockge/redis_6_2_18/envs/default.env rename to dockge/nacos_3_0_2/envs/default.env diff --git a/dockge/redis_6_2_18/envs/global.env b/dockge/nacos_3_0_2/envs/global.env similarity index 100% rename from dockge/redis_6_2_18/envs/global.env rename to dockge/nacos_3_0_2/envs/global.env diff --git a/dockge/nacos_3_0_1/init/mysql-schema.sql b/dockge/nacos_3_0_2/init/mysql-schema.sql similarity index 100% rename from dockge/nacos_3_0_1/init/mysql-schema.sql rename to dockge/nacos_3_0_2/init/mysql-schema.sql diff --git a/dockge/nodepassdash/.env b/dockge/nodepassdash/.env new file mode 100644 index 000000000..a1eba4f62 --- /dev/null +++ b/dockge/nodepassdash/.env @@ -0,0 +1,9 @@ +# 网络模式 [必填] +NETWORK_MODE=host + +# 数据持久化路径 [必填] +NODEPASSDASH_ROOT_PATH=/home/nodepassdash + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3000 + diff --git a/dockge/nodepassdash/docker-compose.yml b/dockge/nodepassdash/docker-compose.yml new file mode 100644 index 000000000..9fadcad30 --- /dev/null +++ b/dockge/nodepassdash/docker-compose.yml @@ -0,0 +1,22 @@ +networks: + 1panel-network: + external: true +services: + nodepassdash: + container_name: nodepassdash + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - PORT=${PANEL_APP_PORT_HTTP} + image: ghcr.io/nodepassproject/nodepassdash:2.0.6 + labels: + createdBy: Apps + network_mode: ${NETWORK_MODE} + ports: + - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} + restart: always + volumes: + - ${NODEPASSDASH_ROOT_PATH}/logs:/app/logs + - ${NODEPASSDASH_ROOT_PATH}/public:/app/public diff --git a/dockge/stream-rec_dev/envs/default.env b/dockge/nodepassdash/envs/default.env similarity index 100% rename from dockge/stream-rec_dev/envs/default.env rename to dockge/nodepassdash/envs/default.env diff --git a/dockge/stream-rec_dev/envs/global.env b/dockge/nodepassdash/envs/global.env similarity index 100% rename from dockge/stream-rec_dev/envs/global.env rename to dockge/nodepassdash/envs/global.env diff --git a/dockge/ollama/docker-compose.yml b/dockge/ollama/docker-compose.yml index c8edbfdc7..98d812028 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.9.2 + image: ollama/ollama:0.9.3 labels: createdBy: Apps networks: diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index 6826af067..aad82d79a 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg16-alpine-postgresql + container_name: postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:16-alpine + image: postgres:16.9-alpine labels: createdBy: Apps networks: diff --git a/dockge/postgresql_16_9-alpine/.env b/dockge/postgresql_pg16-alpine/.env similarity index 100% rename from dockge/postgresql_16_9-alpine/.env rename to dockge/postgresql_pg16-alpine/.env diff --git a/dockge/postgresql_16_9-alpine/docker-compose.yml b/dockge/postgresql_pg16-alpine/docker-compose.yml similarity index 87% rename from dockge/postgresql_16_9-alpine/docker-compose.yml rename to dockge/postgresql_pg16-alpine/docker-compose.yml index aad82d79a..6826af067 100644 --- a/dockge/postgresql_16_9-alpine/docker-compose.yml +++ b/dockge/postgresql_pg16-alpine/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: postgresql + container_name: pg16-alpine-postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:16.9-alpine + image: postgres:16-alpine labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_18_1/envs/default.env b/dockge/postgresql_pg16-alpine/envs/default.env similarity index 100% rename from dockge/umami-mysql_2_18_1/envs/default.env rename to dockge/postgresql_pg16-alpine/envs/default.env diff --git a/dockge/umami-mysql_2_18_1/envs/global.env b/dockge/postgresql_pg16-alpine/envs/global.env similarity index 100% rename from dockge/umami-mysql_2_18_1/envs/global.env rename to dockge/postgresql_pg16-alpine/envs/global.env diff --git a/dockge/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index 5ec4b458b..5dd224da4 100644 --- a/dockge/qbittorrent/docker-compose.yml +++ b/dockge/qbittorrent/docker-compose.yml @@ -12,7 +12,7 @@ services: - UMASK=022 - WEBUI_PORT=${PANEL_APP_PORT_HTTP} - TORRENTING_PORT=${PANEL_APP_PORT_TORRENTING} - image: linuxserver/qbittorrent:4.6.7 + image: linuxserver/qbittorrent:5.1.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_1_1/.env b/dockge/qbittorrent_4_6_7/.env similarity index 100% rename from dockge/qbittorrent_5_1_1/.env rename to dockge/qbittorrent_4_6_7/.env diff --git a/dockge/qbittorrent_5_1_1/docker-compose.yml b/dockge/qbittorrent_4_6_7/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_5_1_1/docker-compose.yml rename to dockge/qbittorrent_4_6_7/docker-compose.yml index 5dd224da4..5ec4b458b 100644 --- a/dockge/qbittorrent_5_1_1/docker-compose.yml +++ b/dockge/qbittorrent_4_6_7/docker-compose.yml @@ -12,7 +12,7 @@ services: - UMASK=022 - WEBUI_PORT=${PANEL_APP_PORT_HTTP} - TORRENTING_PORT=${PANEL_APP_PORT_TORRENTING} - image: linuxserver/qbittorrent:5.1.1 + image: linuxserver/qbittorrent:4.6.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/umami_2_18_1/envs/default.env b/dockge/qbittorrent_4_6_7/envs/default.env similarity index 100% rename from dockge/umami_2_18_1/envs/default.env rename to dockge/qbittorrent_4_6_7/envs/default.env diff --git a/dockge/umami_2_18_1/envs/global.env b/dockge/qbittorrent_4_6_7/envs/global.env similarity index 100% rename from dockge/umami_2_18_1/envs/global.env rename to dockge/qbittorrent_4_6_7/envs/global.env diff --git a/dockge/qinglong/docker-compose.yml b/dockge/qinglong/docker-compose.yml index 722d30ff0..bd436dc35 100644 --- a/dockge/qinglong/docker-compose.yml +++ b/dockge/qinglong/docker-compose.yml @@ -7,7 +7,7 @@ services: environment: - QlPort=5700 - QlBaseUrl=${QINGLONG_BASE_URL:-/} - image: whyour/qinglong:2.19.1 + image: whyour/qinglong:2.19.2 labels: createdBy: Apps networks: diff --git a/dockge/redis/config/redis.conf b/dockge/redis/config/redis.conf index 8795ae291..ca22ec9f6 100644 --- a/dockge/redis/config/redis.conf +++ b/dockge/redis/config/redis.conf @@ -32,17 +32,8 @@ # If instead you are interested in using includes to override configuration # options, it is better to use include as the last line. # -# Included paths may contain wildcards. All files matching the wildcards will -# be included in alphabetical order. -# Note that if an include path contains a wildcards but no files match it when -# the server is started, the include statement will be ignored and no error will -# be emitted. It is safe, therefore, to include wildcard files from empty -# directories. -# # include /path/to/local.conf # include /path/to/other.conf -# include /path/to/fragments/*.conf -# ################################## MODULES ##################################### @@ -58,81 +49,43 @@ # for connections from all available network interfaces on the host machine. # It is possible to listen to just one or multiple selected interfaces using # the "bind" configuration directive, followed by one or more IP addresses. -# Each address can be prefixed by "-", which means that redis will not fail to -# start if the address is not available. Being not available only refers to -# addresses that does not correspond to any network interface. Addresses that -# are already in use will always fail, and unsupported protocols will always BE -# silently skipped. # # Examples: # -# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses -# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 -# bind * -::* # like the default, all available interfaces +# bind 192.168.1.100 10.0.0.1 +# bind 127.0.0.1 ::1 # # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the # internet, binding to all the interfaces is dangerous and will expose the # instance to everybody on the internet. So by default we uncomment the # following bind directive, that will force Redis to listen only on the -# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis -# will only be able to accept client connections from the same host that it is -# running on). +# IPv4 loopback interface address (this means Redis will only be able to +# accept client connections from the same host that it is running on). # # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES -# COMMENT OUT THE FOLLOWING LINE. -# -# You will also need to set a password unless you explicitly disable protected -# mode. +# JUST COMMENT OUT THE FOLLOWING LINE. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bind 0.0.0.0 -# By default, outgoing connections (from replica to master, from Sentinel to -# instances, cluster bus, etc.) are not bound to a specific local address. In -# most cases, this means the operating system will handle that based on routing -# and the interface through which the connection goes out. -# -# Using bind-source-addr it is possible to configure a specific address to bind -# to, which may also affect how the connection gets routed. -# -# Example: -# -# bind-source-addr 10.0.0.1 - # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. # -# When protected mode is on and the default user has no password, the server -# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address -# (::1) or Unix domain sockets. +# When protected mode is on and if: +# +# 1) The server is not binding explicitly to a set of addresses using the +# "bind" directive. +# 2) No password is configured. +# +# The server only accepts connections from clients connecting from the +# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain +# sockets. # # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis -# even if no authentication is configured. +# even if no authentication is configured, nor a specific set of interfaces +# are explicitly listed using the "bind" directive. protected-mode yes -# Redis uses default hardened security configuration directives to reduce the -# attack surface on innocent users. Therefore, several sensitive configuration -# directives are immutable, and some potentially-dangerous commands are blocked. -# -# Configuration directives that control files that Redis writes to (e.g., 'dir' -# and 'dbfilename') and that aren't usually modified during runtime -# are protected by making them immutable. -# -# Commands that can increase the attack surface of Redis and that aren't usually -# called by users are blocked by default. -# -# These can be exposed to either all connections or just local ones by setting -# each of the configs listed below to either of these values: -# -# no - Block for any connection (remain immutable) -# yes - Allow for any connection (no protection) -# local - Allow only for local connections. Ones originating from the -# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. -# -# enable-protected-configs no -# enable-debug-command no -# enable-module-command no - # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 @@ -152,7 +105,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # -# unixsocket /run/redis.sock +# unixsocket /tmp/redis.sock # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) @@ -175,16 +128,6 @@ timeout 0 # Redis default starting with Redis 3.2.1. tcp-keepalive 300 -# Apply OS-specific mechanism to mark the listening socket with the specified -# ID, to support advanced routing and filtering capabilities. -# -# On Linux, the ID represents a connection mark. -# On FreeBSD, the ID represents a socket cookie ID. -# On OpenBSD, the ID represents a route table ID. -# -# The default value is 0, which implies no marking is required. -# socket-mark-id 0 - ################################# TLS/SSL ##################################### # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration @@ -200,32 +143,8 @@ tcp-keepalive 300 # # tls-cert-file redis.crt # tls-key-file redis.key -# -# If the key file is encrypted using a passphrase, it can be included here -# as well. -# -# tls-key-file-pass secret -# Normally Redis uses the same certificate for both server functions (accepting -# connections) and client functions (replicating from a master, establishing -# cluster bus connections, etc.). -# -# Sometimes certificates are issued with attributes that designate them as -# client-only or server-only certificates. In that case it may be desired to use -# different certificates for incoming (server) and outgoing (client) -# connections. To do that, use the following directives: -# -# tls-client-cert-file client.crt -# tls-client-key-file client.key -# -# If the key file is encrypted using a passphrase, it can be included here -# as well. -# -# tls-client-key-file-pass secret - -# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, -# required by older versions of OpenSSL (<3.0). Newer versions do not require -# this configuration and recommend against it. +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: # # tls-dh-params-file redis.dh @@ -258,12 +177,9 @@ tcp-keepalive 300 # # tls-cluster yes -# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended -# that older formally deprecated versions are kept disabled to reduce the attack surface. -# You can explicitly specify TLS versions to support. -# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", -# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. -# To enable only TLSv1.2 and TLSv1.3, use: +# Explicitly specify TLS versions to support. Allowed values are case insensitive +# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or +# any combination. To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -305,7 +221,6 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. -# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -314,17 +229,11 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET -# on startup, and updating Redis status on a regular -# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -# -# The default is "no". To run under upstart/systemd, you can simply uncomment -# the line below: -# -# supervised auto +supervised no # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -335,9 +244,6 @@ daemonize no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. -# -# Note that on modern Linux systems "/run/redis.pid" is more conforming -# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -363,74 +269,44 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 -# To disable the built in crash log, which will possibly produce cleaner core -# dumps when they are needed, uncomment the following: -# -# crash-log-enabled no - -# To disable the fast memory check that's run as part of the crash log, which -# will possibly let redis terminate sooner, uncomment the following: -# -# crash-memcheck-enabled no - # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY and syslog logging is -# disabled. Basically this means that normally a logo is displayed only in -# interactive sessions. +# standard output and if the standard output is a TTY. Basically this means +# that normally a logo is displayed only in interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo no - -# By default, Redis modifies the process title (as seen in 'top' and 'ps') to -# provide some runtime information. It is possible to disable this and leave -# the process name as executed by setting the following to no. -set-proc-title yes - -# When changing the process title, Redis uses the following template to construct -# the modified title. -# -# Template variables are specified in curly brackets. The following variables are -# supported: -# -# {title} Name of process as executed if parent, or type of child process. -# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or -# Unix socket if only that's available. -# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". -# {port} TCP port listening on, or 0. -# {tls-port} TLS port listening on, or 0. -# {unixsocket} Unix domain socket listening on, or "". -# {config-file} Name of configuration file used. -# -proc-title-template "{title} {listen-addr} {server-mode}" +always-show-logo yes ################################ SNAPSHOTTING ################################ +# +# Save the DB on disk: +# +# save +# +# Will save the DB if both the given number of seconds and the given +# number of write operations against the DB occurred. +# +# In the example below the behavior will be to save: +# after 900 sec (15 min) if at least 1 key changed +# after 300 sec (5 min) if at least 10 keys changed +# after 60 sec if at least 10000 keys changed +# +# Note: you can disable saving completely by commenting out all "save" lines. +# +# It is also possible to remove all the previously configured save +# points by adding a save directive with a single empty string argument +# like in the following example: +# +# save "" -# Save the DB to disk. -# -# save [ ...] -# -# Redis will save the DB if the given number of seconds elapsed and it -# surpassed the given number of write operations against the DB. -# -# Snapshotting can be completely disabled with a single empty string argument -# as in following example: -# -# save "" -# -# Unless specified otherwise, by default Redis will save the DB: -# * After 3600 seconds (an hour) if at least 1 change was performed -# * After 300 seconds (5 minutes) if at least 100 changes were performed -# * After 60 seconds if at least 10000 changes were performed -# -# You can set these explicitly by uncommenting the following line. -# -# save 3600 1 300 100 60 10000 +save 900 1 +save 300 10 +save 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -462,21 +338,6 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes -# Enables or disables full sanitization checks for ziplist and listpack etc when -# loading an RDB or RESTORE payload. This reduces the chances of a assertion or -# crash later on while processing commands. -# Options: -# no - Never perform full sanitization -# yes - Always perform full sanitization -# clients - Perform full sanitization only for user connections. -# Excludes: RDB files, RESTORE commands received from the master -# connection, and client connections which have the -# skip-sanitize-payload ACL flag. -# The default should be 'clients' but since it currently affects cluster -# resharding via MIGRATE, it is temporarily set to 'no' by default. -# -# sanitize-dump-payload no - # The filename where to dump the DB dbfilename dump.rdb @@ -551,10 +412,9 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error -# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" -# to all data access commands, excluding commands such as: -# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with +# an error "SYNC with master in progress" to all commands except: +# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -603,7 +463,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync yes +repl-diskless-sync no # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -617,18 +477,12 @@ repl-diskless-sync yes # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 -# When diskless replication is enabled with a delay, it is possible to let -# the replication start before the maximum delay is reached if the maximum -# number of replicas expected have connected. Default of 0 means that the -# maximum is not defined and Redis will wait the full delay. -repl-diskless-sync-max-replicas 0 - # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if you know what you are doing. +# stage with the master. Use only if your do what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -637,23 +491,19 @@ repl-diskless-sync-max-replicas 0 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and replica buffers). +# Copy on Write memory and salve buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep current db contents in RAM while parsing the data directly -# from the socket. Replicas in this mode can keep serving current -# data set while replication is in progress, except for cases where -# they can't recognize master as having a data set from same -# replication history. -# Note that this requires sufficient memory, if you don't have it, -# you risk an OOM kill. +# "swapdb" - Keep a copy of the current db contents in RAM while parsing +# the data directly from the socket. note that this requires +# sufficient memory, if you don't have it, you risk an OOM kill. repl-diskless-load disabled -# Master send PINGs to its replicas in a predefined interval. It's possible to +# Replicas send PINGs to server in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -728,43 +578,6 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 -# The propagation error behavior controls how Redis will behave when it is -# unable to handle a command being processed in the replication stream from a master -# or processed while reading from an AOF file. Errors that occur during propagation -# are unexpected, and can cause data inconsistency. However, there are edge cases -# in earlier versions of Redis where it was possible for the server to replicate or persist -# commands that would fail on future versions. For this reason the default behavior -# is to ignore such errors and continue processing commands. -# -# If an application wants to ensure there is no data divergence, this configuration -# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' -# to only panic when a replica encounters an error on the replication stream. One of -# these two panic values will become the default value in the future once there are -# sufficient safety mechanisms in place to prevent false positive crashes. -# -# propagation-error-behavior ignore - -# Replica ignore disk write errors controls the behavior of a replica when it is -# unable to persist a write command received from its master to disk. By default, -# this configuration is set to 'no' and will crash the replica in this condition. -# It is not recommended to change this default, however in order to be compatible -# with older versions of Redis this config can be toggled to 'yes' which will just -# log a warning and execute the write command it got from the master. -# -# replica-ignore-disk-write-errors no - -# ----------------------------------------------------------------------------- -# By default, Redis Sentinel includes all replicas in its reports. A replica -# can be excluded from Redis Sentinel's announcements. An unannounced replica -# will be ignored by the 'sentinel replicas ' command and won't be -# exposed to Redis Sentinel's clients. -# -# This option does not change the behavior of replica-priority. Even with -# replica-announced set to 'no', the replica can be promoted to master. To -# prevent this behavior, set replica-priority to 0. -# -# replica-announced yes - # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -820,7 +633,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# a radix key indexed by key name, what clients have which keys. In turn +# 16 millions of slots, what clients may have certain subsets of keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -884,12 +697,8 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. -# sanitize-payload RESTORE dump-payload is sanitized (default). -# + Allow the execution of that command. -# May be used with `|` for allowing subcommands (e.g "+config|get") -# - Disallow the execution of that command. -# May be used with `|` for blocking subcommands (e.g "-config|set") +# + Allow the execution of that command +# - Disallow the execution of that command # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -897,11 +706,10 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|first-arg Allow a specific first argument of an otherwise -# disabled command. It is only supported on commands with -# no sub-commands, and is not allowed as negative form -# like -SELECT|1, only additive starting with "+". This -# feature is deprecated and may be removed in the future. +# +|subcommand Allow a specific subcommand of an otherwise +# disabled command. Note that this form is not +# allowed as negative like -DEBUG|SEGFAULT, but +# only additive starting with "+". # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -909,17 +717,8 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. -# %R~ Add key read pattern that specifies which keys can be read -# from. -# %W~ Add key write pattern that specifies which keys can be -# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. -# & Add a glob-style pattern of Pub/Sub channels that can be -# accessed by the user. It is possible to specify multiple channel -# patterns. -# allchannels Alias for &* -# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -938,14 +737,6 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. -# () Create a new selector with the options specified within the -# parentheses and attach it to the user. Each option should be -# space separated. The first character must be ( and the last -# character must be ). -# clearselectors Remove all of the currently attached selectors. -# Note this does not change the "root" user permissions, -# which are the permissions directly applied onto the -# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -967,40 +758,6 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # -# The following is a list of command categories and their meanings: -# * keyspace - Writing or reading from keys, databases, or their metadata -# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, -# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, -# key or metadata will also have `write` category. Commands that only read -# the keyspace, key or metadata will have the `read` category. -# * read - Reading from keys (values or metadata). Note that commands that don't -# interact with keys, will not have either `read` or `write`. -# * write - Writing to keys (values or metadata) -# * admin - Administrative commands. Normal applications will never need to use -# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. -# * dangerous - Potentially dangerous (each should be considered with care for -# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, -# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. -# * connection - Commands affecting the connection or other connections. -# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. -# * blocking - Potentially blocking the connection until released by another -# command. -# * fast - Fast O(1) commands. May loop on the number of arguments, but not the -# number of elements in the key. -# * slow - All commands that are not Fast. -# * pubsub - PUBLISH / SUBSCRIBE related -# * transaction - WATCH / MULTI / EXEC related commands. -# * scripting - Scripting related. -# * set - Data type: sets related. -# * sortedset - Data type: zsets related. -# * list - Data type: lists related. -# * hash - Data type: hashes related. -# * string - Data type: strings related. -# * bitmap - Data type: bitmaps related. -# * hyperloglog - Data type: hyperloglog related. -# * geo - Data type: geo related. -# * stream - Data type: streams related. -# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -1030,24 +787,8 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # -# The requirepass is not compatible with aclfile option and the ACL LOAD -# command, these will cause requirepass to be ignored. -# # requirepass foobared -# New users are initialized with restrictive permissions by default, via the -# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it -# is possible to manage access to Pub/Sub channels with ACL rules as well. The -# default Pub/Sub channels permission if new users is controlled by the -# acl-pubsub-default configuration directive, which accepts one of these values: -# -# allchannels: grants access to all Pub/Sub channels -# resetchannels: revokes access to all Pub/Sub channels -# -# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. -# -# acl-pubsub-default resetchannels - # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -1136,12 +877,14 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, when there are no suitable keys for -# eviction, Redis will return an error on write operations that require -# more memory. These are usually commands that create new keys, add data or -# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, -# SORT (due to the STORE argument), and EXEC (if the transaction includes any -# command that requires memory). +# Note: with any of the above policies, Redis will return an error on write +# operations, when there are no suitable keys for eviction. +# +# At the date of writing these commands are: set setnx setex append +# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd +# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby +# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby +# getset mset msetnx exec sort # # The default is: # @@ -1158,14 +901,6 @@ acllog-max-len 128 # # maxmemory-samples 5 -# Eviction processing is designed to function well with the default setting. -# If there is an unusually large amount of write traffic, this value may need to -# be increased. Decreasing this value may reduce latency at the risk of -# eviction processing effectiveness -# 0 = minimum latency, 10 = default, 100 = process without regard to latency -# -# maxmemory-eviction-tenacity 10 - # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -1259,13 +994,6 @@ replica-lazy-flush no lazyfree-lazy-user-del no -# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous -# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the -# commands. When neither flag is passed, this directive will be used to determine -# if the data should be deleted asynchronously. - -lazyfree-lazy-user-flush no - ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1304,7 +1032,7 @@ lazyfree-lazy-user-flush no # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Also, this feature currently does not work when SSL is +# CONFIG SET. Aso this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1322,7 +1050,7 @@ lazyfree-lazy-user-flush no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports these options: +# Redis supports three options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1343,19 +1071,6 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 - -#################### KERNEL transparent hugepage CONTROL ###################### - -# Usually the kernel Transparent Huge Pages control is set to "madvise" or -# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which -# case this config has no effect. On systems in which it is set to "always", -# redis will attempt to disable it specifically for the redis process in order -# to avoid latency problems specifically with fork(2) and CoW. -# If for some reason you prefer to keep it enabled, you can set this config to -# "no" and the kernel global to "always". - -disable-thp yes - ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1374,43 +1089,14 @@ disable-thp yes # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check https://redis.io/topics/persistence for more information. +# Please check http://redis.io/topics/persistence for more information. appendonly no -# The base name of the append only file. -# -# Redis 7 and newer use a set of append-only files to persist the dataset -# and changes applied to it. There are two basic types of files in use: -# -# - Base files, which are a snapshot representing the complete state of the -# dataset at the time the file was created. Base files can be either in -# the form of RDB (binary serialized) or AOF (textual commands). -# - Incremental files, which contain additional commands that were applied -# to the dataset following the previous file. -# -# In addition, manifest files are used to track the files and the order in -# which they were created and should be applied. -# -# Append-only file names are created by Redis following a specific pattern. -# The file name's prefix is based on the 'appendfilename' configuration -# parameter, followed by additional information about the sequence and type. -# -# For example, if appendfilename is set to appendonly.aof, the following file -# names could be derived: -# -# - appendonly.aof.1.base.rdb as a base file. -# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. -# - appendonly.aof.manifest as a manifest file. +# The name of the append only file (default: "appendonly.aof") appendfilename "appendonly.aof" -# For convenience, Redis stores all persistent append-only files in a dedicated -# directory. The name of the directory is determined by the appenddirname -# configuration parameter. - -appenddirname "appendonlydir" - # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1450,7 +1136,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync no". In practical terms, this means that it is +# the same as "appendfsync none". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1503,69 +1189,34 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# Redis can create append-only base files in either RDB or AOF formats. Using -# the RDB format is always faster and more efficient, and disabling it is only -# supported for backward compatibility purposes. +# When rewriting the AOF file, Redis is able to use an RDB preamble in the +# AOF file for faster rewrites and recoveries. When this option is turned +# on the rewritten AOF file is composed of two different stanzas: +# +# [RDB file][AOF tail] +# +# When loading, Redis recognizes that the AOF file starts with the "REDIS" +# string and loads the prefixed RDB file, then continues loading the AOF +# tail. aof-use-rdb-preamble yes -# Redis supports recording timestamp annotations in the AOF to support restoring -# the data from a specific point-in-time. However, using this capability changes -# the AOF format in a way that may not be compatible with existing AOF parsers. -aof-timestamp-enabled no +################################ LUA SCRIPTING ############################### -################################ SHUTDOWN ##################################### - -# Maximum time to wait for replicas when shutting down, in seconds. +# Max execution time of a Lua script in milliseconds. # -# During shut down, a grace period allows any lagging replicas to catch up with -# the latest replication offset before the master exists. This period can -# prevent data loss, especially for deployments without configured disk backups. +# If the maximum execution time is reached Redis will log that a script is +# still in execution after the maximum allowed time and will start to +# reply to queries with an error. # -# The 'shutdown-timeout' value is the grace period's duration in seconds. It is -# only applicable when the instance has replicas. To disable the feature, set -# the value to 0. +# When a long running script exceeds the maximum execution time only the +# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be +# used to stop a script that did not yet call any write commands. The second +# is the only way to shut down the server in the case a write command was +# already issued by the script but the user doesn't want to wait for the natural +# termination of the script. # -# shutdown-timeout 10 - -# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default -# an RDB snapshot is written to disk in a blocking operation if save points are configured. -# The options used on signaled shutdown can include the following values: -# default: Saves RDB snapshot only if save points are configured. -# Waits for lagging replicas to catch up. -# save: Forces a DB saving operation even if no save points are configured. -# nosave: Prevents DB saving operation even if one or more save points are configured. -# now: Skips waiting for lagging replicas. -# force: Ignores any errors that would normally prevent the server from exiting. -# -# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. -# Example: "nosave force now" -# -# shutdown-on-sigint default -# shutdown-on-sigterm default - -################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### - -# Maximum time in milliseconds for EVAL scripts, functions and in some cases -# modules' commands before Redis can start processing or rejecting other clients. -# -# If the maximum execution time is reached Redis will start to reply to most -# commands with a BUSY error. -# -# In this state Redis will only allow a handful of commands to be executed. -# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some -# module specific 'allow-busy' commands. -# -# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not -# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop -# the server in the case a write command was already issued by the script when -# the user doesn't want to wait for the natural termination of the script. -# -# The default is 5 seconds. It is possible to set it to 0 or a negative value -# to disable this mechanism (uninterrupted execution). Note that in the past -# this config had a different name, which is now an alias, so both of these do -# the same: -# lua-time-limit 5000 -# busy-reply-threshold 5000 +# Set it to 0 or a negative value for unlimited execution without warnings. +lua-time-limit 5000 ################################ REDIS CLUSTER ############################### @@ -1589,11 +1240,6 @@ aof-timestamp-enabled no # # cluster-node-timeout 15000 -# The cluster port is the port that the cluster bus will listen for inbound connections on. When set -# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires -# you to specify the cluster bus port when executing cluster meet. -# cluster-port 0 - # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1652,21 +1298,12 @@ aof-timestamp-enabled no # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value or -# set cluster-allow-replica-migration to 'no'. +# one replica). To disable migration just set it to a very large value. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 -# Turning off this option allows to use less automatic cluster configuration. -# It both disables migration to orphaned masters and migration from masters -# that became empty. -# -# Default is 'yes' (allow automatic migrations). -# -# cluster-allow-replica-migration yes - # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1681,7 +1318,7 @@ aof-timestamp-enabled no # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the replica can still perform a +# master during master failures. However the master can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1691,7 +1328,7 @@ aof-timestamp-enabled no # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# cluster is in a down state, as long as it believes it owns the slots. +# the cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1706,54 +1343,8 @@ aof-timestamp-enabled no # # cluster-allow-reads-when-down no -# This option, when set to yes, allows nodes to serve pubsub shard traffic while -# the cluster is in a down state, as long as it believes it owns the slots. -# -# This is useful if the application would like to use the pubsub feature even when -# the cluster global stable state is not OK. If the application wants to make sure only -# one shard is serving a given channel, this feature should be kept as yes. -# -# cluster-allow-pubsubshard-when-down yes - -# Cluster link send buffer limit is the limit on the memory usage of an individual -# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed -# this limit. This is to primarily prevent send buffers from growing unbounded on links -# toward slow peers (E.g. PubSub messages being piled up). -# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field -# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. -# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single -# PubSub message by default. (client-query-buffer-limit default value is 1gb) -# -# cluster-link-sendbuf-limit 0 - -# Clusters can configure their announced hostname using this config. This is a common use case for -# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based -# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS -# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is -# communicated along the clusterbus to all nodes, setting it to an empty string will remove -# the hostname and also propagate the removal. -# -# cluster-announce-hostname "" - -# Clusters can advertise how clients should connect to them using either their IP address, -# a user defined hostname, or by declaring they have no endpoint. Which endpoint is -# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type -# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how -# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. -# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' -# will be returned instead. -# -# When a cluster advertises itself as having an unknown endpoint, it's indicating that -# the server doesn't know how clients can reach the cluster. This can happen in certain -# networking situations where there are multiple possible routes to the node, and the -# server doesn't know which one the client took. In this case, the server is expecting -# the client to reach out on the same endpoint it used for making the last request, but use -# the port provided in the response. -# -# cluster-preferred-endpoint-type ip - # In order to setup your cluster make sure to read the documentation -# available at https://redis.io web site. +# available at http://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1763,21 +1354,16 @@ aof-timestamp-enabled no # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following four options are used for this scope, and are: +# following two options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port -# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client ports (for connections -# without and with TLS) and cluster message bus port. The information is then -# published in the header of the bus packets so that other nodes will be able to -# correctly map the address of the node publishing the information. -# -# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set -# to zero, then cluster-announce-port refers to the TLS port. Note also that -# cluster-announce-tls-port has no effect if cluster-tls is set to no. +# Each instructs the node about its address, client port, and cluster message +# bus port. The information is then published in the header of the bus packets +# so that other nodes will be able to correctly map the address of the node +# publishing the information. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1790,8 +1376,7 @@ aof-timestamp-enabled no # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-tls-port 6379 -# cluster-announce-port 0 +# cluster-announce-port 6379 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1839,24 +1424,10 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 -################################ LATENCY TRACKING ############################## - -# The Redis extended latency monitoring tracks the per command latencies and enables -# exporting the percentile distribution via the INFO latencystats command, -# and cumulative latency distributions (histograms) via the LATENCY command. -# -# By default, the extended latency monitoring is enabled since the overhead -# of keeping track of the command latency is very small. -# latency-tracking yes - -# By default the exported latency percentiles via the INFO latencystats command -# are the p50, p99, and p999. -# latency-tracking-info-percentiles 50 99 99.9 - ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at https://redis.io/topics/notifications +# This feature is documented at http://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1878,11 +1449,9 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) -# n New key events (Note: not included in the 'A' class) # t Stream commands -# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxetd, so that the "AKE" string means all the events +# A Alias for g$lshzxet, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1905,13 +1474,71 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" +############################### GOPHER SERVER ################################# + +# Redis contains an implementation of the Gopher protocol, as specified in +# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). +# +# The Gopher protocol was very popular in the late '90s. It is an alternative +# to the web, and the implementation both server and client side is so simple +# that the Redis server has just 100 lines of code in order to implement this +# support. +# +# What do you do with Gopher nowadays? Well Gopher never *really* died, and +# lately there is a movement in order for the Gopher more hierarchical content +# composed of just plain text documents to be resurrected. Some want a simpler +# internet, others believe that the mainstream internet became too much +# controlled, and it's cool to create an alternative space for people that +# want a bit of fresh air. +# +# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol +# as a gift. +# +# --- HOW IT WORKS? --- +# +# The Redis Gopher support uses the inline protocol of Redis, and specifically +# two kind of inline requests that were anyway illegal: an empty request +# or any request that starts with "/" (there are no Redis commands starting +# with such a slash). Normal RESP2/RESP3 requests are completely out of the +# path of the Gopher protocol implementation and are served as usual as well. +# +# If you open a connection to Redis when Gopher is enabled and send it +# a string like "/foo", if there is a key named "/foo" it is served via the +# Gopher protocol. +# +# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher +# talking), you likely need a script like the following: +# +# https://github.com/antirez/gopher2redis +# +# --- SECURITY WARNING --- +# +# If you plan to put Redis on the internet in a publicly accessible address +# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. +# Once a password is set: +# +# 1. The Gopher server (when enabled, not by default) will still serve +# content via Gopher. +# 2. However other commands cannot be called before the client will +# authenticate. +# +# So use the 'requirepass' option to protect your instance. +# +# Note that Gopher is not currently supported when 'io-threads-do-reads' +# is enabled. +# +# To enable Gopher support, uncomment the following line and set the option +# from no (the default) to yes. +# +# gopher-enabled no + ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-listpack-entries 512 -hash-max-listpack-value 64 +hash-max-ziplist-entries 512 +hash-max-ziplist-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1926,7 +1553,7 @@ hash-max-listpack-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-listpack-size -2 +list-max-ziplist-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1954,8 +1581,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-listpack-entries 128 -zset-max-listpack-value 64 +zset-max-ziplist-entries 128 +zset-max-ziplist-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1977,7 +1604,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entries limit by setting max-bytes to 0 and max-entries to the desired +# max entires limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -2010,7 +1637,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -2034,13 +1661,6 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # -# Note that it doesn't make sense to set the replica clients output buffer -# limit lower than the repl-backlog-size config (partial sync will succeed -# and then replica will get disconnected). -# Such a configuration is ignored (the size of repl-backlog-size will be used). -# This doesn't have memory consumption implications since the replica client -# will share the backlog buffers memory. -# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -2054,25 +1674,6 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb -# In some scenarios client connections can hog up memory leading to OOM -# errors or data eviction. To avoid this we can cap the accumulated memory -# used by all client connections (all pubsub and normal clients). Once we -# reach that limit connections will be dropped by the server freeing up -# memory. The server will attempt to drop the connections using the most -# memory first. We call this mechanism "client eviction". -# -# Client eviction is configured using the maxmemory-clients setting as follows: -# 0 - client eviction is disabled (default) -# -# A memory value can be used for the client eviction threshold, -# for example: -# maxmemory-clients 1g -# -# A percentage value (between 1% and 100%) means the client eviction threshold -# is based on a percentage of the maxmemory setting. For example to set client -# eviction at 5% of maxmemory: -# maxmemory-clients 5% - # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -2113,13 +1714,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 4 MB of data generated. This is useful +# the file will be fsync-ed every 32 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 4 MB of data generated. This is useful +# the file will be fsync-ed every 32 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -2216,7 +1817,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Active defragmentation is disabled by default +# Enabled active defragmentation # activedefrag no # Minimum amount of fragmentation waste to start active defrag diff --git a/dockge/redis/docker-compose.yml b/dockge/redis/docker-compose.yml index 08fd078c6..cadefa142 100644 --- a/dockge/redis/docker-compose.yml +++ b/dockge/redis/docker-compose.yml @@ -7,7 +7,7 @@ services: else\n redis-server /etc/redis/redis.conf --requirepass ${REDIS_ROOT_PASSWORD}\n\ fi'\n" container_name: redis - image: redis:7.4.4-alpine + image: redis:6.2.18-alpine labels: createdBy: Apps networks: diff --git a/dockge/redis_6_2_18/.env b/dockge/redis_7_4_4/.env similarity index 100% rename from dockge/redis_6_2_18/.env rename to dockge/redis_7_4_4/.env diff --git a/dockge/redis_6_2_18/config/redis.conf b/dockge/redis_7_4_4/config/redis.conf similarity index 72% rename from dockge/redis_6_2_18/config/redis.conf rename to dockge/redis_7_4_4/config/redis.conf index ca22ec9f6..8795ae291 100644 --- a/dockge/redis_6_2_18/config/redis.conf +++ b/dockge/redis_7_4_4/config/redis.conf @@ -32,8 +32,17 @@ # If instead you are interested in using includes to override configuration # options, it is better to use include as the last line. # +# Included paths may contain wildcards. All files matching the wildcards will +# be included in alphabetical order. +# Note that if an include path contains a wildcards but no files match it when +# the server is started, the include statement will be ignored and no error will +# be emitted. It is safe, therefore, to include wildcard files from empty +# directories. +# # include /path/to/local.conf # include /path/to/other.conf +# include /path/to/fragments/*.conf +# ################################## MODULES ##################################### @@ -49,43 +58,81 @@ # for connections from all available network interfaces on the host machine. # It is possible to listen to just one or multiple selected interfaces using # the "bind" configuration directive, followed by one or more IP addresses. +# Each address can be prefixed by "-", which means that redis will not fail to +# start if the address is not available. Being not available only refers to +# addresses that does not correspond to any network interface. Addresses that +# are already in use will always fail, and unsupported protocols will always BE +# silently skipped. # # Examples: # -# bind 192.168.1.100 10.0.0.1 -# bind 127.0.0.1 ::1 +# bind 192.168.1.100 10.0.0.1 # listens on two specific IPv4 addresses +# bind 127.0.0.1 ::1 # listens on loopback IPv4 and IPv6 +# bind * -::* # like the default, all available interfaces # # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the # internet, binding to all the interfaces is dangerous and will expose the # instance to everybody on the internet. So by default we uncomment the # following bind directive, that will force Redis to listen only on the -# IPv4 loopback interface address (this means Redis will only be able to -# accept client connections from the same host that it is running on). +# IPv4 and IPv6 (if available) loopback interface addresses (this means Redis +# will only be able to accept client connections from the same host that it is +# running on). # # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES -# JUST COMMENT OUT THE FOLLOWING LINE. +# COMMENT OUT THE FOLLOWING LINE. +# +# You will also need to set a password unless you explicitly disable protected +# mode. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bind 0.0.0.0 +# By default, outgoing connections (from replica to master, from Sentinel to +# instances, cluster bus, etc.) are not bound to a specific local address. In +# most cases, this means the operating system will handle that based on routing +# and the interface through which the connection goes out. +# +# Using bind-source-addr it is possible to configure a specific address to bind +# to, which may also affect how the connection gets routed. +# +# Example: +# +# bind-source-addr 10.0.0.1 + # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. # -# When protected mode is on and if: -# -# 1) The server is not binding explicitly to a set of addresses using the -# "bind" directive. -# 2) No password is configured. -# -# The server only accepts connections from clients connecting from the -# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain -# sockets. +# When protected mode is on and the default user has no password, the server +# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address +# (::1) or Unix domain sockets. # # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis -# even if no authentication is configured, nor a specific set of interfaces -# are explicitly listed using the "bind" directive. +# even if no authentication is configured. protected-mode yes +# Redis uses default hardened security configuration directives to reduce the +# attack surface on innocent users. Therefore, several sensitive configuration +# directives are immutable, and some potentially-dangerous commands are blocked. +# +# Configuration directives that control files that Redis writes to (e.g., 'dir' +# and 'dbfilename') and that aren't usually modified during runtime +# are protected by making them immutable. +# +# Commands that can increase the attack surface of Redis and that aren't usually +# called by users are blocked by default. +# +# These can be exposed to either all connections or just local ones by setting +# each of the configs listed below to either of these values: +# +# no - Block for any connection (remain immutable) +# yes - Allow for any connection (no protection) +# local - Allow only for local connections. Ones originating from the +# IPv4 address (127.0.0.1), IPv6 address (::1) or Unix domain sockets. +# +# enable-protected-configs no +# enable-debug-command no +# enable-module-command no + # Accept connections on the specified port, default is 6379 (IANA #815344). # If port 0 is specified Redis will not listen on a TCP socket. port 6379 @@ -105,7 +152,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # -# unixsocket /tmp/redis.sock +# unixsocket /run/redis.sock # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) @@ -128,6 +175,16 @@ timeout 0 # Redis default starting with Redis 3.2.1. tcp-keepalive 300 +# Apply OS-specific mechanism to mark the listening socket with the specified +# ID, to support advanced routing and filtering capabilities. +# +# On Linux, the ID represents a connection mark. +# On FreeBSD, the ID represents a socket cookie ID. +# On OpenBSD, the ID represents a route table ID. +# +# The default value is 0, which implies no marking is required. +# socket-mark-id 0 + ################################# TLS/SSL ##################################### # By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration @@ -143,8 +200,32 @@ tcp-keepalive 300 # # tls-cert-file redis.crt # tls-key-file redis.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-key-file-pass secret -# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: +# Normally Redis uses the same certificate for both server functions (accepting +# connections) and client functions (replicating from a master, establishing +# cluster bus connections, etc.). +# +# Sometimes certificates are issued with attributes that designate them as +# client-only or server-only certificates. In that case it may be desired to use +# different certificates for incoming (server) and outgoing (client) +# connections. To do that, use the following directives: +# +# tls-client-cert-file client.crt +# tls-client-key-file client.key +# +# If the key file is encrypted using a passphrase, it can be included here +# as well. +# +# tls-client-key-file-pass secret + +# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange, +# required by older versions of OpenSSL (<3.0). Newer versions do not require +# this configuration and recommend against it. # # tls-dh-params-file redis.dh @@ -177,9 +258,12 @@ tcp-keepalive 300 # # tls-cluster yes -# Explicitly specify TLS versions to support. Allowed values are case insensitive -# and include "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" (OpenSSL >= 1.1.1) or -# any combination. To enable only TLSv1.2 and TLSv1.3, use: +# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended +# that older formally deprecated versions are kept disabled to reduce the attack surface. +# You can explicitly specify TLS versions to support. +# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", +# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. +# To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -221,6 +305,7 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. +# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -229,11 +314,17 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET +# on startup, and updating Redis status on a regular +# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -supervised no +# +# The default is "no". To run under upstart/systemd, you can simply uncomment +# the line below: +# +# supervised auto # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -244,6 +335,9 @@ supervised no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. +# +# Note that on modern Linux systems "/run/redis.pid" is more conforming +# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -269,44 +363,74 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 +# To disable the built in crash log, which will possibly produce cleaner core +# dumps when they are needed, uncomment the following: +# +# crash-log-enabled no + +# To disable the fast memory check that's run as part of the crash log, which +# will possibly let redis terminate sooner, uncomment the following: +# +# crash-memcheck-enabled no + # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY. Basically this means -# that normally a logo is displayed only in interactive sessions. +# standard output and if the standard output is a TTY and syslog logging is +# disabled. Basically this means that normally a logo is displayed only in +# interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo yes +always-show-logo no + +# By default, Redis modifies the process title (as seen in 'top' and 'ps') to +# provide some runtime information. It is possible to disable this and leave +# the process name as executed by setting the following to no. +set-proc-title yes + +# When changing the process title, Redis uses the following template to construct +# the modified title. +# +# Template variables are specified in curly brackets. The following variables are +# supported: +# +# {title} Name of process as executed if parent, or type of child process. +# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or +# Unix socket if only that's available. +# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". +# {port} TCP port listening on, or 0. +# {tls-port} TLS port listening on, or 0. +# {unixsocket} Unix domain socket listening on, or "". +# {config-file} Name of configuration file used. +# +proc-title-template "{title} {listen-addr} {server-mode}" ################################ SNAPSHOTTING ################################ -# -# Save the DB on disk: -# -# save -# -# Will save the DB if both the given number of seconds and the given -# number of write operations against the DB occurred. -# -# In the example below the behavior will be to save: -# after 900 sec (15 min) if at least 1 key changed -# after 300 sec (5 min) if at least 10 keys changed -# after 60 sec if at least 10000 keys changed -# -# Note: you can disable saving completely by commenting out all "save" lines. -# -# It is also possible to remove all the previously configured save -# points by adding a save directive with a single empty string argument -# like in the following example: -# -# save "" -save 900 1 -save 300 10 -save 60 10000 +# Save the DB to disk. +# +# save [ ...] +# +# Redis will save the DB if the given number of seconds elapsed and it +# surpassed the given number of write operations against the DB. +# +# Snapshotting can be completely disabled with a single empty string argument +# as in following example: +# +# save "" +# +# Unless specified otherwise, by default Redis will save the DB: +# * After 3600 seconds (an hour) if at least 1 change was performed +# * After 300 seconds (5 minutes) if at least 100 changes were performed +# * After 60 seconds if at least 10000 changes were performed +# +# You can set these explicitly by uncommenting the following line. +# +# save 3600 1 300 100 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -338,6 +462,21 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes +# Enables or disables full sanitization checks for ziplist and listpack etc when +# loading an RDB or RESTORE payload. This reduces the chances of a assertion or +# crash later on while processing commands. +# Options: +# no - Never perform full sanitization +# yes - Always perform full sanitization +# clients - Perform full sanitization only for user connections. +# Excludes: RDB files, RESTORE commands received from the master +# connection, and client connections which have the +# skip-sanitize-payload ACL flag. +# The default should be 'clients' but since it currently affects cluster +# resharding via MIGRATE, it is temporarily set to 'no' by default. +# +# sanitize-dump-payload no + # The filename where to dump the DB dbfilename dump.rdb @@ -412,9 +551,10 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with -# an error "SYNC with master in progress" to all commands except: -# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error +# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" +# to all data access commands, excluding commands such as: +# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -463,7 +603,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync no +repl-diskless-sync yes # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -477,12 +617,18 @@ repl-diskless-sync no # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 +# When diskless replication is enabled with a delay, it is possible to let +# the replication start before the maximum delay is reached if the maximum +# number of replicas expected have connected. Default of 0 means that the +# maximum is not defined and Redis will wait the full delay. +repl-diskless-sync-max-replicas 0 + # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if your do what you are doing. +# stage with the master. Use only if you know what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -491,19 +637,23 @@ repl-diskless-sync-delay 5 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and salve buffers). +# Copy on Write memory and replica buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep a copy of the current db contents in RAM while parsing -# the data directly from the socket. note that this requires -# sufficient memory, if you don't have it, you risk an OOM kill. +# "swapdb" - Keep current db contents in RAM while parsing the data directly +# from the socket. Replicas in this mode can keep serving current +# data set while replication is in progress, except for cases where +# they can't recognize master as having a data set from same +# replication history. +# Note that this requires sufficient memory, if you don't have it, +# you risk an OOM kill. repl-diskless-load disabled -# Replicas send PINGs to server in a predefined interval. It's possible to +# Master send PINGs to its replicas in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -578,6 +728,43 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 +# The propagation error behavior controls how Redis will behave when it is +# unable to handle a command being processed in the replication stream from a master +# or processed while reading from an AOF file. Errors that occur during propagation +# are unexpected, and can cause data inconsistency. However, there are edge cases +# in earlier versions of Redis where it was possible for the server to replicate or persist +# commands that would fail on future versions. For this reason the default behavior +# is to ignore such errors and continue processing commands. +# +# If an application wants to ensure there is no data divergence, this configuration +# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' +# to only panic when a replica encounters an error on the replication stream. One of +# these two panic values will become the default value in the future once there are +# sufficient safety mechanisms in place to prevent false positive crashes. +# +# propagation-error-behavior ignore + +# Replica ignore disk write errors controls the behavior of a replica when it is +# unable to persist a write command received from its master to disk. By default, +# this configuration is set to 'no' and will crash the replica in this condition. +# It is not recommended to change this default, however in order to be compatible +# with older versions of Redis this config can be toggled to 'yes' which will just +# log a warning and execute the write command it got from the master. +# +# replica-ignore-disk-write-errors no + +# ----------------------------------------------------------------------------- +# By default, Redis Sentinel includes all replicas in its reports. A replica +# can be excluded from Redis Sentinel's announcements. An unannounced replica +# will be ignored by the 'sentinel replicas ' command and won't be +# exposed to Redis Sentinel's clients. +# +# This option does not change the behavior of replica-priority. Even with +# replica-announced set to 'no', the replica can be promoted to master. To +# prevent this behavior, set replica-priority to 0. +# +# replica-announced yes + # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -633,7 +820,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# 16 millions of slots, what clients may have certain subsets of keys. In turn +# a radix key indexed by key name, what clients have which keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -697,8 +884,12 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# + Allow the execution of that command -# - Disallow the execution of that command +# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. +# sanitize-payload RESTORE dump-payload is sanitized (default). +# + Allow the execution of that command. +# May be used with `|` for allowing subcommands (e.g "+config|get") +# - Disallow the execution of that command. +# May be used with `|` for blocking subcommands (e.g "-config|set") # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -706,10 +897,11 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|subcommand Allow a specific subcommand of an otherwise -# disabled command. Note that this form is not -# allowed as negative like -DEBUG|SEGFAULT, but -# only additive starting with "+". +# +|first-arg Allow a specific first argument of an otherwise +# disabled command. It is only supported on commands with +# no sub-commands, and is not allowed as negative form +# like -SELECT|1, only additive starting with "+". This +# feature is deprecated and may be removed in the future. # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -717,8 +909,17 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. +# %R~ Add key read pattern that specifies which keys can be read +# from. +# %W~ Add key write pattern that specifies which keys can be +# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. +# & Add a glob-style pattern of Pub/Sub channels that can be +# accessed by the user. It is possible to specify multiple channel +# patterns. +# allchannels Alias for &* +# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -737,6 +938,14 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. +# () Create a new selector with the options specified within the +# parentheses and attach it to the user. Each option should be +# space separated. The first character must be ( and the last +# character must be ). +# clearselectors Remove all of the currently attached selectors. +# Note this does not change the "root" user permissions, +# which are the permissions directly applied onto the +# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -758,6 +967,40 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # +# The following is a list of command categories and their meanings: +# * keyspace - Writing or reading from keys, databases, or their metadata +# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, +# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, +# key or metadata will also have `write` category. Commands that only read +# the keyspace, key or metadata will have the `read` category. +# * read - Reading from keys (values or metadata). Note that commands that don't +# interact with keys, will not have either `read` or `write`. +# * write - Writing to keys (values or metadata) +# * admin - Administrative commands. Normal applications will never need to use +# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. +# * dangerous - Potentially dangerous (each should be considered with care for +# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, +# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. +# * connection - Commands affecting the connection or other connections. +# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. +# * blocking - Potentially blocking the connection until released by another +# command. +# * fast - Fast O(1) commands. May loop on the number of arguments, but not the +# number of elements in the key. +# * slow - All commands that are not Fast. +# * pubsub - PUBLISH / SUBSCRIBE related +# * transaction - WATCH / MULTI / EXEC related commands. +# * scripting - Scripting related. +# * set - Data type: sets related. +# * sortedset - Data type: zsets related. +# * list - Data type: lists related. +# * hash - Data type: hashes related. +# * string - Data type: strings related. +# * bitmap - Data type: bitmaps related. +# * hyperloglog - Data type: hyperloglog related. +# * geo - Data type: geo related. +# * stream - Data type: streams related. +# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -787,8 +1030,24 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # +# The requirepass is not compatible with aclfile option and the ACL LOAD +# command, these will cause requirepass to be ignored. +# # requirepass foobared +# New users are initialized with restrictive permissions by default, via the +# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it +# is possible to manage access to Pub/Sub channels with ACL rules as well. The +# default Pub/Sub channels permission if new users is controlled by the +# acl-pubsub-default configuration directive, which accepts one of these values: +# +# allchannels: grants access to all Pub/Sub channels +# resetchannels: revokes access to all Pub/Sub channels +# +# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. +# +# acl-pubsub-default resetchannels + # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -877,14 +1136,12 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, Redis will return an error on write -# operations, when there are no suitable keys for eviction. -# -# At the date of writing these commands are: set setnx setex append -# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd -# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby -# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby -# getset mset msetnx exec sort +# Note: with any of the above policies, when there are no suitable keys for +# eviction, Redis will return an error on write operations that require +# more memory. These are usually commands that create new keys, add data or +# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, +# SORT (due to the STORE argument), and EXEC (if the transaction includes any +# command that requires memory). # # The default is: # @@ -901,6 +1158,14 @@ acllog-max-len 128 # # maxmemory-samples 5 +# Eviction processing is designed to function well with the default setting. +# If there is an unusually large amount of write traffic, this value may need to +# be increased. Decreasing this value may reduce latency at the risk of +# eviction processing effectiveness +# 0 = minimum latency, 10 = default, 100 = process without regard to latency +# +# maxmemory-eviction-tenacity 10 + # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -994,6 +1259,13 @@ replica-lazy-flush no lazyfree-lazy-user-del no +# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous +# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the +# commands. When neither flag is passed, this directive will be used to determine +# if the data should be deleted asynchronously. + +lazyfree-lazy-user-flush no + ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1032,7 +1304,7 @@ lazyfree-lazy-user-del no # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Aso this feature currently does not work when SSL is +# CONFIG SET. Also, this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1050,7 +1322,7 @@ lazyfree-lazy-user-del no # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports three options: +# Redis supports these options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1071,6 +1343,19 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 + +#################### KERNEL transparent hugepage CONTROL ###################### + +# Usually the kernel Transparent Huge Pages control is set to "madvise" or +# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which +# case this config has no effect. On systems in which it is set to "always", +# redis will attempt to disable it specifically for the redis process in order +# to avoid latency problems specifically with fork(2) and CoW. +# If for some reason you prefer to keep it enabled, you can set this config to +# "no" and the kernel global to "always". + +disable-thp yes + ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1089,14 +1374,43 @@ oom-score-adj-values 0 200 800 # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check http://redis.io/topics/persistence for more information. +# Please check https://redis.io/topics/persistence for more information. appendonly no -# The name of the append only file (default: "appendonly.aof") +# The base name of the append only file. +# +# Redis 7 and newer use a set of append-only files to persist the dataset +# and changes applied to it. There are two basic types of files in use: +# +# - Base files, which are a snapshot representing the complete state of the +# dataset at the time the file was created. Base files can be either in +# the form of RDB (binary serialized) or AOF (textual commands). +# - Incremental files, which contain additional commands that were applied +# to the dataset following the previous file. +# +# In addition, manifest files are used to track the files and the order in +# which they were created and should be applied. +# +# Append-only file names are created by Redis following a specific pattern. +# The file name's prefix is based on the 'appendfilename' configuration +# parameter, followed by additional information about the sequence and type. +# +# For example, if appendfilename is set to appendonly.aof, the following file +# names could be derived: +# +# - appendonly.aof.1.base.rdb as a base file. +# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. +# - appendonly.aof.manifest as a manifest file. appendfilename "appendonly.aof" +# For convenience, Redis stores all persistent append-only files in a dedicated +# directory. The name of the directory is determined by the appenddirname +# configuration parameter. + +appenddirname "appendonlydir" + # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1136,7 +1450,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync none". In practical terms, this means that it is +# the same as "appendfsync no". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1189,34 +1503,69 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# When rewriting the AOF file, Redis is able to use an RDB preamble in the -# AOF file for faster rewrites and recoveries. When this option is turned -# on the rewritten AOF file is composed of two different stanzas: -# -# [RDB file][AOF tail] -# -# When loading, Redis recognizes that the AOF file starts with the "REDIS" -# string and loads the prefixed RDB file, then continues loading the AOF -# tail. +# Redis can create append-only base files in either RDB or AOF formats. Using +# the RDB format is always faster and more efficient, and disabling it is only +# supported for backward compatibility purposes. aof-use-rdb-preamble yes -################################ LUA SCRIPTING ############################### +# Redis supports recording timestamp annotations in the AOF to support restoring +# the data from a specific point-in-time. However, using this capability changes +# the AOF format in a way that may not be compatible with existing AOF parsers. +aof-timestamp-enabled no -# Max execution time of a Lua script in milliseconds. +################################ SHUTDOWN ##################################### + +# Maximum time to wait for replicas when shutting down, in seconds. # -# If the maximum execution time is reached Redis will log that a script is -# still in execution after the maximum allowed time and will start to -# reply to queries with an error. +# During shut down, a grace period allows any lagging replicas to catch up with +# the latest replication offset before the master exists. This period can +# prevent data loss, especially for deployments without configured disk backups. # -# When a long running script exceeds the maximum execution time only the -# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be -# used to stop a script that did not yet call any write commands. The second -# is the only way to shut down the server in the case a write command was -# already issued by the script but the user doesn't want to wait for the natural -# termination of the script. +# The 'shutdown-timeout' value is the grace period's duration in seconds. It is +# only applicable when the instance has replicas. To disable the feature, set +# the value to 0. # -# Set it to 0 or a negative value for unlimited execution without warnings. -lua-time-limit 5000 +# shutdown-timeout 10 + +# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default +# an RDB snapshot is written to disk in a blocking operation if save points are configured. +# The options used on signaled shutdown can include the following values: +# default: Saves RDB snapshot only if save points are configured. +# Waits for lagging replicas to catch up. +# save: Forces a DB saving operation even if no save points are configured. +# nosave: Prevents DB saving operation even if one or more save points are configured. +# now: Skips waiting for lagging replicas. +# force: Ignores any errors that would normally prevent the server from exiting. +# +# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. +# Example: "nosave force now" +# +# shutdown-on-sigint default +# shutdown-on-sigterm default + +################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### + +# Maximum time in milliseconds for EVAL scripts, functions and in some cases +# modules' commands before Redis can start processing or rejecting other clients. +# +# If the maximum execution time is reached Redis will start to reply to most +# commands with a BUSY error. +# +# In this state Redis will only allow a handful of commands to be executed. +# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some +# module specific 'allow-busy' commands. +# +# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not +# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop +# the server in the case a write command was already issued by the script when +# the user doesn't want to wait for the natural termination of the script. +# +# The default is 5 seconds. It is possible to set it to 0 or a negative value +# to disable this mechanism (uninterrupted execution). Note that in the past +# this config had a different name, which is now an alias, so both of these do +# the same: +# lua-time-limit 5000 +# busy-reply-threshold 5000 ################################ REDIS CLUSTER ############################### @@ -1240,6 +1589,11 @@ lua-time-limit 5000 # # cluster-node-timeout 15000 +# The cluster port is the port that the cluster bus will listen for inbound connections on. When set +# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires +# you to specify the cluster bus port when executing cluster meet. +# cluster-port 0 + # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1298,12 +1652,21 @@ lua-time-limit 5000 # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value. +# one replica). To disable migration just set it to a very large value or +# set cluster-allow-replica-migration to 'no'. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 +# Turning off this option allows to use less automatic cluster configuration. +# It both disables migration to orphaned masters and migration from masters +# that became empty. +# +# Default is 'yes' (allow automatic migrations). +# +# cluster-allow-replica-migration yes + # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1318,7 +1681,7 @@ lua-time-limit 5000 # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the master can still perform a +# master during master failures. However the replica can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1328,7 +1691,7 @@ lua-time-limit 5000 # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# the cluster is in a down state, as long as it believes it owns the slots. +# cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1343,8 +1706,54 @@ lua-time-limit 5000 # # cluster-allow-reads-when-down no +# This option, when set to yes, allows nodes to serve pubsub shard traffic while +# the cluster is in a down state, as long as it believes it owns the slots. +# +# This is useful if the application would like to use the pubsub feature even when +# the cluster global stable state is not OK. If the application wants to make sure only +# one shard is serving a given channel, this feature should be kept as yes. +# +# cluster-allow-pubsubshard-when-down yes + +# Cluster link send buffer limit is the limit on the memory usage of an individual +# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed +# this limit. This is to primarily prevent send buffers from growing unbounded on links +# toward slow peers (E.g. PubSub messages being piled up). +# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field +# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. +# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single +# PubSub message by default. (client-query-buffer-limit default value is 1gb) +# +# cluster-link-sendbuf-limit 0 + +# Clusters can configure their announced hostname using this config. This is a common use case for +# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based +# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS +# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is +# communicated along the clusterbus to all nodes, setting it to an empty string will remove +# the hostname and also propagate the removal. +# +# cluster-announce-hostname "" + +# Clusters can advertise how clients should connect to them using either their IP address, +# a user defined hostname, or by declaring they have no endpoint. Which endpoint is +# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type +# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how +# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. +# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' +# will be returned instead. +# +# When a cluster advertises itself as having an unknown endpoint, it's indicating that +# the server doesn't know how clients can reach the cluster. This can happen in certain +# networking situations where there are multiple possible routes to the node, and the +# server doesn't know which one the client took. In this case, the server is expecting +# the client to reach out on the same endpoint it used for making the last request, but use +# the port provided in the response. +# +# cluster-preferred-endpoint-type ip + # In order to setup your cluster make sure to read the documentation -# available at http://redis.io web site. +# available at https://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1354,16 +1763,21 @@ lua-time-limit 5000 # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following two options are used for this scope, and are: +# following four options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port +# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client port, and cluster message -# bus port. The information is then published in the header of the bus packets -# so that other nodes will be able to correctly map the address of the node -# publishing the information. +# Each instructs the node about its address, client ports (for connections +# without and with TLS) and cluster message bus port. The information is then +# published in the header of the bus packets so that other nodes will be able to +# correctly map the address of the node publishing the information. +# +# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set +# to zero, then cluster-announce-port refers to the TLS port. Note also that +# cluster-announce-tls-port has no effect if cluster-tls is set to no. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1376,7 +1790,8 @@ lua-time-limit 5000 # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-port 6379 +# cluster-announce-tls-port 6379 +# cluster-announce-port 0 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1424,10 +1839,24 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 +################################ LATENCY TRACKING ############################## + +# The Redis extended latency monitoring tracks the per command latencies and enables +# exporting the percentile distribution via the INFO latencystats command, +# and cumulative latency distributions (histograms) via the LATENCY command. +# +# By default, the extended latency monitoring is enabled since the overhead +# of keeping track of the command latency is very small. +# latency-tracking yes + +# By default the exported latency percentiles via the INFO latencystats command +# are the p50, p99, and p999. +# latency-tracking-info-percentiles 50 99 99.9 + ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at http://redis.io/topics/notifications +# This feature is documented at https://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1449,9 +1878,11 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) +# n New key events (Note: not included in the 'A' class) # t Stream commands +# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxet, so that the "AKE" string means all the events +# A Alias for g$lshzxetd, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1474,71 +1905,13 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" -############################### GOPHER SERVER ################################# - -# Redis contains an implementation of the Gopher protocol, as specified in -# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). -# -# The Gopher protocol was very popular in the late '90s. It is an alternative -# to the web, and the implementation both server and client side is so simple -# that the Redis server has just 100 lines of code in order to implement this -# support. -# -# What do you do with Gopher nowadays? Well Gopher never *really* died, and -# lately there is a movement in order for the Gopher more hierarchical content -# composed of just plain text documents to be resurrected. Some want a simpler -# internet, others believe that the mainstream internet became too much -# controlled, and it's cool to create an alternative space for people that -# want a bit of fresh air. -# -# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol -# as a gift. -# -# --- HOW IT WORKS? --- -# -# The Redis Gopher support uses the inline protocol of Redis, and specifically -# two kind of inline requests that were anyway illegal: an empty request -# or any request that starts with "/" (there are no Redis commands starting -# with such a slash). Normal RESP2/RESP3 requests are completely out of the -# path of the Gopher protocol implementation and are served as usual as well. -# -# If you open a connection to Redis when Gopher is enabled and send it -# a string like "/foo", if there is a key named "/foo" it is served via the -# Gopher protocol. -# -# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher -# talking), you likely need a script like the following: -# -# https://github.com/antirez/gopher2redis -# -# --- SECURITY WARNING --- -# -# If you plan to put Redis on the internet in a publicly accessible address -# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. -# Once a password is set: -# -# 1. The Gopher server (when enabled, not by default) will still serve -# content via Gopher. -# 2. However other commands cannot be called before the client will -# authenticate. -# -# So use the 'requirepass' option to protect your instance. -# -# Note that Gopher is not currently supported when 'io-threads-do-reads' -# is enabled. -# -# To enable Gopher support, uncomment the following line and set the option -# from no (the default) to yes. -# -# gopher-enabled no - ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-ziplist-entries 512 -hash-max-ziplist-value 64 +hash-max-listpack-entries 512 +hash-max-listpack-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1553,7 +1926,7 @@ hash-max-ziplist-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-ziplist-size -2 +list-max-listpack-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1581,8 +1954,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-ziplist-entries 128 -zset-max-ziplist-value 64 +zset-max-listpack-entries 128 +zset-max-listpack-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1604,7 +1977,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entires limit by setting max-bytes to 0 and max-entries to the desired +# max entries limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -1637,7 +2010,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -1661,6 +2034,13 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # +# Note that it doesn't make sense to set the replica clients output buffer +# limit lower than the repl-backlog-size config (partial sync will succeed +# and then replica will get disconnected). +# Such a configuration is ignored (the size of repl-backlog-size will be used). +# This doesn't have memory consumption implications since the replica client +# will share the backlog buffers memory. +# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -1674,6 +2054,25 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb +# In some scenarios client connections can hog up memory leading to OOM +# errors or data eviction. To avoid this we can cap the accumulated memory +# used by all client connections (all pubsub and normal clients). Once we +# reach that limit connections will be dropped by the server freeing up +# memory. The server will attempt to drop the connections using the most +# memory first. We call this mechanism "client eviction". +# +# Client eviction is configured using the maxmemory-clients setting as follows: +# 0 - client eviction is disabled (default) +# +# A memory value can be used for the client eviction threshold, +# for example: +# maxmemory-clients 1g +# +# A percentage value (between 1% and 100%) means the client eviction threshold +# is based on a percentage of the maxmemory setting. For example to set client +# eviction at 5% of maxmemory: +# maxmemory-clients 5% + # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -1714,13 +2113,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -1817,7 +2216,7 @@ rdb-save-incremental-fsync yes # defragmentation process. If you are not sure about what they mean it is # a good idea to leave the defaults untouched. -# Enabled active defragmentation +# Active defragmentation is disabled by default # activedefrag no # Minimum amount of fragmentation waste to start active defrag diff --git a/dockge/redis_6_2_18/docker-compose.yml b/dockge/redis_7_4_4/docker-compose.yml similarity index 94% rename from dockge/redis_6_2_18/docker-compose.yml rename to dockge/redis_7_4_4/docker-compose.yml index cadefa142..08fd078c6 100644 --- a/dockge/redis_6_2_18/docker-compose.yml +++ b/dockge/redis_7_4_4/docker-compose.yml @@ -7,7 +7,7 @@ services: else\n redis-server /etc/redis/redis.conf --requirepass ${REDIS_ROOT_PASSWORD}\n\ fi'\n" container_name: redis - image: redis:6.2.18-alpine + image: redis:7.4.4-alpine labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_1_23_16/envs/default.env b/dockge/redis_7_4_4/envs/default.env similarity index 100% rename from dockge/uptime-kuma_1_23_16/envs/default.env rename to dockge/redis_7_4_4/envs/default.env diff --git a/dockge/uptime-kuma_1_23_16/envs/global.env b/dockge/redis_7_4_4/envs/global.env similarity index 100% rename from dockge/uptime-kuma_1_23_16/envs/global.env rename to dockge/redis_7_4_4/envs/global.env diff --git a/dockge/rsshub/docker-compose.yml b/dockge/rsshub/docker-compose.yml index 750c7ddc4..61335eeed 100644 --- a/dockge/rsshub/docker-compose.yml +++ b/dockge/rsshub/docker-compose.yml @@ -57,7 +57,7 @@ services: - -f - http://localhost:1200/healthz?key=${ACCESS_KEY} timeout: 10s - image: diygod/rsshub:2025-06-24 + image: diygod/rsshub:2025-06-27 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec/docker-compose.yml b/dockge/stream-rec/docker-compose.yml index 4076f23a1..8465b7136 100644 --- a/dockge/stream-rec/docker-compose.yml +++ b/dockge/stream-rec/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:main + image: streamrec/stream-rec:dev labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:main + image: streamrec/stream-rec-front:dev labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_dev/.env b/dockge/stream-rec_main/.env similarity index 100% rename from dockge/stream-rec_dev/.env rename to dockge/stream-rec_main/.env diff --git a/dockge/stream-rec_dev/docker-compose.yml b/dockge/stream-rec_main/docker-compose.yml similarity index 92% rename from dockge/stream-rec_dev/docker-compose.yml rename to dockge/stream-rec_main/docker-compose.yml index 8465b7136..4076f23a1 100644 --- a/dockge/stream-rec_dev/docker-compose.yml +++ b/dockge/stream-rec_main/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:dev + image: streamrec/stream-rec:main labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:dev + image: streamrec/stream-rec-front:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_main/envs/default.env b/dockge/stream-rec_main/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/stream-rec_main/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/stream-rec_main/envs/global.env b/dockge/stream-rec_main/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/stream-rec_main/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/super-productivity/docker-compose.yml b/dockge/super-productivity/docker-compose.yml index 8685ed11b..d6933b541 100644 --- a/dockge/super-productivity/docker-compose.yml +++ b/dockge/super-productivity/docker-compose.yml @@ -21,7 +21,7 @@ services: environment: - TZ=Asia/Shanghai - WEBDAV_BACKEND=http://sp-webdav - image: johannesjo/super-productivity:v13.1.2 + image: johannesjo/super-productivity:v13.1.5 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql/docker-compose.yml b/dockge/umami-mysql/docker-compose.yml index 2bc7a13bc..0347d07c0 100644 --- a/dockge/umami-mysql/docker-compose.yml +++ b/dockge/umami-mysql/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:mysql-v2.16.0 + image: umamisoftware/umami:mysql-v2.18.1 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_18_1/.env b/dockge/umami-mysql_2_16_0/.env similarity index 100% rename from dockge/umami-mysql_2_18_1/.env rename to dockge/umami-mysql_2_16_0/.env diff --git a/dockge/umami-mysql_2_18_1/docker-compose.yml b/dockge/umami-mysql_2_16_0/docker-compose.yml similarity index 91% rename from dockge/umami-mysql_2_18_1/docker-compose.yml rename to dockge/umami-mysql_2_16_0/docker-compose.yml index 0347d07c0..2bc7a13bc 100644 --- a/dockge/umami-mysql_2_18_1/docker-compose.yml +++ b/dockge/umami-mysql_2_16_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:mysql-v2.18.1 + image: umamisoftware/umami:mysql-v2.16.0 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_16_0/envs/default.env b/dockge/umami-mysql_2_16_0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/umami-mysql_2_16_0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/umami-mysql_2_16_0/envs/global.env b/dockge/umami-mysql_2_16_0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/umami-mysql_2_16_0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/umami/docker-compose.yml b/dockge/umami/docker-compose.yml index 7f7a58660..9bbf23909 100644 --- a/dockge/umami/docker-compose.yml +++ b/dockge/umami/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:postgresql-v2.16.0 + image: umamisoftware/umami:postgresql-v2.18.1 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_18_1/.env b/dockge/umami_2_16_0/.env similarity index 100% rename from dockge/umami_2_18_1/.env rename to dockge/umami_2_16_0/.env diff --git a/dockge/umami_2_18_1/docker-compose.yml b/dockge/umami_2_16_0/docker-compose.yml similarity index 90% rename from dockge/umami_2_18_1/docker-compose.yml rename to dockge/umami_2_16_0/docker-compose.yml index 9bbf23909..7f7a58660 100644 --- a/dockge/umami_2_18_1/docker-compose.yml +++ b/dockge/umami_2_16_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:postgresql-v2.18.1 + image: umamisoftware/umami:postgresql-v2.16.0 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_16_0/envs/default.env b/dockge/umami_2_16_0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/umami_2_16_0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/umami_2_16_0/envs/global.env b/dockge/umami_2_16_0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/umami_2_16_0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/uptime-kuma/.env b/dockge/uptime-kuma/.env index 32a291fcd..5fa74c158 100644 --- a/dockge/uptime-kuma/.env +++ b/dockge/uptime-kuma/.env @@ -4,3 +4,9 @@ UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3001 +# Cloudflared 隧道令牌 +UPTIME_KUMA_CLOUDFLARED_TOKEN= + +# 禁用 Frame SameOrigin [必填] +UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false + diff --git a/dockge/uptime-kuma/docker-compose.yml b/dockge/uptime-kuma/docker-compose.yml index c6ee97339..03b4560f7 100644 --- a/dockge/uptime-kuma/docker-compose.yml +++ b/dockge/uptime-kuma/docker-compose.yml @@ -7,7 +7,16 @@ services: env_file: - ./envs/global.env - .env - image: louislam/uptime-kuma:2.0.0-beta.3 + environment: + - PUID=0 + - PGID=0 + - UPTIME_KUMA_PORT=3001 + - UPTIME_KUMA_HOST=0.0.0.0 + - DATA_DIR=/app/data + - NODE_TLS_REJECT_UNAUTHORIZED=0 + - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 + - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like + image: louislam/uptime-kuma:1.23.16 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_1_23_16/.env b/dockge/uptime-kuma_1_23_16/.env deleted file mode 100644 index 5fa74c158..000000000 --- a/dockge/uptime-kuma_1_23_16/.env +++ /dev/null @@ -1,12 +0,0 @@ -# 数据持久化路径 [必填] -UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3001 - -# Cloudflared 隧道令牌 -UPTIME_KUMA_CLOUDFLARED_TOKEN= - -# 禁用 Frame SameOrigin [必填] -UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false - diff --git a/dockge/uptime-kuma_2_0_0/.env b/dockge/uptime-kuma_2_0_0/.env new file mode 100644 index 000000000..32a291fcd --- /dev/null +++ b/dockge/uptime-kuma_2_0_0/.env @@ -0,0 +1,6 @@ +# 数据持久化路径 [必填] +UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3001 + diff --git a/dockge/uptime-kuma_1_23_16/docker-compose.yml b/dockge/uptime-kuma_2_0_0/docker-compose.yml similarity index 57% rename from dockge/uptime-kuma_1_23_16/docker-compose.yml rename to dockge/uptime-kuma_2_0_0/docker-compose.yml index 03b4560f7..c6ee97339 100644 --- a/dockge/uptime-kuma_1_23_16/docker-compose.yml +++ b/dockge/uptime-kuma_2_0_0/docker-compose.yml @@ -7,16 +7,7 @@ services: env_file: - ./envs/global.env - .env - environment: - - PUID=0 - - PGID=0 - - UPTIME_KUMA_PORT=3001 - - UPTIME_KUMA_HOST=0.0.0.0 - - DATA_DIR=/app/data - - NODE_TLS_REJECT_UNAUTHORIZED=0 - - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 - - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like - image: louislam/uptime-kuma:1.23.16 + image: louislam/uptime-kuma:2.0.0-beta.3 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_2_0_0/envs/default.env b/dockge/uptime-kuma_2_0_0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/uptime-kuma_2_0_0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/uptime-kuma_2_0_0/envs/global.env b/dockge/uptime-kuma_2_0_0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/uptime-kuma_2_0_0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai