From 582f84f1777ffde0dcb90611a7885a36b0d7676e Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Wed, 8 Apr 2026 10:10:21 +0000 Subject: [PATCH] Processed apps directory via GitHub Actions --- .../element-web/{1.12.14 => 1.12.15}/.env | 0 .../conf/config.sample.json | 0 .../element-web/{1.12.14 => 1.12.15}/data.yml | 0 .../{1.12.14 => 1.12.15}/docker-compose.yml | 2 +- .../{1.12.14 => 1.12.15}/envs/default.env | 0 .../{1.12.14 => 1.12.15}/envs/global.env | 0 .../{1.12.14 => 1.12.15}/scripts/init.sh | 0 .../{1.12.14 => 1.12.15}/scripts/uninstall.sh | 0 .../{1.12.14 => 1.12.15}/scripts/upgrade.sh | 0 .../jackett/{0.24.1552 => 0.24.1554}/.env | 0 .../jackett/{0.24.1552 => 0.24.1554}/data.yml | 0 .../docker-compose.yml | 2 +- .../{0.24.1552 => 0.24.1554}/envs/default.env | 0 .../{0.24.1552 => 0.24.1554}/envs/global.env | 0 .../{0.24.1552 => 0.24.1554}/scripts/init.sh | 0 .../scripts/uninstall.sh | 0 .../scripts/upgrade.sh | 0 appstore/seaweedfs/{4.18 => 4.19}/.env | 0 .../{4.18 => 4.19}/config/prometheus.yml | 0 appstore/seaweedfs/{4.18 => 4.19}/data.yml | 0 .../{4.18 => 4.19}/docker-compose.yml | 10 +- .../seaweedfs/{4.18 => 4.19}/envs/default.env | 0 .../seaweedfs/{4.18 => 4.19}/envs/global.env | 0 .../seaweedfs/{4.18 => 4.19}/scripts/init.sh | 0 .../{4.18 => 4.19}/scripts/uninstall.sh | 0 .../{4.18 => 4.19}/scripts/upgrade.sh | 0 appstore/synapse/{1.150.0 => 1.151.0}/.env | 0 .../synapse/{1.150.0 => 1.151.0}/data.yml | 0 .../{1.150.0 => 1.151.0}/docker-compose.yml | 4 +- .../{1.150.0 => 1.151.0}/envs/default.env | 0 .../{1.150.0 => 1.151.0}/envs/global.env | 0 .../{1.150.0 => 1.151.0}/scripts/init.sh | 0 .../{1.150.0 => 1.151.0}/scripts/uninstall.sh | 0 .../{1.150.0 => 1.151.0}/scripts/upgrade.sh | 0 dockge/alist-ffmpeg/.env | 2 +- dockge/alist-ffmpeg/docker-compose.yml | 6 +- .../.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/alist/.env | 2 +- dockge/alist/docker-compose.yml | 6 +- dockge/{alist_4_0_2 => alist_3_45_0}/.env | 2 +- .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/ani-rss/docker-compose.yml | 5 +- .../{ani-rss_3_0_14 => ani-rss_1_2_82}/.env | 0 .../docker-compose.yml | 5 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/apifox-runner-team/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/apifox-runner/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/archivebox/docker-compose.yml | 24 +--- .../.env | 0 .../docker-compose.yml | 24 +++- .../envs/default.env | 0 .../envs/global.env | 0 dockge/bili-fetcher/docker-compose.yml | 4 +- .../.env | 0 .../config/categories.json | 0 .../config/config.yaml | 0 .../config/scheduler_config.yaml | 0 .../config/sql_statements_mysql.py | 0 .../config/sql_statements_sqlite.py | 0 .../config/template.html | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 .../elastic-elasticsearch/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/elastic-kibana/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/element-web/docker-compose.yml | 2 +- dockge/homarr/.env | 3 - dockge/homarr/docker-compose.yml | 6 +- dockge/{homarr_0_15_10 => homarr_0_16_1}/.env | 3 + .../docker-compose.yml | 6 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/immich-no-machine/docker-compose.yml | 4 +- .../.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/immich-server/docker-compose.yml | 4 +- .../.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/jackett/docker-compose.yml | 2 +- dockge/jellyfin/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/music-tag-web/.env | 2 +- dockge/music-tag-web/docker-compose.yml | 5 +- .../.env | 2 +- .../docker-compose.yml | 5 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/nacos/.env | 12 +- dockge/nacos/docker-compose.yml | 11 +- dockge/nacos/init/mysql-schema.sql | 127 ++++++----------- dockge/{nacos_3_2_0 => nacos_2_4_3}/.env | 12 +- .../docker-compose.yml | 11 +- .../envs/default.env | 0 .../envs/global.env | 0 .../init/mysql-schema.sql | 129 ++++++++++++------ dockge/omnibox/docker-compose.yml | 4 +- dockge/{omnibox_1_4_4 => omnibox_2_0_9}/.env | 0 .../2.0.4-lite/docker-compose.yml | 0 .../2.0.4-lite/envs/default.env | 0 .../2.0.4-lite/envs/global.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/postgresql/docker-compose.yml | 4 +- .../.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/qbittorrent/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/rustfs/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/seaweedfs/docker-compose.yml | 10 +- dockge/stream-rec/docker-compose.yml | 4 +- .../.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/synapse/docker-compose.yml | 4 +- dockge/umami/docker-compose.yml | 2 +- dockge/{umami_2_20_0 => umami_3_0_3}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 159 files changed, 270 insertions(+), 270 deletions(-) rename appstore/element-web/{1.12.14 => 1.12.15}/.env (100%) rename appstore/element-web/{1.12.14 => 1.12.15}/conf/config.sample.json (100%) rename appstore/element-web/{1.12.14 => 1.12.15}/data.yml (100%) rename appstore/element-web/{1.12.14 => 1.12.15}/docker-compose.yml (89%) rename appstore/element-web/{1.12.14 => 1.12.15}/envs/default.env (100%) rename appstore/element-web/{1.12.14 => 1.12.15}/envs/global.env (100%) rename appstore/element-web/{1.12.14 => 1.12.15}/scripts/init.sh (100%) rename appstore/element-web/{1.12.14 => 1.12.15}/scripts/uninstall.sh (100%) rename appstore/element-web/{1.12.14 => 1.12.15}/scripts/upgrade.sh (100%) rename appstore/jackett/{0.24.1552 => 0.24.1554}/.env (100%) rename appstore/jackett/{0.24.1552 => 0.24.1554}/data.yml (100%) rename appstore/jackett/{0.24.1552 => 0.24.1554}/docker-compose.yml (91%) rename appstore/jackett/{0.24.1552 => 0.24.1554}/envs/default.env (100%) rename appstore/jackett/{0.24.1552 => 0.24.1554}/envs/global.env (100%) rename appstore/jackett/{0.24.1552 => 0.24.1554}/scripts/init.sh (100%) rename appstore/jackett/{0.24.1552 => 0.24.1554}/scripts/uninstall.sh (100%) rename appstore/jackett/{0.24.1552 => 0.24.1554}/scripts/upgrade.sh (100%) rename appstore/seaweedfs/{4.18 => 4.19}/.env (100%) rename appstore/seaweedfs/{4.18 => 4.19}/config/prometheus.yml (100%) rename appstore/seaweedfs/{4.18 => 4.19}/data.yml (100%) rename appstore/seaweedfs/{4.18 => 4.19}/docker-compose.yml (96%) rename appstore/seaweedfs/{4.18 => 4.19}/envs/default.env (100%) rename appstore/seaweedfs/{4.18 => 4.19}/envs/global.env (100%) rename appstore/seaweedfs/{4.18 => 4.19}/scripts/init.sh (100%) rename appstore/seaweedfs/{4.18 => 4.19}/scripts/uninstall.sh (100%) rename appstore/seaweedfs/{4.18 => 4.19}/scripts/upgrade.sh (100%) rename appstore/synapse/{1.150.0 => 1.151.0}/.env (100%) rename appstore/synapse/{1.150.0 => 1.151.0}/data.yml (100%) rename appstore/synapse/{1.150.0 => 1.151.0}/docker-compose.yml (89%) rename appstore/synapse/{1.150.0 => 1.151.0}/envs/default.env (100%) rename appstore/synapse/{1.150.0 => 1.151.0}/envs/global.env (100%) rename appstore/synapse/{1.150.0 => 1.151.0}/scripts/init.sh (100%) rename appstore/synapse/{1.150.0 => 1.151.0}/scripts/uninstall.sh (100%) rename appstore/synapse/{1.150.0 => 1.151.0}/scripts/upgrade.sh (100%) rename dockge/{alist-ffmpeg_4_0_2 => alist-ffmpeg_3_45_0}/.env (93%) rename dockge/{alist-ffmpeg_4_0_2 => alist-ffmpeg_3_45_0}/docker-compose.yml (85%) rename dockge/{alist-ffmpeg_4_0_2 => alist-ffmpeg_3_45_0}/envs/default.env (100%) rename dockge/{alist-ffmpeg_4_0_2 => alist-ffmpeg_3_45_0}/envs/global.env (100%) rename dockge/{alist_4_0_2 => alist_3_45_0}/.env (93%) rename dockge/{alist_4_0_2 => alist_3_45_0}/docker-compose.yml (86%) rename dockge/{alist_4_0_2 => alist_3_45_0}/envs/default.env (100%) rename dockge/{alist_4_0_2 => alist_3_45_0}/envs/global.env (100%) rename dockge/{ani-rss_3_0_14 => ani-rss_1_2_82}/.env (100%) rename dockge/{ani-rss_3_0_14 => ani-rss_1_2_82}/docker-compose.yml (90%) rename dockge/{ani-rss_3_0_14 => ani-rss_1_2_82}/envs/default.env (100%) rename dockge/{ani-rss_3_0_14 => ani-rss_1_2_82}/envs/global.env (100%) rename dockge/{apifox-runner-team_slim => apifox-runner-team_latest}/.env (100%) rename dockge/{apifox-runner-team_slim => apifox-runner-team_latest}/docker-compose.yml (95%) rename dockge/{apifox-runner-team_slim => apifox-runner-team_latest}/envs/default.env (100%) rename dockge/{apifox-runner-team_slim => apifox-runner-team_latest}/envs/global.env (100%) rename dockge/{apifox-runner_slim => apifox-runner_latest}/.env (100%) rename dockge/{apifox-runner_slim => apifox-runner_latest}/docker-compose.yml (95%) rename dockge/{apifox-runner_slim => apifox-runner_latest}/envs/default.env (100%) rename dockge/{apifox-runner_slim => apifox-runner_latest}/envs/global.env (100%) rename dockge/{archivebox_0_7_3 => archivebox_0_8_5}/.env (100%) rename dockge/{archivebox_0_7_3 => archivebox_0_8_5}/docker-compose.yml (60%) rename dockge/{archivebox_0_7_3 => archivebox_0_8_5}/envs/default.env (100%) rename dockge/{archivebox_0_7_3 => archivebox_0_8_5}/envs/global.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_9}/.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_9}/config/categories.json (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_9}/config/config.yaml (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_9}/config/scheduler_config.yaml (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_9}/config/sql_statements_mysql.py (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_9}/config/sql_statements_sqlite.py (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_9}/config/template.html (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_9}/docker-compose.yml (88%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_9}/envs/default.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_9}/envs/global.env (100%) rename dockge/{elastic-elasticsearch_9_3_2 => elastic-elasticsearch_8_19_13}/.env (100%) rename dockge/{elastic-elasticsearch_9_3_2 => elastic-elasticsearch_8_19_13}/docker-compose.yml (96%) rename dockge/{elastic-elasticsearch_9_3_2 => elastic-elasticsearch_8_19_13}/envs/default.env (100%) rename dockge/{elastic-elasticsearch_9_3_2 => elastic-elasticsearch_8_19_13}/envs/global.env (100%) rename dockge/{elastic-kibana_9_3_2 => elastic-kibana_8_19_13}/.env (100%) rename dockge/{elastic-kibana_9_3_2 => elastic-kibana_8_19_13}/docker-compose.yml (95%) rename dockge/{elastic-kibana_9_3_2 => elastic-kibana_8_19_13}/envs/default.env (100%) rename dockge/{elastic-kibana_9_3_2 => elastic-kibana_8_19_13}/envs/global.env (100%) rename dockge/{homarr_0_15_10 => homarr_0_16_1}/.env (59%) rename dockge/{homarr_0_15_10 => homarr_0_16_1}/docker-compose.yml (65%) rename dockge/{homarr_0_15_10 => homarr_0_16_1}/envs/default.env (100%) rename dockge/{homarr_0_15_10 => homarr_0_16_1}/envs/global.env (100%) rename dockge/{immich-no-machine_2_6_1 => immich-no-machine_1_144_1}/.env (100%) rename dockge/{immich-no-machine_2_6_1 => immich-no-machine_1_144_1}/docker-compose.yml (90%) rename dockge/{immich-no-machine_2_6_1 => immich-no-machine_1_144_1}/envs/default.env (100%) rename dockge/{immich-no-machine_2_6_1 => immich-no-machine_1_144_1}/envs/global.env (100%) rename dockge/{immich-server_2_6_1 => immich-server_1_144_1}/.env (100%) rename dockge/{immich-server_2_6_1 => immich-server_1_144_1}/docker-compose.yml (80%) rename dockge/{immich-server_2_6_1 => immich-server_1_144_1}/envs/default.env (100%) rename dockge/{immich-server_2_6_1 => immich-server_1_144_1}/envs/global.env (100%) rename dockge/{jellyfin_10_11_8 => jellyfin_10_9_11}/.env (100%) rename dockge/{jellyfin_10_11_8 => jellyfin_10_9_11}/docker-compose.yml (96%) rename dockge/{jellyfin_10_11_8 => jellyfin_10_9_11}/envs/default.env (100%) rename dockge/{jellyfin_10_11_8 => jellyfin_10_9_11}/envs/global.env (100%) rename dockge/{music-tag-web_2_7_1 => music-tag-web_v1}/.env (91%) rename dockge/{music-tag-web_2_7_1 => music-tag-web_v1}/docker-compose.yml (87%) rename dockge/{music-tag-web_2_7_1 => music-tag-web_v1}/envs/default.env (100%) rename dockge/{music-tag-web_2_7_1 => music-tag-web_v1}/envs/global.env (100%) rename dockge/{nacos_3_2_0 => nacos_2_4_3}/.env (88%) rename dockge/{nacos_3_2_0 => nacos_2_4_3}/docker-compose.yml (59%) rename dockge/{nacos_3_2_0 => nacos_2_4_3}/envs/default.env (100%) rename dockge/{nacos_3_2_0 => nacos_2_4_3}/envs/global.env (100%) rename dockge/{nacos_3_2_0 => nacos_2_4_3}/init/mysql-schema.sql (59%) rename dockge/{omnibox_1_4_4 => omnibox_2_0_9}/.env (100%) rename dockge/{omnibox => omnibox_2_0_9}/2.0.4-lite/docker-compose.yml (100%) rename dockge/{omnibox => omnibox_2_0_9}/2.0.4-lite/envs/default.env (100%) rename dockge/{omnibox => omnibox_2_0_9}/2.0.4-lite/envs/global.env (100%) rename dockge/{omnibox_1_4_4 => omnibox_2_0_9}/docker-compose.yml (81%) rename dockge/{omnibox_1_4_4 => omnibox_2_0_9}/envs/default.env (100%) rename dockge/{omnibox_1_4_4 => omnibox_2_0_9}/envs/global.env (100%) rename dockge/{postgresql_16_13-alpine => postgresql_pg14-vectors}/.env (100%) rename dockge/{postgresql_16_13-alpine => postgresql_pg14-vectors}/docker-compose.yml (85%) rename dockge/{postgresql_16_13-alpine => postgresql_pg14-vectors}/envs/default.env (100%) rename dockge/{postgresql_16_13-alpine => postgresql_pg14-vectors}/envs/global.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_4}/.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_4}/docker-compose.yml (95%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_4}/envs/default.env (100%) rename dockge/{qbittorrent_4_6_7 => qbittorrent_5_1_4}/envs/global.env (100%) rename dockge/{rustfs_latest => rustfs_1_0_0-alpha_86}/.env (100%) rename dockge/{rustfs_latest => rustfs_1_0_0-alpha_86}/docker-compose.yml (96%) rename dockge/{rustfs_latest => rustfs_1_0_0-alpha_86}/envs/default.env (100%) rename dockge/{rustfs_latest => rustfs_1_0_0-alpha_86}/envs/global.env (100%) rename dockge/{stream-rec_latest => stream-rec_0_7_2}/.env (100%) rename dockge/{stream-rec_latest => stream-rec_0_7_2}/docker-compose.yml (92%) rename dockge/{stream-rec_latest => stream-rec_0_7_2}/envs/default.env (100%) rename dockge/{stream-rec_latest => stream-rec_0_7_2}/envs/global.env (100%) rename dockge/{umami_2_20_0 => umami_3_0_3}/.env (100%) rename dockge/{umami_2_20_0 => umami_3_0_3}/docker-compose.yml (90%) rename dockge/{umami_2_20_0 => umami_3_0_3}/envs/default.env (100%) rename dockge/{umami_2_20_0 => umami_3_0_3}/envs/global.env (100%) diff --git a/appstore/element-web/1.12.14/.env b/appstore/element-web/1.12.15/.env similarity index 100% rename from appstore/element-web/1.12.14/.env rename to appstore/element-web/1.12.15/.env diff --git a/appstore/element-web/1.12.14/conf/config.sample.json b/appstore/element-web/1.12.15/conf/config.sample.json similarity index 100% rename from appstore/element-web/1.12.14/conf/config.sample.json rename to appstore/element-web/1.12.15/conf/config.sample.json diff --git a/appstore/element-web/1.12.14/data.yml b/appstore/element-web/1.12.15/data.yml similarity index 100% rename from appstore/element-web/1.12.14/data.yml rename to appstore/element-web/1.12.15/data.yml diff --git a/appstore/element-web/1.12.14/docker-compose.yml b/appstore/element-web/1.12.15/docker-compose.yml similarity index 89% rename from appstore/element-web/1.12.14/docker-compose.yml rename to appstore/element-web/1.12.15/docker-compose.yml index aa9b1b9b6..91d928f65 100644 --- a/appstore/element-web/1.12.14/docker-compose.yml +++ b/appstore/element-web/1.12.15/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: vectorim/element-web:v1.12.14 + image: vectorim/element-web:v1.12.15 labels: createdBy: Apps networks: diff --git a/appstore/element-web/1.12.14/envs/default.env b/appstore/element-web/1.12.15/envs/default.env similarity index 100% rename from appstore/element-web/1.12.14/envs/default.env rename to appstore/element-web/1.12.15/envs/default.env diff --git a/appstore/element-web/1.12.14/envs/global.env b/appstore/element-web/1.12.15/envs/global.env similarity index 100% rename from appstore/element-web/1.12.14/envs/global.env rename to appstore/element-web/1.12.15/envs/global.env diff --git a/appstore/element-web/1.12.14/scripts/init.sh b/appstore/element-web/1.12.15/scripts/init.sh similarity index 100% rename from appstore/element-web/1.12.14/scripts/init.sh rename to appstore/element-web/1.12.15/scripts/init.sh diff --git a/appstore/element-web/1.12.14/scripts/uninstall.sh b/appstore/element-web/1.12.15/scripts/uninstall.sh similarity index 100% rename from appstore/element-web/1.12.14/scripts/uninstall.sh rename to appstore/element-web/1.12.15/scripts/uninstall.sh diff --git a/appstore/element-web/1.12.14/scripts/upgrade.sh b/appstore/element-web/1.12.15/scripts/upgrade.sh similarity index 100% rename from appstore/element-web/1.12.14/scripts/upgrade.sh rename to appstore/element-web/1.12.15/scripts/upgrade.sh diff --git a/appstore/jackett/0.24.1552/.env b/appstore/jackett/0.24.1554/.env similarity index 100% rename from appstore/jackett/0.24.1552/.env rename to appstore/jackett/0.24.1554/.env diff --git a/appstore/jackett/0.24.1552/data.yml b/appstore/jackett/0.24.1554/data.yml similarity index 100% rename from appstore/jackett/0.24.1552/data.yml rename to appstore/jackett/0.24.1554/data.yml diff --git a/appstore/jackett/0.24.1552/docker-compose.yml b/appstore/jackett/0.24.1554/docker-compose.yml similarity index 91% rename from appstore/jackett/0.24.1552/docker-compose.yml rename to appstore/jackett/0.24.1554/docker-compose.yml index a333c40e0..0373902d3 100644 --- a/appstore/jackett/0.24.1552/docker-compose.yml +++ b/appstore/jackett/0.24.1554/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - PUID=1000 - PGID=1000 - image: linuxserver/jackett:0.24.1552 + image: linuxserver/jackett:0.24.1554 labels: createdBy: Apps networks: diff --git a/appstore/jackett/0.24.1552/envs/default.env b/appstore/jackett/0.24.1554/envs/default.env similarity index 100% rename from appstore/jackett/0.24.1552/envs/default.env rename to appstore/jackett/0.24.1554/envs/default.env diff --git a/appstore/jackett/0.24.1552/envs/global.env b/appstore/jackett/0.24.1554/envs/global.env similarity index 100% rename from appstore/jackett/0.24.1552/envs/global.env rename to appstore/jackett/0.24.1554/envs/global.env diff --git a/appstore/jackett/0.24.1552/scripts/init.sh b/appstore/jackett/0.24.1554/scripts/init.sh similarity index 100% rename from appstore/jackett/0.24.1552/scripts/init.sh rename to appstore/jackett/0.24.1554/scripts/init.sh diff --git a/appstore/jackett/0.24.1552/scripts/uninstall.sh b/appstore/jackett/0.24.1554/scripts/uninstall.sh similarity index 100% rename from appstore/jackett/0.24.1552/scripts/uninstall.sh rename to appstore/jackett/0.24.1554/scripts/uninstall.sh diff --git a/appstore/jackett/0.24.1552/scripts/upgrade.sh b/appstore/jackett/0.24.1554/scripts/upgrade.sh similarity index 100% rename from appstore/jackett/0.24.1552/scripts/upgrade.sh rename to appstore/jackett/0.24.1554/scripts/upgrade.sh diff --git a/appstore/seaweedfs/4.18/.env b/appstore/seaweedfs/4.19/.env similarity index 100% rename from appstore/seaweedfs/4.18/.env rename to appstore/seaweedfs/4.19/.env diff --git a/appstore/seaweedfs/4.18/config/prometheus.yml b/appstore/seaweedfs/4.19/config/prometheus.yml similarity index 100% rename from appstore/seaweedfs/4.18/config/prometheus.yml rename to appstore/seaweedfs/4.19/config/prometheus.yml diff --git a/appstore/seaweedfs/4.18/data.yml b/appstore/seaweedfs/4.19/data.yml similarity index 100% rename from appstore/seaweedfs/4.18/data.yml rename to appstore/seaweedfs/4.19/data.yml diff --git a/appstore/seaweedfs/4.18/docker-compose.yml b/appstore/seaweedfs/4.19/docker-compose.yml similarity index 96% rename from appstore/seaweedfs/4.18/docker-compose.yml rename to appstore/seaweedfs/4.19/docker-compose.yml index 21e7d0941..448b19884 100644 --- a/appstore/seaweedfs/4.18/docker-compose.yml +++ b/appstore/seaweedfs/4.19/docker-compose.yml @@ -14,7 +14,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: chrislusf/seaweedfs:4.18 + image: chrislusf/seaweedfs:4.19 networks: - seaweedfs-network ports: @@ -36,7 +36,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: chrislusf/seaweedfs:4.18 + image: chrislusf/seaweedfs:4.19 networks: - seaweedfs-network ports: @@ -78,7 +78,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: chrislusf/seaweedfs:4.18 + image: chrislusf/seaweedfs:4.19 labels: createdBy: Apps networks: @@ -101,7 +101,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: chrislusf/seaweedfs:4.18 + image: chrislusf/seaweedfs:4.19 networks: - seaweedfs-network ports: @@ -125,7 +125,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: chrislusf/seaweedfs:4.18 + image: chrislusf/seaweedfs:4.19 networks: - seaweedfs-network ports: diff --git a/appstore/seaweedfs/4.18/envs/default.env b/appstore/seaweedfs/4.19/envs/default.env similarity index 100% rename from appstore/seaweedfs/4.18/envs/default.env rename to appstore/seaweedfs/4.19/envs/default.env diff --git a/appstore/seaweedfs/4.18/envs/global.env b/appstore/seaweedfs/4.19/envs/global.env similarity index 100% rename from appstore/seaweedfs/4.18/envs/global.env rename to appstore/seaweedfs/4.19/envs/global.env diff --git a/appstore/seaweedfs/4.18/scripts/init.sh b/appstore/seaweedfs/4.19/scripts/init.sh similarity index 100% rename from appstore/seaweedfs/4.18/scripts/init.sh rename to appstore/seaweedfs/4.19/scripts/init.sh diff --git a/appstore/seaweedfs/4.18/scripts/uninstall.sh b/appstore/seaweedfs/4.19/scripts/uninstall.sh similarity index 100% rename from appstore/seaweedfs/4.18/scripts/uninstall.sh rename to appstore/seaweedfs/4.19/scripts/uninstall.sh diff --git a/appstore/seaweedfs/4.18/scripts/upgrade.sh b/appstore/seaweedfs/4.19/scripts/upgrade.sh similarity index 100% rename from appstore/seaweedfs/4.18/scripts/upgrade.sh rename to appstore/seaweedfs/4.19/scripts/upgrade.sh diff --git a/appstore/synapse/1.150.0/.env b/appstore/synapse/1.151.0/.env similarity index 100% rename from appstore/synapse/1.150.0/.env rename to appstore/synapse/1.151.0/.env diff --git a/appstore/synapse/1.150.0/data.yml b/appstore/synapse/1.151.0/data.yml similarity index 100% rename from appstore/synapse/1.150.0/data.yml rename to appstore/synapse/1.151.0/data.yml diff --git a/appstore/synapse/1.150.0/docker-compose.yml b/appstore/synapse/1.151.0/docker-compose.yml similarity index 89% rename from appstore/synapse/1.150.0/docker-compose.yml rename to appstore/synapse/1.151.0/docker-compose.yml index 04a91d547..46ae6f001 100644 --- a/appstore/synapse/1.150.0/docker-compose.yml +++ b/appstore/synapse/1.151.0/docker-compose.yml @@ -9,7 +9,7 @@ services: env_file: - ./envs/global.env - .env - image: matrixdotorg/synapse:v1.150.0 + image: matrixdotorg/synapse:v1.151.0 labels: createdBy: Apps networks: @@ -31,7 +31,7 @@ services: - SYNAPSE_REPORT_STATS=no - SYNAPSE_NO_TLS=true - SYNAPSE_HTTP_PORT=8008 - image: matrixdotorg/synapse:v1.150.0 + image: matrixdotorg/synapse:v1.151.0 networks: - 1panel-network restart: false diff --git a/appstore/synapse/1.150.0/envs/default.env b/appstore/synapse/1.151.0/envs/default.env similarity index 100% rename from appstore/synapse/1.150.0/envs/default.env rename to appstore/synapse/1.151.0/envs/default.env diff --git a/appstore/synapse/1.150.0/envs/global.env b/appstore/synapse/1.151.0/envs/global.env similarity index 100% rename from appstore/synapse/1.150.0/envs/global.env rename to appstore/synapse/1.151.0/envs/global.env diff --git a/appstore/synapse/1.150.0/scripts/init.sh b/appstore/synapse/1.151.0/scripts/init.sh similarity index 100% rename from appstore/synapse/1.150.0/scripts/init.sh rename to appstore/synapse/1.151.0/scripts/init.sh diff --git a/appstore/synapse/1.150.0/scripts/uninstall.sh b/appstore/synapse/1.151.0/scripts/uninstall.sh similarity index 100% rename from appstore/synapse/1.150.0/scripts/uninstall.sh rename to appstore/synapse/1.151.0/scripts/uninstall.sh diff --git a/appstore/synapse/1.150.0/scripts/upgrade.sh b/appstore/synapse/1.151.0/scripts/upgrade.sh similarity index 100% rename from appstore/synapse/1.150.0/scripts/upgrade.sh rename to appstore/synapse/1.151.0/scripts/upgrade.sh diff --git a/dockge/alist-ffmpeg/.env b/dockge/alist-ffmpeg/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-ffmpeg/.env +++ b/dockge/alist-ffmpeg/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-ffmpeg/docker-compose.yml b/dockge/alist-ffmpeg/docker-compose.yml index 37149a612..ded9a5b7e 100644 --- a/dockge/alist-ffmpeg/docker-compose.yml +++ b/dockge/alist-ffmpeg/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist: + openlist: container_name: alist-ffmpeg env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0-ffmpeg + image: openlistteam/openlist:v4.0.2-ffmpeg labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/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/alist-ffmpeg_4_0_2/.env b/dockge/alist-ffmpeg_3_45_0/.env similarity index 93% rename from dockge/alist-ffmpeg_4_0_2/.env rename to dockge/alist-ffmpeg_3_45_0/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-ffmpeg_4_0_2/.env +++ b/dockge/alist-ffmpeg_3_45_0/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist-ffmpeg_4_0_2/docker-compose.yml b/dockge/alist-ffmpeg_3_45_0/docker-compose.yml similarity index 85% rename from dockge/alist-ffmpeg_4_0_2/docker-compose.yml rename to dockge/alist-ffmpeg_3_45_0/docker-compose.yml index ded9a5b7e..37149a612 100644 --- a/dockge/alist-ffmpeg_4_0_2/docker-compose.yml +++ b/dockge/alist-ffmpeg_3_45_0/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist: container_name: alist-ffmpeg env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2-ffmpeg + image: xhofe/alist:v3.45.0-ffmpeg labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/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/alist-ffmpeg_4_0_2/envs/default.env b/dockge/alist-ffmpeg_3_45_0/envs/default.env similarity index 100% rename from dockge/alist-ffmpeg_4_0_2/envs/default.env rename to dockge/alist-ffmpeg_3_45_0/envs/default.env diff --git a/dockge/alist-ffmpeg_4_0_2/envs/global.env b/dockge/alist-ffmpeg_3_45_0/envs/global.env similarity index 100% rename from dockge/alist-ffmpeg_4_0_2/envs/global.env rename to dockge/alist-ffmpeg_3_45_0/envs/global.env diff --git a/dockge/alist/.env b/dockge/alist/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist/.env +++ b/dockge/alist/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -ALIST_ROOT_PATH=/home/alist +OPENLIST_ROOT_PATH=/home/openlist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist/docker-compose.yml b/dockge/alist/docker-compose.yml index baa8abfb1..8099cd02f 100644 --- a/dockge/alist/docker-compose.yml +++ b/dockge/alist/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist: + openlist: container_name: alist env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist:v3.45.0 + image: openlistteam/openlist:v4.0.2 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${ALIST_ROOT_PATH}/data:/opt/alist/data + - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/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/alist_4_0_2/.env b/dockge/alist_3_45_0/.env similarity index 93% rename from dockge/alist_4_0_2/.env rename to dockge/alist_3_45_0/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist_4_0_2/.env +++ b/dockge/alist_3_45_0/.env @@ -1,5 +1,5 @@ # 数据持久化路径 [必填] -OPENLIST_ROOT_PATH=/home/openlist +ALIST_ROOT_PATH=/home/alist # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=5244 diff --git a/dockge/alist_4_0_2/docker-compose.yml b/dockge/alist_3_45_0/docker-compose.yml similarity index 86% rename from dockge/alist_4_0_2/docker-compose.yml rename to dockge/alist_3_45_0/docker-compose.yml index 8099cd02f..baa8abfb1 100644 --- a/dockge/alist_4_0_2/docker-compose.yml +++ b/dockge/alist_3_45_0/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist: container_name: alist env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2 + image: xhofe/alist:v3.45.0 labels: createdBy: Apps networks: @@ -21,7 +21,7 @@ services: - ${PANEL_APP_PORT_HTTP}:5244 restart: always volumes: - - ${OPENLIST_ROOT_PATH}/data:/opt/openlist/data + - ${ALIST_ROOT_PATH}/data:/opt/alist/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/alist_4_0_2/envs/default.env b/dockge/alist_3_45_0/envs/default.env similarity index 100% rename from dockge/alist_4_0_2/envs/default.env rename to dockge/alist_3_45_0/envs/default.env diff --git a/dockge/alist_4_0_2/envs/global.env b/dockge/alist_3_45_0/envs/global.env similarity index 100% rename from dockge/alist_4_0_2/envs/global.env rename to dockge/alist_3_45_0/envs/global.env diff --git a/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index 9c6e13c66..60fd572f0 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/docker-compose.yml @@ -8,10 +8,13 @@ services: - ./envs/global.env - .env environment: + - PUID=0 + - PGID=0 + - UMASK=022 - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v1.2.82 + image: wushuo894/ani-rss:v3.0.14 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_3_0_14/.env b/dockge/ani-rss_1_2_82/.env similarity index 100% rename from dockge/ani-rss_3_0_14/.env rename to dockge/ani-rss_1_2_82/.env diff --git a/dockge/ani-rss_3_0_14/docker-compose.yml b/dockge/ani-rss_1_2_82/docker-compose.yml similarity index 90% rename from dockge/ani-rss_3_0_14/docker-compose.yml rename to dockge/ani-rss_1_2_82/docker-compose.yml index 60fd572f0..9c6e13c66 100644 --- a/dockge/ani-rss_3_0_14/docker-compose.yml +++ b/dockge/ani-rss_1_2_82/docker-compose.yml @@ -8,13 +8,10 @@ services: - ./envs/global.env - .env environment: - - PUID=0 - - PGID=0 - - UMASK=022 - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v3.0.14 + image: wushuo894/ani-rss:v1.2.82 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_3_0_14/envs/default.env b/dockge/ani-rss_1_2_82/envs/default.env similarity index 100% rename from dockge/ani-rss_3_0_14/envs/default.env rename to dockge/ani-rss_1_2_82/envs/default.env diff --git a/dockge/ani-rss_3_0_14/envs/global.env b/dockge/ani-rss_1_2_82/envs/global.env similarity index 100% rename from dockge/ani-rss_3_0_14/envs/global.env rename to dockge/ani-rss_1_2_82/envs/global.env diff --git a/dockge/apifox-runner-team/docker-compose.yml b/dockge/apifox-runner-team/docker-compose.yml index 9bd62c5de..dcf59fd91 100644 --- a/dockge/apifox-runner-team/docker-compose.yml +++ b/dockge/apifox-runner-team/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: registry.cn-hangzhou.aliyuncs.com/apifox/self-hosted-general-runner + image: registry.cn-hangzhou.aliyuncs.com/apifox/self-hosted-general-runner:slim labels: createdBy: Apps networks: diff --git a/dockge/apifox-runner-team_slim/.env b/dockge/apifox-runner-team_latest/.env similarity index 100% rename from dockge/apifox-runner-team_slim/.env rename to dockge/apifox-runner-team_latest/.env diff --git a/dockge/apifox-runner-team_slim/docker-compose.yml b/dockge/apifox-runner-team_latest/docker-compose.yml similarity index 95% rename from dockge/apifox-runner-team_slim/docker-compose.yml rename to dockge/apifox-runner-team_latest/docker-compose.yml index dcf59fd91..9bd62c5de 100644 --- a/dockge/apifox-runner-team_slim/docker-compose.yml +++ b/dockge/apifox-runner-team_latest/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: registry.cn-hangzhou.aliyuncs.com/apifox/self-hosted-general-runner:slim + image: registry.cn-hangzhou.aliyuncs.com/apifox/self-hosted-general-runner labels: createdBy: Apps networks: diff --git a/dockge/apifox-runner-team_slim/envs/default.env b/dockge/apifox-runner-team_latest/envs/default.env similarity index 100% rename from dockge/apifox-runner-team_slim/envs/default.env rename to dockge/apifox-runner-team_latest/envs/default.env diff --git a/dockge/apifox-runner-team_slim/envs/global.env b/dockge/apifox-runner-team_latest/envs/global.env similarity index 100% rename from dockge/apifox-runner-team_slim/envs/global.env rename to dockge/apifox-runner-team_latest/envs/global.env diff --git a/dockge/apifox-runner/docker-compose.yml b/dockge/apifox-runner/docker-compose.yml index e1c1c862c..bcacfcd4d 100644 --- a/dockge/apifox-runner/docker-compose.yml +++ b/dockge/apifox-runner/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: registry.cn-hangzhou.aliyuncs.com/apifox/self-hosted-general-runner + image: registry.cn-hangzhou.aliyuncs.com/apifox/self-hosted-general-runner:slim labels: createdBy: Apps networks: diff --git a/dockge/apifox-runner_slim/.env b/dockge/apifox-runner_latest/.env similarity index 100% rename from dockge/apifox-runner_slim/.env rename to dockge/apifox-runner_latest/.env diff --git a/dockge/apifox-runner_slim/docker-compose.yml b/dockge/apifox-runner_latest/docker-compose.yml similarity index 95% rename from dockge/apifox-runner_slim/docker-compose.yml rename to dockge/apifox-runner_latest/docker-compose.yml index bcacfcd4d..e1c1c862c 100644 --- a/dockge/apifox-runner_slim/docker-compose.yml +++ b/dockge/apifox-runner_latest/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: registry.cn-hangzhou.aliyuncs.com/apifox/self-hosted-general-runner:slim + image: registry.cn-hangzhou.aliyuncs.com/apifox/self-hosted-general-runner labels: createdBy: Apps networks: diff --git a/dockge/apifox-runner_slim/envs/default.env b/dockge/apifox-runner_latest/envs/default.env similarity index 100% rename from dockge/apifox-runner_slim/envs/default.env rename to dockge/apifox-runner_latest/envs/default.env diff --git a/dockge/apifox-runner_slim/envs/global.env b/dockge/apifox-runner_latest/envs/global.env similarity index 100% rename from dockge/apifox-runner_slim/envs/global.env rename to dockge/apifox-runner_latest/envs/global.env diff --git a/dockge/archivebox/docker-compose.yml b/dockge/archivebox/docker-compose.yml index 41d4900e1..f70ce3cc2 100644 --- a/dockge/archivebox/docker-compose.yml +++ b/dockge/archivebox/docker-compose.yml @@ -4,8 +4,6 @@ networks: services: archivebox: container_name: archivebox - depends_on: - - archivebox-init env_file: - ./envs/global.env - .env @@ -16,7 +14,7 @@ services: - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.8.5rc9 + image: archivebox/archivebox:0.7.3 labels: createdBy: Apps networks: @@ -26,26 +24,6 @@ services: restart: always volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data - archivebox-init: - command: archivebox init - container_name: init-archivebox - env_file: - - ./envs/global.env - - .env - environment: - - TZ=Asia/Shanghai - - ALLOWED_HOSTS=* - - CSRF_TRUSTED_ORIGINS=http://localhost:8000 - - SEARCH_BACKEND_ENGINE=sonic - - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.8.5rc9 - labels: - createdBy: Apps - networks: - - 1panel-network - volumes: - - ${ARCHIVEBOX_ROOT_PATH}/data:/data archivebox-sonic: container_name: sonic-archivebox env_file: diff --git a/dockge/archivebox_0_7_3/.env b/dockge/archivebox_0_8_5/.env similarity index 100% rename from dockge/archivebox_0_7_3/.env rename to dockge/archivebox_0_8_5/.env diff --git a/dockge/archivebox_0_7_3/docker-compose.yml b/dockge/archivebox_0_8_5/docker-compose.yml similarity index 60% rename from dockge/archivebox_0_7_3/docker-compose.yml rename to dockge/archivebox_0_8_5/docker-compose.yml index f70ce3cc2..41d4900e1 100644 --- a/dockge/archivebox_0_7_3/docker-compose.yml +++ b/dockge/archivebox_0_8_5/docker-compose.yml @@ -4,6 +4,8 @@ networks: services: archivebox: container_name: archivebox + depends_on: + - archivebox-init env_file: - ./envs/global.env - .env @@ -14,7 +16,7 @@ services: - SEARCH_BACKEND_ENGINE=sonic - SEARCH_BACKEND_HOST_NAME=archivebox-sonic - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} - image: archivebox/archivebox:0.7.3 + image: archivebox/archivebox:0.8.5rc9 labels: createdBy: Apps networks: @@ -24,6 +26,26 @@ services: restart: always volumes: - ${ARCHIVEBOX_ROOT_PATH}/data:/data + archivebox-init: + command: archivebox init + container_name: init-archivebox + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - ALLOWED_HOSTS=* + - CSRF_TRUSTED_ORIGINS=http://localhost:8000 + - SEARCH_BACKEND_ENGINE=sonic + - SEARCH_BACKEND_HOST_NAME=archivebox-sonic + - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-} + image: archivebox/archivebox:0.8.5rc9 + labels: + createdBy: Apps + networks: + - 1panel-network + volumes: + - ${ARCHIVEBOX_ROOT_PATH}/data:/data archivebox-sonic: container_name: sonic-archivebox env_file: diff --git a/dockge/archivebox_0_7_3/envs/default.env b/dockge/archivebox_0_8_5/envs/default.env similarity index 100% rename from dockge/archivebox_0_7_3/envs/default.env rename to dockge/archivebox_0_8_5/envs/default.env diff --git a/dockge/archivebox_0_7_3/envs/global.env b/dockge/archivebox_0_8_5/envs/global.env similarity index 100% rename from dockge/archivebox_0_7_3/envs/global.env rename to dockge/archivebox_0_8_5/envs/global.env diff --git a/dockge/bili-fetcher/docker-compose.yml b/dockge/bili-fetcher/docker-compose.yml index ba476f77b..c68c76b14 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:v1.6.9 + 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.9 + image: qyg2297248353/bili-fetcher-web:latest labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_latest/.env b/dockge/bili-fetcher_1_6_9/.env similarity index 100% rename from dockge/bili-fetcher_latest/.env rename to dockge/bili-fetcher_1_6_9/.env diff --git a/dockge/bili-fetcher_latest/config/categories.json b/dockge/bili-fetcher_1_6_9/config/categories.json similarity index 100% rename from dockge/bili-fetcher_latest/config/categories.json rename to dockge/bili-fetcher_1_6_9/config/categories.json diff --git a/dockge/bili-fetcher_latest/config/config.yaml b/dockge/bili-fetcher_1_6_9/config/config.yaml similarity index 100% rename from dockge/bili-fetcher_latest/config/config.yaml rename to dockge/bili-fetcher_1_6_9/config/config.yaml diff --git a/dockge/bili-fetcher_latest/config/scheduler_config.yaml b/dockge/bili-fetcher_1_6_9/config/scheduler_config.yaml similarity index 100% rename from dockge/bili-fetcher_latest/config/scheduler_config.yaml rename to dockge/bili-fetcher_1_6_9/config/scheduler_config.yaml diff --git a/dockge/bili-fetcher_latest/config/sql_statements_mysql.py b/dockge/bili-fetcher_1_6_9/config/sql_statements_mysql.py similarity index 100% rename from dockge/bili-fetcher_latest/config/sql_statements_mysql.py rename to dockge/bili-fetcher_1_6_9/config/sql_statements_mysql.py diff --git a/dockge/bili-fetcher_latest/config/sql_statements_sqlite.py b/dockge/bili-fetcher_1_6_9/config/sql_statements_sqlite.py similarity index 100% rename from dockge/bili-fetcher_latest/config/sql_statements_sqlite.py rename to dockge/bili-fetcher_1_6_9/config/sql_statements_sqlite.py diff --git a/dockge/bili-fetcher_latest/config/template.html b/dockge/bili-fetcher_1_6_9/config/template.html similarity index 100% rename from dockge/bili-fetcher_latest/config/template.html rename to dockge/bili-fetcher_1_6_9/config/template.html diff --git a/dockge/bili-fetcher_latest/docker-compose.yml b/dockge/bili-fetcher_1_6_9/docker-compose.yml similarity index 88% rename from dockge/bili-fetcher_latest/docker-compose.yml rename to dockge/bili-fetcher_1_6_9/docker-compose.yml index c68c76b14..ba476f77b 100644 --- a/dockge/bili-fetcher_latest/docker-compose.yml +++ b/dockge/bili-fetcher_1_6_9/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.9 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.9 labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_latest/envs/default.env b/dockge/bili-fetcher_1_6_9/envs/default.env similarity index 100% rename from dockge/bili-fetcher_latest/envs/default.env rename to dockge/bili-fetcher_1_6_9/envs/default.env diff --git a/dockge/bili-fetcher_latest/envs/global.env b/dockge/bili-fetcher_1_6_9/envs/global.env similarity index 100% rename from dockge/bili-fetcher_latest/envs/global.env rename to dockge/bili-fetcher_1_6_9/envs/global.env diff --git a/dockge/elastic-elasticsearch/docker-compose.yml b/dockge/elastic-elasticsearch/docker-compose.yml index 3a8a4a0b4..87e0be687 100644 --- a/dockge/elastic-elasticsearch/docker-compose.yml +++ b/dockge/elastic-elasticsearch/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:8.19.13 + image: elasticsearch:9.3.2 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_3_2/.env b/dockge/elastic-elasticsearch_8_19_13/.env similarity index 100% rename from dockge/elastic-elasticsearch_9_3_2/.env rename to dockge/elastic-elasticsearch_8_19_13/.env diff --git a/dockge/elastic-elasticsearch_9_3_2/docker-compose.yml b/dockge/elastic-elasticsearch_8_19_13/docker-compose.yml similarity index 96% rename from dockge/elastic-elasticsearch_9_3_2/docker-compose.yml rename to dockge/elastic-elasticsearch_8_19_13/docker-compose.yml index 87e0be687..3a8a4a0b4 100644 --- a/dockge/elastic-elasticsearch_9_3_2/docker-compose.yml +++ b/dockge/elastic-elasticsearch_8_19_13/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:9.3.2 + image: elasticsearch:8.19.13 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_3_2/envs/default.env b/dockge/elastic-elasticsearch_8_19_13/envs/default.env similarity index 100% rename from dockge/elastic-elasticsearch_9_3_2/envs/default.env rename to dockge/elastic-elasticsearch_8_19_13/envs/default.env diff --git a/dockge/elastic-elasticsearch_9_3_2/envs/global.env b/dockge/elastic-elasticsearch_8_19_13/envs/global.env similarity index 100% rename from dockge/elastic-elasticsearch_9_3_2/envs/global.env rename to dockge/elastic-elasticsearch_8_19_13/envs/global.env diff --git a/dockge/elastic-kibana/docker-compose.yml b/dockge/elastic-kibana/docker-compose.yml index 93a487f66..14aeaad7f 100644 --- a/dockge/elastic-kibana/docker-compose.yml +++ b/dockge/elastic-kibana/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:8.19.13 + image: kibana:9.3.2 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_9_3_2/.env b/dockge/elastic-kibana_8_19_13/.env similarity index 100% rename from dockge/elastic-kibana_9_3_2/.env rename to dockge/elastic-kibana_8_19_13/.env diff --git a/dockge/elastic-kibana_9_3_2/docker-compose.yml b/dockge/elastic-kibana_8_19_13/docker-compose.yml similarity index 95% rename from dockge/elastic-kibana_9_3_2/docker-compose.yml rename to dockge/elastic-kibana_8_19_13/docker-compose.yml index 14aeaad7f..93a487f66 100644 --- a/dockge/elastic-kibana_9_3_2/docker-compose.yml +++ b/dockge/elastic-kibana_8_19_13/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:9.3.2 + image: kibana:8.19.13 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_9_3_2/envs/default.env b/dockge/elastic-kibana_8_19_13/envs/default.env similarity index 100% rename from dockge/elastic-kibana_9_3_2/envs/default.env rename to dockge/elastic-kibana_8_19_13/envs/default.env diff --git a/dockge/elastic-kibana_9_3_2/envs/global.env b/dockge/elastic-kibana_8_19_13/envs/global.env similarity index 100% rename from dockge/elastic-kibana_9_3_2/envs/global.env rename to dockge/elastic-kibana_8_19_13/envs/global.env diff --git a/dockge/element-web/docker-compose.yml b/dockge/element-web/docker-compose.yml index aa9b1b9b6..91d928f65 100644 --- a/dockge/element-web/docker-compose.yml +++ b/dockge/element-web/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: vectorim/element-web:v1.12.14 + image: vectorim/element-web:v1.12.15 labels: createdBy: Apps networks: diff --git a/dockge/homarr/.env b/dockge/homarr/.env index 9370b8091..820a114c6 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -7,6 +7,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 081e2d190..3b26c2c66 100644 --- a/dockge/homarr/docker-compose.yml +++ b/dockge/homarr/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/ajnart/homarr:0.16.1 + image: ghcr.io/ajnart/homarr:0.15.10 labels: createdBy: Apps network_mode: ${NETWORK_MODE} @@ -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_0_16_1/.env similarity index 59% rename from dockge/homarr_0_15_10/.env rename to dockge/homarr_0_16_1/.env index 820a114c6..9370b8091 100644 --- a/dockge/homarr_0_15_10/.env +++ b/dockge/homarr_0_16_1/.env @@ -7,3 +7,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_0_16_1/docker-compose.yml similarity index 65% rename from dockge/homarr_0_15_10/docker-compose.yml rename to dockge/homarr_0_16_1/docker-compose.yml index 3b26c2c66..081e2d190 100644 --- a/dockge/homarr_0_15_10/docker-compose.yml +++ b/dockge/homarr_0_16_1/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/ajnart/homarr:0.15.10 + image: ghcr.io/ajnart/homarr:0.16.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} @@ -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/homarr_0_15_10/envs/default.env b/dockge/homarr_0_16_1/envs/default.env similarity index 100% rename from dockge/homarr_0_15_10/envs/default.env rename to dockge/homarr_0_16_1/envs/default.env diff --git a/dockge/homarr_0_15_10/envs/global.env b/dockge/homarr_0_16_1/envs/global.env similarity index 100% rename from dockge/homarr_0_15_10/envs/global.env rename to dockge/homarr_0_16_1/envs/global.env diff --git a/dockge/immich-no-machine/docker-compose.yml b/dockge/immich-no-machine/docker-compose.yml index 949035e00..c6d9d36c3 100644 --- a/dockge/immich-no-machine/docker-compose.yml +++ b/dockge/immich-no-machine/docker-compose.yml @@ -21,7 +21,7 @@ services: volumes: - ${IMMICH_ROOT_PATH}/pg14/data:/var/lib/postgresql/data immich-server: - container_name: immich-server-immich-no-machine + container_name: immich-no-machine depends_on: - immich-pg14-vectors devices: @@ -29,7 +29,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.144.1 + image: ghcr.io/immich-app/immich-server:v2.6.1 labels: createdBy: Apps networks: diff --git a/dockge/immich-no-machine_2_6_1/.env b/dockge/immich-no-machine_1_144_1/.env similarity index 100% rename from dockge/immich-no-machine_2_6_1/.env rename to dockge/immich-no-machine_1_144_1/.env diff --git a/dockge/immich-no-machine_2_6_1/docker-compose.yml b/dockge/immich-no-machine_1_144_1/docker-compose.yml similarity index 90% rename from dockge/immich-no-machine_2_6_1/docker-compose.yml rename to dockge/immich-no-machine_1_144_1/docker-compose.yml index c6d9d36c3..949035e00 100644 --- a/dockge/immich-no-machine_2_6_1/docker-compose.yml +++ b/dockge/immich-no-machine_1_144_1/docker-compose.yml @@ -21,7 +21,7 @@ services: volumes: - ${IMMICH_ROOT_PATH}/pg14/data:/var/lib/postgresql/data immich-server: - container_name: immich-no-machine + container_name: immich-server-immich-no-machine depends_on: - immich-pg14-vectors devices: @@ -29,7 +29,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v2.6.1 + image: ghcr.io/immich-app/immich-server:v1.144.1 labels: createdBy: Apps networks: diff --git a/dockge/immich-no-machine_2_6_1/envs/default.env b/dockge/immich-no-machine_1_144_1/envs/default.env similarity index 100% rename from dockge/immich-no-machine_2_6_1/envs/default.env rename to dockge/immich-no-machine_1_144_1/envs/default.env diff --git a/dockge/immich-no-machine_2_6_1/envs/global.env b/dockge/immich-no-machine_1_144_1/envs/global.env similarity index 100% rename from dockge/immich-no-machine_2_6_1/envs/global.env rename to dockge/immich-no-machine_1_144_1/envs/global.env diff --git a/dockge/immich-server/docker-compose.yml b/dockge/immich-server/docker-compose.yml index 935d43054..9770d7d83 100644 --- a/dockge/immich-server/docker-compose.yml +++ b/dockge/immich-server/docker-compose.yml @@ -4,13 +4,13 @@ networks: external: true services: immich-server: - container_name: immich-server-immich-server + container_name: immich-server devices: - /dev/dri:/dev/dri env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.144.1 + image: ghcr.io/immich-app/immich-server:v2.6.1 labels: createdBy: Apps networks: diff --git a/dockge/immich-server_2_6_1/.env b/dockge/immich-server_1_144_1/.env similarity index 100% rename from dockge/immich-server_2_6_1/.env rename to dockge/immich-server_1_144_1/.env diff --git a/dockge/immich-server_2_6_1/docker-compose.yml b/dockge/immich-server_1_144_1/docker-compose.yml similarity index 80% rename from dockge/immich-server_2_6_1/docker-compose.yml rename to dockge/immich-server_1_144_1/docker-compose.yml index 9770d7d83..935d43054 100644 --- a/dockge/immich-server_2_6_1/docker-compose.yml +++ b/dockge/immich-server_1_144_1/docker-compose.yml @@ -4,13 +4,13 @@ networks: external: true services: immich-server: - container_name: immich-server + container_name: immich-server-immich-server devices: - /dev/dri:/dev/dri env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v2.6.1 + image: ghcr.io/immich-app/immich-server:v1.144.1 labels: createdBy: Apps networks: diff --git a/dockge/immich-server_2_6_1/envs/default.env b/dockge/immich-server_1_144_1/envs/default.env similarity index 100% rename from dockge/immich-server_2_6_1/envs/default.env rename to dockge/immich-server_1_144_1/envs/default.env diff --git a/dockge/immich-server_2_6_1/envs/global.env b/dockge/immich-server_1_144_1/envs/global.env similarity index 100% rename from dockge/immich-server_2_6_1/envs/global.env rename to dockge/immich-server_1_144_1/envs/global.env diff --git a/dockge/jackett/docker-compose.yml b/dockge/jackett/docker-compose.yml index a333c40e0..0373902d3 100644 --- a/dockge/jackett/docker-compose.yml +++ b/dockge/jackett/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - PUID=1000 - PGID=1000 - image: linuxserver/jackett:0.24.1552 + image: linuxserver/jackett:0.24.1554 labels: createdBy: Apps networks: diff --git a/dockge/jellyfin/docker-compose.yml b/dockge/jellyfin/docker-compose.yml index 88affa9a4..f0be53cd2 100644 --- a/dockge/jellyfin/docker-compose.yml +++ b/dockge/jellyfin/docker-compose.yml @@ -10,7 +10,7 @@ services: - ROC_ENABLE_PRE_VEGA=1 - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: jellyfin/jellyfin:10.9.11 + image: jellyfin/jellyfin:10.11.8 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/jellyfin_10_11_8/.env b/dockge/jellyfin_10_9_11/.env similarity index 100% rename from dockge/jellyfin_10_11_8/.env rename to dockge/jellyfin_10_9_11/.env diff --git a/dockge/jellyfin_10_11_8/docker-compose.yml b/dockge/jellyfin_10_9_11/docker-compose.yml similarity index 96% rename from dockge/jellyfin_10_11_8/docker-compose.yml rename to dockge/jellyfin_10_9_11/docker-compose.yml index f0be53cd2..88affa9a4 100644 --- a/dockge/jellyfin_10_11_8/docker-compose.yml +++ b/dockge/jellyfin_10_9_11/docker-compose.yml @@ -10,7 +10,7 @@ services: - ROC_ENABLE_PRE_VEGA=1 - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: jellyfin/jellyfin:10.11.8 + image: jellyfin/jellyfin:10.9.11 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/jellyfin_10_11_8/envs/default.env b/dockge/jellyfin_10_9_11/envs/default.env similarity index 100% rename from dockge/jellyfin_10_11_8/envs/default.env rename to dockge/jellyfin_10_9_11/envs/default.env diff --git a/dockge/jellyfin_10_11_8/envs/global.env b/dockge/jellyfin_10_9_11/envs/global.env similarity index 100% rename from dockge/jellyfin_10_11_8/envs/global.env rename to dockge/jellyfin_10_9_11/envs/global.env diff --git a/dockge/music-tag-web/.env b/dockge/music-tag-web/.env index 35d99b310..3a93177ae 100644 --- a/dockge/music-tag-web/.env +++ b/dockge/music-tag-web/.env @@ -2,7 +2,7 @@ MUSIC_TAG_WEB_ROOT_PATH=/home/music-tag-web # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8001 +PANEL_APP_PORT_HTTP=8002 # 自定义挂载目录 1 CUSTOM_MOUNT_DIRECTORY_1= diff --git a/dockge/music-tag-web/docker-compose.yml b/dockge/music-tag-web/docker-compose.yml index febca33b2..6b58906bd 100644 --- a/dockge/music-tag-web/docker-compose.yml +++ b/dockge/music-tag-web/docker-compose.yml @@ -3,20 +3,19 @@ networks: external: true services: music_tag_web: - command: /start container_name: music-tag-web env_file: - ./envs/global.env - .env environment: - TZ=Asia/Shanghai - image: xhongc/music_tag_web:latest + image: xhongc/music_tag_web:2.7.1 labels: createdBy: Apps networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:8001 + - ${PANEL_APP_PORT_HTTP}:8002 restart: always volumes: - ${MUSIC_TAG_WEB_ROOT_PATH}/data:/app/data diff --git a/dockge/music-tag-web_2_7_1/.env b/dockge/music-tag-web_v1/.env similarity index 91% rename from dockge/music-tag-web_2_7_1/.env rename to dockge/music-tag-web_v1/.env index 3a93177ae..35d99b310 100644 --- a/dockge/music-tag-web_2_7_1/.env +++ b/dockge/music-tag-web_v1/.env @@ -2,7 +2,7 @@ MUSIC_TAG_WEB_ROOT_PATH=/home/music-tag-web # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8002 +PANEL_APP_PORT_HTTP=8001 # 自定义挂载目录 1 CUSTOM_MOUNT_DIRECTORY_1= diff --git a/dockge/music-tag-web_2_7_1/docker-compose.yml b/dockge/music-tag-web_v1/docker-compose.yml similarity index 87% rename from dockge/music-tag-web_2_7_1/docker-compose.yml rename to dockge/music-tag-web_v1/docker-compose.yml index 6b58906bd..febca33b2 100644 --- a/dockge/music-tag-web_2_7_1/docker-compose.yml +++ b/dockge/music-tag-web_v1/docker-compose.yml @@ -3,19 +3,20 @@ networks: external: true services: music_tag_web: + command: /start container_name: music-tag-web env_file: - ./envs/global.env - .env environment: - TZ=Asia/Shanghai - image: xhongc/music_tag_web:2.7.1 + image: xhongc/music_tag_web:latest labels: createdBy: Apps networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:8002 + - ${PANEL_APP_PORT_HTTP}:8001 restart: always volumes: - ${MUSIC_TAG_WEB_ROOT_PATH}/data:/app/data diff --git a/dockge/music-tag-web_2_7_1/envs/default.env b/dockge/music-tag-web_v1/envs/default.env similarity index 100% rename from dockge/music-tag-web_2_7_1/envs/default.env rename to dockge/music-tag-web_v1/envs/default.env diff --git a/dockge/music-tag-web_2_7_1/envs/global.env b/dockge/music-tag-web_v1/envs/global.env similarity index 100% rename from dockge/music-tag-web_2_7_1/envs/global.env rename to dockge/music-tag-web_v1/envs/global.env diff --git a/dockge/nacos/.env b/dockge/nacos/.env index 25c024938..7efde0c9d 100644 --- a/dockge/nacos/.env +++ b/dockge/nacos/.env @@ -2,19 +2,19 @@ PANEL_DB_TYPE=mysql # 网络模式 [必填] -NETWORK_MODE=host +NETWORK_MODE=1panel-network # 数据持久化路径 [必填] NACOS_ROOT_PATH=/home/nacos # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8848 +PANEL_APP_PORT_HTTP=8080 -# Nacos gRPC 客户端端口 [必填] -PANEL_APP_PORT_GRPC_CLIENT=9848 +# WebUI API 端口 [必填] +PANEL_APP_PORT_API=8848 -# Nacos gRPC 服务端端口 [必填] -PANEL_APP_PORT_GRPC_SERVER=9849 +# Nacos gRPC 端口 [必填] +PANEL_APP_PORT_GRPC=9848 # IP模式/域名模式 [必填] PREFER_HOST_MODE=ip diff --git a/dockge/nacos/docker-compose.yml b/dockge/nacos/docker-compose.yml index cf220b000..fbd0b3964 100644 --- a/dockge/nacos/docker-compose.yml +++ b/dockge/nacos/docker-compose.yml @@ -9,17 +9,18 @@ services: - .env environment: - MODE=standalone - - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} + - NACOS_CONSOLE_PORT=${PANEL_APP_PORT_HTTP:-8080} + - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.4.3 + image: nacos/nacos-server:v3.2.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} ports: - - ${PANEL_APP_PORT_HTTP:-8848}:${PANEL_APP_PORT_HTTP:-8848} - - ${PANEL_APP_PORT_GRPC_CLIENT}:9848 - - ${PANEL_APP_PORT_GRPC_SERVER}:9849 + - ${PANEL_APP_PORT_HTTP:-8080}:${PANEL_APP_PORT_HTTP:-8080} + - ${PANEL_APP_PORT_API:-8848}:${PANEL_APP_PORT_API:-8080} + - ${PANEL_APP_PORT_GRPC}:9848 restart: always volumes: - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs diff --git a/dockge/nacos/init/mysql-schema.sql b/dockge/nacos/init/mysql-schema.sql index 067d67a12..d45ac956b 100644 --- a/dockge/nacos/init/mysql-schema.sql +++ b/dockge/nacos/init/mysql-schema.sql @@ -20,86 +20,50 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info_aggr */ +/* 表名称 = config_info since 2.5.0 */ /******************************************/ -CREATE TABLE `config_info_aggr` +CREATE TABLE `config_info_gray` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', - `content` longtext NOT NULL COMMENT '内容', - `gmt_modified` datetime NOT NULL COMMENT '修改时间', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; - - -/******************************************/ -/* 表名称 = config_info_beta */ -/******************************************/ -CREATE TABLE `config_info_beta` -( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', `data_id` varchar(255) NOT NULL COMMENT 'data_id', `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_user` text COMMENT 'src_user', + `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', + `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', + `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', + `gray_rule` text NOT NULL COMMENT 'gray_rule', + `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; - -/******************************************/ -/* 表名称 = config_info_tag */ -/******************************************/ -CREATE TABLE `config_info_tag` -( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; + UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), + KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), + KEY `idx_gmt_modified` (`gmt_modified`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; /******************************************/ /* 表名称 = config_tags_relation */ @@ -144,18 +108,21 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', + `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', + `ext_info` longtext DEFAULT NULL COMMENT 'ext info', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -219,9 +186,3 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); - -INSERT INTO users (username, password, enabled) -VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); - -INSERT INTO roles (username, role) -VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/dockge/nacos_3_2_0/.env b/dockge/nacos_2_4_3/.env similarity index 88% rename from dockge/nacos_3_2_0/.env rename to dockge/nacos_2_4_3/.env index 7efde0c9d..25c024938 100644 --- a/dockge/nacos_3_2_0/.env +++ b/dockge/nacos_2_4_3/.env @@ -2,19 +2,19 @@ PANEL_DB_TYPE=mysql # 网络模式 [必填] -NETWORK_MODE=1panel-network +NETWORK_MODE=host # 数据持久化路径 [必填] NACOS_ROOT_PATH=/home/nacos # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8080 +PANEL_APP_PORT_HTTP=8848 -# WebUI API 端口 [必填] -PANEL_APP_PORT_API=8848 +# Nacos gRPC 客户端端口 [必填] +PANEL_APP_PORT_GRPC_CLIENT=9848 -# Nacos gRPC 端口 [必填] -PANEL_APP_PORT_GRPC=9848 +# Nacos gRPC 服务端端口 [必填] +PANEL_APP_PORT_GRPC_SERVER=9849 # IP模式/域名模式 [必填] PREFER_HOST_MODE=ip diff --git a/dockge/nacos_3_2_0/docker-compose.yml b/dockge/nacos_2_4_3/docker-compose.yml similarity index 59% rename from dockge/nacos_3_2_0/docker-compose.yml rename to dockge/nacos_2_4_3/docker-compose.yml index fbd0b3964..cf220b000 100644 --- a/dockge/nacos_3_2_0/docker-compose.yml +++ b/dockge/nacos_2_4_3/docker-compose.yml @@ -9,18 +9,17 @@ services: - .env environment: - MODE=standalone - - NACOS_CONSOLE_PORT=${PANEL_APP_PORT_HTTP:-8080} - - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} + - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v3.2.0 + image: nacos/nacos-server:v2.4.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} ports: - - ${PANEL_APP_PORT_HTTP:-8080}:${PANEL_APP_PORT_HTTP:-8080} - - ${PANEL_APP_PORT_API:-8848}:${PANEL_APP_PORT_API:-8080} - - ${PANEL_APP_PORT_GRPC}:9848 + - ${PANEL_APP_PORT_HTTP:-8848}:${PANEL_APP_PORT_HTTP:-8848} + - ${PANEL_APP_PORT_GRPC_CLIENT}:9848 + - ${PANEL_APP_PORT_GRPC_SERVER}:9849 restart: always volumes: - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs diff --git a/dockge/nacos_3_2_0/envs/default.env b/dockge/nacos_2_4_3/envs/default.env similarity index 100% rename from dockge/nacos_3_2_0/envs/default.env rename to dockge/nacos_2_4_3/envs/default.env diff --git a/dockge/nacos_3_2_0/envs/global.env b/dockge/nacos_2_4_3/envs/global.env similarity index 100% rename from dockge/nacos_3_2_0/envs/global.env rename to dockge/nacos_2_4_3/envs/global.env diff --git a/dockge/nacos_3_2_0/init/mysql-schema.sql b/dockge/nacos_2_4_3/init/mysql-schema.sql similarity index 59% rename from dockge/nacos_3_2_0/init/mysql-schema.sql rename to dockge/nacos_2_4_3/init/mysql-schema.sql index d45ac956b..067d67a12 100644 --- a/dockge/nacos_3_2_0/init/mysql-schema.sql +++ b/dockge/nacos_2_4_3/init/mysql-schema.sql @@ -20,50 +20,86 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info since 2.5.0 */ +/* 表名称 = config_info_aggr */ /******************************************/ -CREATE TABLE `config_info_gray` +CREATE TABLE `config_info_aggr` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', + `content` longtext NOT NULL COMMENT '内容', + `gmt_modified` datetime NOT NULL COMMENT '修改时间', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; + + +/******************************************/ +/* 表名称 = config_info_beta */ +/******************************************/ +CREATE TABLE `config_info_beta` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `data_id` varchar(255) NOT NULL COMMENT 'data_id', `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `src_user` text COMMENT 'src_user', - `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', - `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', - `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', - `gray_rule` text NOT NULL COMMENT 'gray_rule', - `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), - KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), - KEY `idx_gmt_modified` (`gmt_modified`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; + UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; + +/******************************************/ +/* 表名称 = config_info_tag */ +/******************************************/ +CREATE TABLE `config_info_tag` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; /******************************************/ /* 表名称 = config_tags_relation */ @@ -108,21 +144,18 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', - `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', - `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', - `ext_info` longtext DEFAULT NULL COMMENT 'ext info', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -186,3 +219,9 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); + +INSERT INTO users (username, password, enabled) +VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) +VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/dockge/omnibox/docker-compose.yml b/dockge/omnibox/docker-compose.yml index 88cbdddb8..906fd45a4 100644 --- a/dockge/omnibox/docker-compose.yml +++ b/dockge/omnibox/docker-compose.yml @@ -9,9 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - - SERVER_PORT=7023 - - DATABASE_TYPE=sqlite - image: lampon/omnibox:v2.0.9 + image: lampon/omnibox:v1.4.4 labels: createdBy: Apps networks: diff --git a/dockge/omnibox_1_4_4/.env b/dockge/omnibox_2_0_9/.env similarity index 100% rename from dockge/omnibox_1_4_4/.env rename to dockge/omnibox_2_0_9/.env diff --git a/dockge/omnibox/2.0.4-lite/docker-compose.yml b/dockge/omnibox_2_0_9/2.0.4-lite/docker-compose.yml similarity index 100% rename from dockge/omnibox/2.0.4-lite/docker-compose.yml rename to dockge/omnibox_2_0_9/2.0.4-lite/docker-compose.yml diff --git a/dockge/omnibox/2.0.4-lite/envs/default.env b/dockge/omnibox_2_0_9/2.0.4-lite/envs/default.env similarity index 100% rename from dockge/omnibox/2.0.4-lite/envs/default.env rename to dockge/omnibox_2_0_9/2.0.4-lite/envs/default.env diff --git a/dockge/omnibox/2.0.4-lite/envs/global.env b/dockge/omnibox_2_0_9/2.0.4-lite/envs/global.env similarity index 100% rename from dockge/omnibox/2.0.4-lite/envs/global.env rename to dockge/omnibox_2_0_9/2.0.4-lite/envs/global.env diff --git a/dockge/omnibox_1_4_4/docker-compose.yml b/dockge/omnibox_2_0_9/docker-compose.yml similarity index 81% rename from dockge/omnibox_1_4_4/docker-compose.yml rename to dockge/omnibox_2_0_9/docker-compose.yml index 906fd45a4..88cbdddb8 100644 --- a/dockge/omnibox_1_4_4/docker-compose.yml +++ b/dockge/omnibox_2_0_9/docker-compose.yml @@ -9,7 +9,9 @@ services: - .env environment: - TZ=Asia/Shanghai - image: lampon/omnibox:v1.4.4 + - SERVER_PORT=7023 + - DATABASE_TYPE=sqlite + image: lampon/omnibox:v2.0.9 labels: createdBy: Apps networks: diff --git a/dockge/omnibox_1_4_4/envs/default.env b/dockge/omnibox_2_0_9/envs/default.env similarity index 100% rename from dockge/omnibox_1_4_4/envs/default.env rename to dockge/omnibox_2_0_9/envs/default.env diff --git a/dockge/omnibox_1_4_4/envs/global.env b/dockge/omnibox_2_0_9/envs/global.env similarity index 100% rename from dockge/omnibox_1_4_4/envs/global.env rename to dockge/omnibox_2_0_9/envs/global.env diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index a02df308c..701ed5d91 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg14-vectors-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: tensorchord/pgvecto-rs:pg14-v0.2.1 + image: postgres:16.13-alpine labels: createdBy: Apps networks: diff --git a/dockge/postgresql_16_13-alpine/.env b/dockge/postgresql_pg14-vectors/.env similarity index 100% rename from dockge/postgresql_16_13-alpine/.env rename to dockge/postgresql_pg14-vectors/.env diff --git a/dockge/postgresql_16_13-alpine/docker-compose.yml b/dockge/postgresql_pg14-vectors/docker-compose.yml similarity index 85% rename from dockge/postgresql_16_13-alpine/docker-compose.yml rename to dockge/postgresql_pg14-vectors/docker-compose.yml index 701ed5d91..a02df308c 100644 --- a/dockge/postgresql_16_13-alpine/docker-compose.yml +++ b/dockge/postgresql_pg14-vectors/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: postgresql + container_name: pg14-vectors-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.13-alpine + image: tensorchord/pgvecto-rs:pg14-v0.2.1 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_16_13-alpine/envs/default.env b/dockge/postgresql_pg14-vectors/envs/default.env similarity index 100% rename from dockge/postgresql_16_13-alpine/envs/default.env rename to dockge/postgresql_pg14-vectors/envs/default.env diff --git a/dockge/postgresql_16_13-alpine/envs/global.env b/dockge/postgresql_pg14-vectors/envs/global.env similarity index 100% rename from dockge/postgresql_16_13-alpine/envs/global.env rename to dockge/postgresql_pg14-vectors/envs/global.env diff --git a/dockge/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index 319305e94..5ec4b458b 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:5.1.4 + image: linuxserver/qbittorrent:4.6.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_4_6_7/.env b/dockge/qbittorrent_5_1_4/.env similarity index 100% rename from dockge/qbittorrent_4_6_7/.env rename to dockge/qbittorrent_5_1_4/.env diff --git a/dockge/qbittorrent_4_6_7/docker-compose.yml b/dockge/qbittorrent_5_1_4/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_4_6_7/docker-compose.yml rename to dockge/qbittorrent_5_1_4/docker-compose.yml index 5ec4b458b..319305e94 100644 --- a/dockge/qbittorrent_4_6_7/docker-compose.yml +++ b/dockge/qbittorrent_5_1_4/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.4 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_4_6_7/envs/default.env b/dockge/qbittorrent_5_1_4/envs/default.env similarity index 100% rename from dockge/qbittorrent_4_6_7/envs/default.env rename to dockge/qbittorrent_5_1_4/envs/default.env diff --git a/dockge/qbittorrent_4_6_7/envs/global.env b/dockge/qbittorrent_5_1_4/envs/global.env similarity index 100% rename from dockge/qbittorrent_4_6_7/envs/global.env rename to dockge/qbittorrent_5_1_4/envs/global.env diff --git a/dockge/rustfs/docker-compose.yml b/dockge/rustfs/docker-compose.yml index 2136a7b1f..24ca00a75 100644 --- a/dockge/rustfs/docker-compose.yml +++ b/dockge/rustfs/docker-compose.yml @@ -29,7 +29,7 @@ services: - -c - curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9001/rustfs/console/health timeout: 10s - image: rustfs/rustfs:1.0.0-alpha.86 + image: rustfs/rustfs:latest labels: createdBy: Apps networks: diff --git a/dockge/rustfs_latest/.env b/dockge/rustfs_1_0_0-alpha_86/.env similarity index 100% rename from dockge/rustfs_latest/.env rename to dockge/rustfs_1_0_0-alpha_86/.env diff --git a/dockge/rustfs_latest/docker-compose.yml b/dockge/rustfs_1_0_0-alpha_86/docker-compose.yml similarity index 96% rename from dockge/rustfs_latest/docker-compose.yml rename to dockge/rustfs_1_0_0-alpha_86/docker-compose.yml index 24ca00a75..2136a7b1f 100644 --- a/dockge/rustfs_latest/docker-compose.yml +++ b/dockge/rustfs_1_0_0-alpha_86/docker-compose.yml @@ -29,7 +29,7 @@ services: - -c - curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9001/rustfs/console/health timeout: 10s - image: rustfs/rustfs:latest + image: rustfs/rustfs:1.0.0-alpha.86 labels: createdBy: Apps networks: diff --git a/dockge/rustfs_latest/envs/default.env b/dockge/rustfs_1_0_0-alpha_86/envs/default.env similarity index 100% rename from dockge/rustfs_latest/envs/default.env rename to dockge/rustfs_1_0_0-alpha_86/envs/default.env diff --git a/dockge/rustfs_latest/envs/global.env b/dockge/rustfs_1_0_0-alpha_86/envs/global.env similarity index 100% rename from dockge/rustfs_latest/envs/global.env rename to dockge/rustfs_1_0_0-alpha_86/envs/global.env diff --git a/dockge/seaweedfs/docker-compose.yml b/dockge/seaweedfs/docker-compose.yml index 21e7d0941..448b19884 100644 --- a/dockge/seaweedfs/docker-compose.yml +++ b/dockge/seaweedfs/docker-compose.yml @@ -14,7 +14,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: chrislusf/seaweedfs:4.18 + image: chrislusf/seaweedfs:4.19 networks: - seaweedfs-network ports: @@ -36,7 +36,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: chrislusf/seaweedfs:4.18 + image: chrislusf/seaweedfs:4.19 networks: - seaweedfs-network ports: @@ -78,7 +78,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: chrislusf/seaweedfs:4.18 + image: chrislusf/seaweedfs:4.19 labels: createdBy: Apps networks: @@ -101,7 +101,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: chrislusf/seaweedfs:4.18 + image: chrislusf/seaweedfs:4.19 networks: - seaweedfs-network ports: @@ -125,7 +125,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: chrislusf/seaweedfs:4.18 + image: chrislusf/seaweedfs:4.19 networks: - seaweedfs-network ports: diff --git a/dockge/stream-rec/docker-compose.yml b/dockge/stream-rec/docker-compose.yml index 03a278089..cadb92c75 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:v0.7.2 + image: streamrec/stream-rec:latest 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:v0.7.2 + image: streamrec/stream-rec-front:latest labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_latest/.env b/dockge/stream-rec_0_7_2/.env similarity index 100% rename from dockge/stream-rec_latest/.env rename to dockge/stream-rec_0_7_2/.env diff --git a/dockge/stream-rec_latest/docker-compose.yml b/dockge/stream-rec_0_7_2/docker-compose.yml similarity index 92% rename from dockge/stream-rec_latest/docker-compose.yml rename to dockge/stream-rec_0_7_2/docker-compose.yml index cadb92c75..03a278089 100644 --- a/dockge/stream-rec_latest/docker-compose.yml +++ b/dockge/stream-rec_0_7_2/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:latest + image: streamrec/stream-rec:v0.7.2 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:latest + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_latest/envs/default.env b/dockge/stream-rec_0_7_2/envs/default.env similarity index 100% rename from dockge/stream-rec_latest/envs/default.env rename to dockge/stream-rec_0_7_2/envs/default.env diff --git a/dockge/stream-rec_latest/envs/global.env b/dockge/stream-rec_0_7_2/envs/global.env similarity index 100% rename from dockge/stream-rec_latest/envs/global.env rename to dockge/stream-rec_0_7_2/envs/global.env diff --git a/dockge/synapse/docker-compose.yml b/dockge/synapse/docker-compose.yml index 04a91d547..46ae6f001 100644 --- a/dockge/synapse/docker-compose.yml +++ b/dockge/synapse/docker-compose.yml @@ -9,7 +9,7 @@ services: env_file: - ./envs/global.env - .env - image: matrixdotorg/synapse:v1.150.0 + image: matrixdotorg/synapse:v1.151.0 labels: createdBy: Apps networks: @@ -31,7 +31,7 @@ services: - SYNAPSE_REPORT_STATS=no - SYNAPSE_NO_TLS=true - SYNAPSE_HTTP_PORT=8008 - image: matrixdotorg/synapse:v1.150.0 + image: matrixdotorg/synapse:v1.151.0 networks: - 1panel-network restart: false diff --git a/dockge/umami/docker-compose.yml b/dockge/umami/docker-compose.yml index 9b1f8f673..220221cf9 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:3.0.3 + image: umamisoftware/umami:postgresql-v2.20.0 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_20_0/.env b/dockge/umami_3_0_3/.env similarity index 100% rename from dockge/umami_2_20_0/.env rename to dockge/umami_3_0_3/.env diff --git a/dockge/umami_2_20_0/docker-compose.yml b/dockge/umami_3_0_3/docker-compose.yml similarity index 90% rename from dockge/umami_2_20_0/docker-compose.yml rename to dockge/umami_3_0_3/docker-compose.yml index 220221cf9..9b1f8f673 100644 --- a/dockge/umami_2_20_0/docker-compose.yml +++ b/dockge/umami_3_0_3/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.20.0 + image: umamisoftware/umami:3.0.3 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_20_0/envs/default.env b/dockge/umami_3_0_3/envs/default.env similarity index 100% rename from dockge/umami_2_20_0/envs/default.env rename to dockge/umami_3_0_3/envs/default.env diff --git a/dockge/umami_2_20_0/envs/global.env b/dockge/umami_3_0_3/envs/global.env similarity index 100% rename from dockge/umami_2_20_0/envs/global.env rename to dockge/umami_3_0_3/envs/global.env