diff --git a/dockge/alist-aria2/.env b/dockge/alist-aria2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-aria2/.env +++ b/dockge/alist-aria2/.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-aria2/docker-compose.yml b/dockge/alist-aria2/docker-compose.yml index 987544dc1..d11a2d481 100644 --- a/dockge/alist-aria2/docker-compose.yml +++ b/dockge/alist-aria2/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - alist-aria2: + openlist: container_name: alist-aria2 env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: xhofe/alist-aria2:v3.41.0 + image: openlistteam/openlist:v4.0.2-aria2 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-aria2_4_0_2/.env b/dockge/alist-aria2_3_41_0/.env similarity index 93% rename from dockge/alist-aria2_4_0_2/.env rename to dockge/alist-aria2_3_41_0/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-aria2_4_0_2/.env +++ b/dockge/alist-aria2_3_41_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-aria2_4_0_2/docker-compose.yml b/dockge/alist-aria2_3_41_0/docker-compose.yml similarity index 85% rename from dockge/alist-aria2_4_0_2/docker-compose.yml rename to dockge/alist-aria2_3_41_0/docker-compose.yml index d11a2d481..987544dc1 100644 --- a/dockge/alist-aria2_4_0_2/docker-compose.yml +++ b/dockge/alist-aria2_3_41_0/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - openlist: + alist-aria2: container_name: alist-aria2 env_file: - ./envs/global.env @@ -12,7 +12,7 @@ services: - PGID=0 - UMASK=022 - FORCE=false - image: openlistteam/openlist:v4.0.2-aria2 + image: xhofe/alist-aria2:v3.41.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-aria2_4_0_2/envs/default.env b/dockge/alist-aria2_3_41_0/envs/default.env similarity index 100% rename from dockge/alist-aria2_4_0_2/envs/default.env rename to dockge/alist-aria2_3_41_0/envs/default.env diff --git a/dockge/alist-aria2_4_0_2/envs/global.env b/dockge/alist-aria2_3_41_0/envs/global.env similarity index 100% rename from dockge/alist-aria2_4_0_2/envs/global.env rename to dockge/alist-aria2_3_41_0/envs/global.env 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_4_0_2/.env b/dockge/alist-ffmpeg_3_45_0/.env similarity index 93% rename from dockge/alist_4_0_2/.env rename to dockge/alist-ffmpeg_3_45_0/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist_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-ffmpeg_4_0_2/.env b/dockge/alist_3_45_0/.env similarity index 93% rename from dockge/alist-ffmpeg_4_0_2/.env rename to dockge/alist_3_45_0/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-ffmpeg_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 a488eb21e..9c6e13c66 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/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:v2.1.4 + image: wushuo894/ani-rss:v1.2.82 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_1_2_82/.env b/dockge/ani-rss_2_1_4/.env similarity index 100% rename from dockge/ani-rss_1_2_82/.env rename to dockge/ani-rss_2_1_4/.env diff --git a/dockge/ani-rss_1_2_82/docker-compose.yml b/dockge/ani-rss_2_1_4/docker-compose.yml similarity index 91% rename from dockge/ani-rss_1_2_82/docker-compose.yml rename to dockge/ani-rss_2_1_4/docker-compose.yml index 9c6e13c66..a488eb21e 100644 --- a/dockge/ani-rss_1_2_82/docker-compose.yml +++ b/dockge/ani-rss_2_1_4/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:v2.1.4 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_1_2_82/envs/default.env b/dockge/ani-rss_2_1_4/envs/default.env similarity index 100% rename from dockge/ani-rss_1_2_82/envs/default.env rename to dockge/ani-rss_2_1_4/envs/default.env diff --git a/dockge/ani-rss_1_2_82/envs/global.env b/dockge/ani-rss_2_1_4/envs/global.env similarity index 100% rename from dockge/ani-rss_1_2_82/envs/global.env rename to dockge/ani-rss_2_1_4/envs/global.env diff --git a/dockge/auto-lady/.env b/dockge/auto-lady/.env index 3258da058..a6f1eb1e9 100644 --- a/dockge/auto-lady/.env +++ b/dockge/auto-lady/.env @@ -13,9 +13,3 @@ CUSTOM_MOUNT_DIRECTORY_2= # 自定义挂载目录 3 CUSTOM_MOUNT_DIRECTORY_3= -# 网络代理地址 -HTTP_PROXY= - -# 跳过代理地址 -NO_PROXY=localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local - diff --git a/dockge/auto-lady/docker-compose.yml b/dockge/auto-lady/docker-compose.yml index d9c6c701e..40b13df53 100644 --- a/dockge/auto-lady/docker-compose.yml +++ b/dockge/auto-lady/docker-compose.yml @@ -7,11 +7,7 @@ services: env_file: - ./envs/global.env - .env - environment: - - HTTPS_PROXY=${HTTP_PROXY} - - HTTP_PROXY=${HTTP_PROXY:-} - - NO_PROXY=${NO_PROXY:-} - image: envyafish/byte-muse:1.5.3 + image: orekiiiiiiiiiiiii/auto-lady:1.4.5 labels: createdBy: Apps networks: diff --git a/dockge/auto-lady_1_4_5/.env b/dockge/auto-lady_1_5_3/.env similarity index 69% rename from dockge/auto-lady_1_4_5/.env rename to dockge/auto-lady_1_5_3/.env index a6f1eb1e9..3258da058 100644 --- a/dockge/auto-lady_1_4_5/.env +++ b/dockge/auto-lady_1_5_3/.env @@ -13,3 +13,9 @@ CUSTOM_MOUNT_DIRECTORY_2= # 自定义挂载目录 3 CUSTOM_MOUNT_DIRECTORY_3= +# 网络代理地址 +HTTP_PROXY= + +# 跳过代理地址 +NO_PROXY=localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local + diff --git a/dockge/auto-lady_1_4_5/docker-compose.yml b/dockge/auto-lady_1_5_3/docker-compose.yml similarity index 81% rename from dockge/auto-lady_1_4_5/docker-compose.yml rename to dockge/auto-lady_1_5_3/docker-compose.yml index 40b13df53..d9c6c701e 100644 --- a/dockge/auto-lady_1_4_5/docker-compose.yml +++ b/dockge/auto-lady_1_5_3/docker-compose.yml @@ -7,7 +7,11 @@ services: env_file: - ./envs/global.env - .env - image: orekiiiiiiiiiiiii/auto-lady:1.4.5 + environment: + - HTTPS_PROXY=${HTTP_PROXY} + - HTTP_PROXY=${HTTP_PROXY:-} + - NO_PROXY=${NO_PROXY:-} + image: envyafish/byte-muse:1.5.3 labels: createdBy: Apps networks: diff --git a/dockge/auto-lady_1_4_5/envs/default.env b/dockge/auto-lady_1_5_3/envs/default.env similarity index 100% rename from dockge/auto-lady_1_4_5/envs/default.env rename to dockge/auto-lady_1_5_3/envs/default.env diff --git a/dockge/auto-lady_1_4_5/envs/global.env b/dockge/auto-lady_1_5_3/envs/global.env similarity index 100% rename from dockge/auto-lady_1_4_5/envs/global.env rename to dockge/auto-lady_1_5_3/envs/global.env diff --git a/dockge/elastic-elasticsearch/docker-compose.yml b/dockge/elastic-elasticsearch/docker-compose.yml index a44294638..5a93faa12 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.0 + image: elasticsearch:9.1.0 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_1_0/.env b/dockge/elastic-elasticsearch_8_19_0/.env similarity index 100% rename from dockge/elastic-elasticsearch_9_1_0/.env rename to dockge/elastic-elasticsearch_8_19_0/.env diff --git a/dockge/elastic-elasticsearch_9_1_0/docker-compose.yml b/dockge/elastic-elasticsearch_8_19_0/docker-compose.yml similarity index 96% rename from dockge/elastic-elasticsearch_9_1_0/docker-compose.yml rename to dockge/elastic-elasticsearch_8_19_0/docker-compose.yml index 5a93faa12..a44294638 100644 --- a/dockge/elastic-elasticsearch_9_1_0/docker-compose.yml +++ b/dockge/elastic-elasticsearch_8_19_0/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.1.0 + image: elasticsearch:8.19.0 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_1_0/envs/default.env b/dockge/elastic-elasticsearch_8_19_0/envs/default.env similarity index 100% rename from dockge/elastic-elasticsearch_9_1_0/envs/default.env rename to dockge/elastic-elasticsearch_8_19_0/envs/default.env diff --git a/dockge/elastic-elasticsearch_9_1_0/envs/global.env b/dockge/elastic-elasticsearch_8_19_0/envs/global.env similarity index 100% rename from dockge/elastic-elasticsearch_9_1_0/envs/global.env rename to dockge/elastic-elasticsearch_8_19_0/envs/global.env diff --git a/dockge/elastic-kibana/docker-compose.yml b/dockge/elastic-kibana/docker-compose.yml index d4c406277..e80f8ec00 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.0 + image: kibana:9.1.0 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_9_1_0/.env b/dockge/elastic-kibana_8_19_0/.env similarity index 100% rename from dockge/elastic-kibana_9_1_0/.env rename to dockge/elastic-kibana_8_19_0/.env diff --git a/dockge/elastic-kibana_9_1_0/docker-compose.yml b/dockge/elastic-kibana_8_19_0/docker-compose.yml similarity index 95% rename from dockge/elastic-kibana_9_1_0/docker-compose.yml rename to dockge/elastic-kibana_8_19_0/docker-compose.yml index e80f8ec00..d4c406277 100644 --- a/dockge/elastic-kibana_9_1_0/docker-compose.yml +++ b/dockge/elastic-kibana_8_19_0/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:9.1.0 + image: kibana:8.19.0 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_9_1_0/envs/default.env b/dockge/elastic-kibana_8_19_0/envs/default.env similarity index 100% rename from dockge/elastic-kibana_9_1_0/envs/default.env rename to dockge/elastic-kibana_8_19_0/envs/default.env diff --git a/dockge/elastic-kibana_9_1_0/envs/global.env b/dockge/elastic-kibana_8_19_0/envs/global.env similarity index 100% rename from dockge/elastic-kibana_9_1_0/envs/global.env rename to dockge/elastic-kibana_8_19_0/envs/global.env diff --git a/dockge/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index b9c2d48c3..a461e63ac 100644 --- a/dockge/emby/docker-compose.yml +++ b/dockge/emby/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.1.17 + image: emby/embyserver:4.8.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/.env b/dockge/emby_4_9_1_17/.env similarity index 100% rename from dockge/emby_4_8_11_0/.env rename to dockge/emby_4_9_1_17/.env diff --git a/dockge/emby_4_8_11_0/docker-compose.yml b/dockge/emby_4_9_1_17/docker-compose.yml similarity index 96% rename from dockge/emby_4_8_11_0/docker-compose.yml rename to dockge/emby_4_9_1_17/docker-compose.yml index a461e63ac..b9c2d48c3 100644 --- a/dockge/emby_4_8_11_0/docker-compose.yml +++ b/dockge/emby_4_9_1_17/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.8.11.0 + image: emby/embyserver:4.9.1.17 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/envs/default.env b/dockge/emby_4_9_1_17/envs/default.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/default.env rename to dockge/emby_4_9_1_17/envs/default.env diff --git a/dockge/emby_4_8_11_0/envs/global.env b/dockge/emby_4_9_1_17/envs/global.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/global.env rename to dockge/emby_4_9_1_17/envs/global.env diff --git a/dockge/homarr/.env b/dockge/homarr/.env index ab5a7db42..c89cdb369 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -4,3 +4,6 @@ HOMARR_ROOT_PATH=/home/homarr # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=7575 +# 密钥 [必填] +SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d + diff --git a/dockge/homarr/docker-compose.yml b/dockge/homarr/docker-compose.yml index 3b26c2c66..b21ac42c4 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.15.10 + image: ghcr.io/homarr-labs/homarr:v1.31.0 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_1_31_0/.env b/dockge/homarr_0_15_10/.env similarity index 52% rename from dockge/homarr_1_31_0/.env rename to dockge/homarr_0_15_10/.env index c89cdb369..ab5a7db42 100644 --- a/dockge/homarr_1_31_0/.env +++ b/dockge/homarr_0_15_10/.env @@ -4,6 +4,3 @@ HOMARR_ROOT_PATH=/home/homarr # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=7575 -# 密钥 [必填] -SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d - diff --git a/dockge/homarr_1_31_0/docker-compose.yml b/dockge/homarr_0_15_10/docker-compose.yml similarity index 65% rename from dockge/homarr_1_31_0/docker-compose.yml rename to dockge/homarr_0_15_10/docker-compose.yml index b21ac42c4..3b26c2c66 100644 --- a/dockge/homarr_1_31_0/docker-compose.yml +++ b/dockge/homarr_0_15_10/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/homarr-labs/homarr:v1.31.0 + 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_1_31_0/envs/default.env b/dockge/homarr_0_15_10/envs/default.env similarity index 100% rename from dockge/homarr_1_31_0/envs/default.env rename to dockge/homarr_0_15_10/envs/default.env diff --git a/dockge/homarr_1_31_0/envs/global.env b/dockge/homarr_0_15_10/envs/global.env similarity index 100% rename from dockge/homarr_1_31_0/envs/global.env rename to dockge/homarr_0_15_10/envs/global.env diff --git a/dockge/immich-machine-learning/docker-compose.yml b/dockge/immich-machine-learning/docker-compose.yml index 7e51478d0..0c0530ffe 100644 --- a/dockge/immich-machine-learning/docker-compose.yml +++ b/dockge/immich-machine-learning/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.136.0 + image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 labels: createdBy: Apps networks: diff --git a/dockge/immich-machine-learning_1_132_3/.env b/dockge/immich-machine-learning_1_136_0/.env similarity index 100% rename from dockge/immich-machine-learning_1_132_3/.env rename to dockge/immich-machine-learning_1_136_0/.env diff --git a/dockge/immich-machine-learning_1_132_3/docker-compose.yml b/dockge/immich-machine-learning_1_136_0/docker-compose.yml similarity index 87% rename from dockge/immich-machine-learning_1_132_3/docker-compose.yml rename to dockge/immich-machine-learning_1_136_0/docker-compose.yml index 0c0530ffe..7e51478d0 100644 --- a/dockge/immich-machine-learning_1_132_3/docker-compose.yml +++ b/dockge/immich-machine-learning_1_136_0/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 + image: ghcr.io/immich-app/immich-machine-learning:v1.136.0 labels: createdBy: Apps networks: diff --git a/dockge/immich-machine-learning_1_132_3/envs/default.env b/dockge/immich-machine-learning_1_136_0/envs/default.env similarity index 100% rename from dockge/immich-machine-learning_1_132_3/envs/default.env rename to dockge/immich-machine-learning_1_136_0/envs/default.env diff --git a/dockge/immich-machine-learning_1_132_3/envs/global.env b/dockge/immich-machine-learning_1_136_0/envs/global.env similarity index 100% rename from dockge/immich-machine-learning_1_132_3/envs/global.env rename to dockge/immich-machine-learning_1_136_0/envs/global.env diff --git a/dockge/immich-no-machine/docker-compose.yml b/dockge/immich-no-machine/docker-compose.yml index f953ba274..0ad713e57 100644 --- a/dockge/immich-no-machine/docker-compose.yml +++ b/dockge/immich-no-machine/docker-compose.yml @@ -4,13 +4,36 @@ networks: external: true services: immich-pg14-vectors: + command: + - postgres + - -c + - shared_preload_libraries=vectors.so + - -c + - search_path="$$user", public, vectors + - -c + - logging_collector=on + - -c + - max_wal_size=2GB + - -c + - shared_buffers=512MB + - -c + - wal_compression=on container_name: pg14-vectors-immich-no-machine environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0 + healthcheck: + interval: 5m + start_interval: 30s + start_period: 5m + test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' + || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' + --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), + 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ + "$$Chksum" = '0' ] || exit 1 + image: tensorchord/pgvecto-rs:pg14-v0.2.0 labels: createdBy: Apps networks: @@ -29,7 +52,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.136.0 + image: ghcr.io/immich-app/immich-server:v1.132.3 labels: createdBy: Apps networks: diff --git a/dockge/immich-no-machine_1_132_3/.env b/dockge/immich-no-machine_1_136_0/.env similarity index 100% rename from dockge/immich-no-machine_1_132_3/.env rename to dockge/immich-no-machine_1_136_0/.env diff --git a/dockge/immich-no-machine_1_132_3/docker-compose.yml b/dockge/immich-no-machine_1_136_0/docker-compose.yml similarity index 54% rename from dockge/immich-no-machine_1_132_3/docker-compose.yml rename to dockge/immich-no-machine_1_136_0/docker-compose.yml index 0ad713e57..f953ba274 100644 --- a/dockge/immich-no-machine_1_132_3/docker-compose.yml +++ b/dockge/immich-no-machine_1_136_0/docker-compose.yml @@ -4,36 +4,13 @@ networks: external: true services: immich-pg14-vectors: - command: - - postgres - - -c - - shared_preload_libraries=vectors.so - - -c - - search_path="$$user", public, vectors - - -c - - logging_collector=on - - -c - - max_wal_size=2GB - - -c - - shared_buffers=512MB - - -c - - wal_compression=on container_name: pg14-vectors-immich-no-machine environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - healthcheck: - interval: 5m - start_interval: 30s - start_period: 5m - test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), - 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ - "$$Chksum" = '0' ] || exit 1 - image: tensorchord/pgvecto-rs:pg14-v0.2.0 + image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0 labels: createdBy: Apps networks: @@ -52,7 +29,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 + image: ghcr.io/immich-app/immich-server:v1.136.0 labels: createdBy: Apps networks: diff --git a/dockge/immich-no-machine_1_132_3/envs/default.env b/dockge/immich-no-machine_1_136_0/envs/default.env similarity index 100% rename from dockge/immich-no-machine_1_132_3/envs/default.env rename to dockge/immich-no-machine_1_136_0/envs/default.env diff --git a/dockge/immich-no-machine_1_132_3/envs/global.env b/dockge/immich-no-machine_1_136_0/envs/global.env similarity index 100% rename from dockge/immich-no-machine_1_132_3/envs/global.env rename to dockge/immich-no-machine_1_136_0/envs/global.env diff --git a/dockge/immich-server/docker-compose.yml b/dockge/immich-server/docker-compose.yml index 90cd2aad0..1f7695a07 100644 --- a/dockge/immich-server/docker-compose.yml +++ b/dockge/immich-server/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.136.0 + image: ghcr.io/immich-app/immich-server:v1.132.3 labels: createdBy: Apps networks: diff --git a/dockge/immich-server_1_132_3/.env b/dockge/immich-server_1_136_0/.env similarity index 100% rename from dockge/immich-server_1_132_3/.env rename to dockge/immich-server_1_136_0/.env diff --git a/dockge/immich-server_1_132_3/docker-compose.yml b/dockge/immich-server_1_136_0/docker-compose.yml similarity index 89% rename from dockge/immich-server_1_132_3/docker-compose.yml rename to dockge/immich-server_1_136_0/docker-compose.yml index 1f7695a07..90cd2aad0 100644 --- a/dockge/immich-server_1_132_3/docker-compose.yml +++ b/dockge/immich-server_1_136_0/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 + image: ghcr.io/immich-app/immich-server:v1.136.0 labels: createdBy: Apps networks: diff --git a/dockge/immich-server_1_132_3/envs/default.env b/dockge/immich-server_1_136_0/envs/default.env similarity index 100% rename from dockge/immich-server_1_132_3/envs/default.env rename to dockge/immich-server_1_136_0/envs/default.env diff --git a/dockge/immich-server_1_132_3/envs/global.env b/dockge/immich-server_1_136_0/envs/global.env similarity index 100% rename from dockge/immich-server_1_132_3/envs/global.env rename to dockge/immich-server_1_136_0/envs/global.env diff --git a/dockge/immich/docker-compose.yml b/dockge/immich/docker-compose.yml index b1db34b69..44a2398ec 100644 --- a/dockge/immich/docker-compose.yml +++ b/dockge/immich/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.136.0 + image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 labels: createdBy: Apps networks: @@ -21,13 +21,36 @@ services: volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache immich-pg14-vectors: + command: + - postgres + - -c + - shared_preload_libraries=vectors.so + - -c + - search_path="$$user", public, vectors + - -c + - logging_collector=on + - -c + - max_wal_size=2GB + - -c + - shared_buffers=512MB + - -c + - wal_compression=on container_name: pg14-vectors-immich environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - image: ghcr.io/immich-app/postgres:14-vectorchord0.4.1-pgvectors0.2.0 + healthcheck: + interval: 5m + start_interval: 30s + start_period: 5m + test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' + || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' + --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), + 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ + "$$Chksum" = '0' ] || exit 1 + image: tensorchord/pgvecto-rs:pg14-v0.2.0 labels: createdBy: Apps networks: @@ -45,7 +68,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.136.0 + image: ghcr.io/immich-app/immich-server:v1.132.3 labels: createdBy: Apps networks: diff --git a/dockge/immich_1_132_3/.env b/dockge/immich_1_136_0/.env similarity index 100% rename from dockge/immich_1_132_3/.env rename to dockge/immich_1_136_0/.env diff --git a/dockge/immich_1_132_3/docker-compose.yml b/dockge/immich_1_136_0/docker-compose.yml similarity index 59% rename from dockge/immich_1_132_3/docker-compose.yml rename to dockge/immich_1_136_0/docker-compose.yml index 44a2398ec..b1db34b69 100644 --- a/dockge/immich_1_132_3/docker-compose.yml +++ b/dockge/immich_1_136_0/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 + image: ghcr.io/immich-app/immich-machine-learning:v1.136.0 labels: createdBy: Apps networks: @@ -21,36 +21,13 @@ services: volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache immich-pg14-vectors: - command: - - postgres - - -c - - shared_preload_libraries=vectors.so - - -c - - search_path="$$user", public, vectors - - -c - - logging_collector=on - - -c - - max_wal_size=2GB - - -c - - shared_buffers=512MB - - -c - - wal_compression=on container_name: pg14-vectors-immich environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - healthcheck: - interval: 5m - start_interval: 30s - start_period: 5m - test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), - 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ - "$$Chksum" = '0' ] || exit 1 - image: tensorchord/pgvecto-rs:pg14-v0.2.0 + image: ghcr.io/immich-app/postgres:14-vectorchord0.4.1-pgvectors0.2.0 labels: createdBy: Apps networks: @@ -68,7 +45,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 + image: ghcr.io/immich-app/immich-server:v1.136.0 labels: createdBy: Apps networks: diff --git a/dockge/immich_1_132_3/envs/default.env b/dockge/immich_1_136_0/envs/default.env similarity index 100% rename from dockge/immich_1_132_3/envs/default.env rename to dockge/immich_1_136_0/envs/default.env diff --git a/dockge/immich_1_132_3/envs/global.env b/dockge/immich_1_136_0/envs/global.env similarity index 100% rename from dockge/immich_1_132_3/envs/global.env rename to dockge/immich_1_136_0/envs/global.env diff --git a/dockge/libretv/docker-compose.yml b/dockge/libretv/docker-compose.yml index 61f39a480..2e6239d93 100644 --- a/dockge/libretv/docker-compose.yml +++ b/dockge/libretv/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: bestzwei/libretv:latest + image: bestzwei/libretv:202508060117 labels: createdBy: Apps networks: diff --git a/dockge/libretv_202508060117/.env b/dockge/libretv_latest/.env similarity index 100% rename from dockge/libretv_202508060117/.env rename to dockge/libretv_latest/.env diff --git a/dockge/libretv_202508060117/docker-compose.yml b/dockge/libretv_latest/docker-compose.yml similarity index 88% rename from dockge/libretv_202508060117/docker-compose.yml rename to dockge/libretv_latest/docker-compose.yml index 2e6239d93..61f39a480 100644 --- a/dockge/libretv_202508060117/docker-compose.yml +++ b/dockge/libretv_latest/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: bestzwei/libretv:202508060117 + image: bestzwei/libretv:latest labels: createdBy: Apps networks: diff --git a/dockge/libretv_202508060117/envs/default.env b/dockge/libretv_latest/envs/default.env similarity index 100% rename from dockge/libretv_202508060117/envs/default.env rename to dockge/libretv_latest/envs/default.env diff --git a/dockge/libretv_202508060117/envs/global.env b/dockge/libretv_latest/envs/global.env similarity index 100% rename from dockge/libretv_202508060117/envs/global.env rename to dockge/libretv_latest/envs/global.env diff --git a/dockge/minio/docker-compose.yml b/dockge/minio/docker-compose.yml index c50712755..38508b45b 100644 --- a/dockge/minio/docker-compose.yml +++ b/dockge/minio/docker-compose.yml @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z + image: minio/minio:RELEASE.2025-07-23T15-54-02Z labels: createdBy: Apps logging: diff --git a/dockge/minio_2025-07-23/.env b/dockge/minio_2025-04-22/.env similarity index 100% rename from dockge/minio_2025-07-23/.env rename to dockge/minio_2025-04-22/.env diff --git a/dockge/minio_2025-07-23/docker-compose.yml b/dockge/minio_2025-04-22/docker-compose.yml similarity index 93% rename from dockge/minio_2025-07-23/docker-compose.yml rename to dockge/minio_2025-04-22/docker-compose.yml index 38508b45b..c50712755 100644 --- a/dockge/minio_2025-07-23/docker-compose.yml +++ b/dockge/minio_2025-04-22/docker-compose.yml @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: minio/minio:RELEASE.2025-07-23T15-54-02Z + image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z labels: createdBy: Apps logging: diff --git a/dockge/minio_2025-07-23/envs/default.env b/dockge/minio_2025-04-22/envs/default.env similarity index 100% rename from dockge/minio_2025-07-23/envs/default.env rename to dockge/minio_2025-04-22/envs/default.env diff --git a/dockge/minio_2025-07-23/envs/global.env b/dockge/minio_2025-04-22/envs/global.env similarity index 100% rename from dockge/minio_2025-07-23/envs/global.env rename to dockge/minio_2025-04-22/envs/global.env diff --git a/dockge/nezha/.env b/dockge/nezha/.env index 54509260f..6adf2af10 100644 --- a/dockge/nezha/.env +++ b/dockge/nezha/.env @@ -4,30 +4,39 @@ NEZHA_ROOT_PATH=/home/nezha # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=8008 -# gRPC 端口 [必填] -PANEL_APP_PORT_GRPC=5555 +# 系统语言 [必填] +NZ_LANGUAGE=zh_CN + +# 数据持久化路径 [必填] +NZ_SITE_NAME=哪吒监控 + +# Agent是否启用TLS [必填] +NZ_TLS=false # OAuth 服务商 [必填] -OAUTH2_TYPE=github +NZ_OAUTH2_TYPE=github # 管理员账号ID [必填] -OAUTH2_ADMIN= +NZ_OAUTH2_ADMIN= # OAuth 客户端 ID [必填] -OAUTH2_CLIENTID= +NZ_OAUTH2_CLIENTID= # OAuth 客户端 Secret [必填] -OAUTH2_CLIENTSECRET= +NZ_OAUTH2_CLIENTSECRET= # OAuth 端点 (可选) -OAUTH2_ENDPOINT= +NZ_OAUTH2_ENDPOINT= -# 网站标题 [必填] -NZ_SITE_TITLE=哪吒监控 +# 登录有效期 (小时) [必填] +NZ_JWT_TIMEOUT=1 -# Cookie 名称 (默认) [必填] -NZ_COOKIE_NAME=nezha-dashboard +# 强制认证 [必填] +NZ_FORCE_AUTH=false -# 网站主题 (默认) [必填] -NZ_THEME=default +# 是否脱敏通知IP [必填] +NZ_ENABLE_PLAIN_IP_IN_NOTIFICATION=false + +# IP 变更通知 [必填] +NZ_ENABLE_IP_CHANGE_NOTIFICATION=false diff --git a/dockge/nezha/data/config-example.yaml b/dockge/nezha/data/config-example.yaml index d063cf9f9..f9d20745b 100644 --- a/dockge/nezha/data/config-example.yaml +++ b/dockge/nezha/data/config-example.yaml @@ -1,33 +1,6 @@ debug: false -httpport: 80 -language: zh-CN -grpcport: nz_grpc_port -oauth2: - type: "nz_oauth2_type" - admin: "nz_admin_logins" - clientid: "nz_github_oauth_client_id" - clientsecret: "nz_github_oauth_client_secret" - endpoint: "" -site: - brand: "nz_site_title" - cookiename: "nezha-dashboard" - theme: "default" -ddns: - enable: false - provider: "webhook" - accessid: "" - accesssecret: "" - webhookmethod: "" - webhookurl: "" - webhookrequestbody: "" - webhookheaders: "" - maxretries: 3 - profiles: - example: - provider: "" - accessid: "" - accesssecret: "" - webhookmethod: "" - webhookurl: "" - webhookrequestbody: "" - webhookheaders: "" +listen_port: 8008 +language: zh_CN +site_name: "nz_site_title" +install_host: 127.0.0.1:8008 +tls: false diff --git a/dockge/nezha/docker-compose.yml b/dockge/nezha/docker-compose.yml index ff7b23dd8..707dfd991 100644 --- a/dockge/nezha/docker-compose.yml +++ b/dockge/nezha/docker-compose.yml @@ -2,19 +2,18 @@ networks: 1panel-network: external: true services: - nezha-dashboard: + nezha: container_name: nezha - image: ghcr.io/naiba/nezha-dashboard:v0.20.13 + environment: + - NZ_LISTEN_PORT=${PANEL_APP_PORT_HTTP} + - NZ_LOCATION=Asia/Shanghai + image: ghcr.io/nezhahq/nezha:v1.13.0 labels: createdBy: Apps networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:80 - - ${PANEL_APP_PORT_GRPC}:${PANEL_APP_PORT_GRPC} + - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} restart: always volumes: - ${NEZHA_ROOT_PATH}/data:/dashboard/data - - ${NEZHA_ROOT_PATH}/static-custom/static:/dashboard/resource/static/custom - - ${NEZHA_ROOT_PATH}/theme-custom/template:/dashboard/resource/template/theme-custom - - ${NEZHA_ROOT_PATH}/dashboard-custom/template:/dashboard/resource/template/dashboard-custom diff --git a/dockge/nezha_0_20_13/.env b/dockge/nezha_0_20_13/.env new file mode 100644 index 000000000..54509260f --- /dev/null +++ b/dockge/nezha_0_20_13/.env @@ -0,0 +1,33 @@ +# 数据持久化路径 [必填] +NEZHA_ROOT_PATH=/home/nezha + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8008 + +# gRPC 端口 [必填] +PANEL_APP_PORT_GRPC=5555 + +# OAuth 服务商 [必填] +OAUTH2_TYPE=github + +# 管理员账号ID [必填] +OAUTH2_ADMIN= + +# OAuth 客户端 ID [必填] +OAUTH2_CLIENTID= + +# OAuth 客户端 Secret [必填] +OAUTH2_CLIENTSECRET= + +# OAuth 端点 (可选) +OAUTH2_ENDPOINT= + +# 网站标题 [必填] +NZ_SITE_TITLE=哪吒监控 + +# Cookie 名称 (默认) [必填] +NZ_COOKIE_NAME=nezha-dashboard + +# 网站主题 (默认) [必填] +NZ_THEME=default + diff --git a/dockge/nezha_0_20_13/data/config-example.yaml b/dockge/nezha_0_20_13/data/config-example.yaml new file mode 100644 index 000000000..d063cf9f9 --- /dev/null +++ b/dockge/nezha_0_20_13/data/config-example.yaml @@ -0,0 +1,33 @@ +debug: false +httpport: 80 +language: zh-CN +grpcport: nz_grpc_port +oauth2: + type: "nz_oauth2_type" + admin: "nz_admin_logins" + clientid: "nz_github_oauth_client_id" + clientsecret: "nz_github_oauth_client_secret" + endpoint: "" +site: + brand: "nz_site_title" + cookiename: "nezha-dashboard" + theme: "default" +ddns: + enable: false + provider: "webhook" + accessid: "" + accesssecret: "" + webhookmethod: "" + webhookurl: "" + webhookrequestbody: "" + webhookheaders: "" + maxretries: 3 + profiles: + example: + provider: "" + accessid: "" + accesssecret: "" + webhookmethod: "" + webhookurl: "" + webhookrequestbody: "" + webhookheaders: "" diff --git a/dockge/nezha_0_20_13/docker-compose.yml b/dockge/nezha_0_20_13/docker-compose.yml new file mode 100644 index 000000000..ff7b23dd8 --- /dev/null +++ b/dockge/nezha_0_20_13/docker-compose.yml @@ -0,0 +1,20 @@ +networks: + 1panel-network: + external: true +services: + nezha-dashboard: + container_name: nezha + image: ghcr.io/naiba/nezha-dashboard:v0.20.13 + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:80 + - ${PANEL_APP_PORT_GRPC}:${PANEL_APP_PORT_GRPC} + restart: always + volumes: + - ${NEZHA_ROOT_PATH}/data:/dashboard/data + - ${NEZHA_ROOT_PATH}/static-custom/static:/dashboard/resource/static/custom + - ${NEZHA_ROOT_PATH}/theme-custom/template:/dashboard/resource/template/theme-custom + - ${NEZHA_ROOT_PATH}/dashboard-custom/template:/dashboard/resource/template/dashboard-custom diff --git a/dockge/nezha_1_13_0/envs/default.env b/dockge/nezha_0_20_13/envs/default.env similarity index 100% rename from dockge/nezha_1_13_0/envs/default.env rename to dockge/nezha_0_20_13/envs/default.env diff --git a/dockge/nezha_1_13_0/envs/global.env b/dockge/nezha_0_20_13/envs/global.env similarity index 100% rename from dockge/nezha_1_13_0/envs/global.env rename to dockge/nezha_0_20_13/envs/global.env diff --git a/dockge/nezha_1_13_0/.env b/dockge/nezha_1_13_0/.env deleted file mode 100644 index 6adf2af10..000000000 --- a/dockge/nezha_1_13_0/.env +++ /dev/null @@ -1,42 +0,0 @@ -# 数据持久化路径 [必填] -NEZHA_ROOT_PATH=/home/nezha - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8008 - -# 系统语言 [必填] -NZ_LANGUAGE=zh_CN - -# 数据持久化路径 [必填] -NZ_SITE_NAME=哪吒监控 - -# Agent是否启用TLS [必填] -NZ_TLS=false - -# OAuth 服务商 [必填] -NZ_OAUTH2_TYPE=github - -# 管理员账号ID [必填] -NZ_OAUTH2_ADMIN= - -# OAuth 客户端 ID [必填] -NZ_OAUTH2_CLIENTID= - -# OAuth 客户端 Secret [必填] -NZ_OAUTH2_CLIENTSECRET= - -# OAuth 端点 (可选) -NZ_OAUTH2_ENDPOINT= - -# 登录有效期 (小时) [必填] -NZ_JWT_TIMEOUT=1 - -# 强制认证 [必填] -NZ_FORCE_AUTH=false - -# 是否脱敏通知IP [必填] -NZ_ENABLE_PLAIN_IP_IN_NOTIFICATION=false - -# IP 变更通知 [必填] -NZ_ENABLE_IP_CHANGE_NOTIFICATION=false - diff --git a/dockge/nezha_1_13_0/data/config-example.yaml b/dockge/nezha_1_13_0/data/config-example.yaml deleted file mode 100644 index f9d20745b..000000000 --- a/dockge/nezha_1_13_0/data/config-example.yaml +++ /dev/null @@ -1,6 +0,0 @@ -debug: false -listen_port: 8008 -language: zh_CN -site_name: "nz_site_title" -install_host: 127.0.0.1:8008 -tls: false diff --git a/dockge/nezha_1_13_0/docker-compose.yml b/dockge/nezha_1_13_0/docker-compose.yml deleted file mode 100644 index 707dfd991..000000000 --- a/dockge/nezha_1_13_0/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -networks: - 1panel-network: - external: true -services: - nezha: - container_name: nezha - environment: - - NZ_LISTEN_PORT=${PANEL_APP_PORT_HTTP} - - NZ_LOCATION=Asia/Shanghai - image: ghcr.io/nezhahq/nezha:v1.13.0 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - restart: always - volumes: - - ${NEZHA_ROOT_PATH}/data:/dashboard/data diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index 531217471..69148bf8c 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg16-postgresql + container_name: postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:16 + image: postgres:17.5-alpine labels: createdBy: Apps networks: diff --git a/dockge/postgresql_17_5-alpine/.env b/dockge/postgresql_pg16/.env similarity index 100% rename from dockge/postgresql_17_5-alpine/.env rename to dockge/postgresql_pg16/.env diff --git a/dockge/postgresql_17_5-alpine/docker-compose.yml b/dockge/postgresql_pg16/docker-compose.yml similarity index 89% rename from dockge/postgresql_17_5-alpine/docker-compose.yml rename to dockge/postgresql_pg16/docker-compose.yml index 69148bf8c..531217471 100644 --- a/dockge/postgresql_17_5-alpine/docker-compose.yml +++ b/dockge/postgresql_pg16/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: postgresql + container_name: pg16-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:17.5-alpine + image: postgres:16 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_17_5-alpine/envs/default.env b/dockge/postgresql_pg16/envs/default.env similarity index 100% rename from dockge/postgresql_17_5-alpine/envs/default.env rename to dockge/postgresql_pg16/envs/default.env diff --git a/dockge/postgresql_17_5-alpine/envs/global.env b/dockge/postgresql_pg16/envs/global.env similarity index 100% rename from dockge/postgresql_17_5-alpine/envs/global.env rename to dockge/postgresql_pg16/envs/global.env diff --git a/dockge/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index 5ec4b458b..116044519 100644 --- a/dockge/qbittorrent/docker-compose.yml +++ b/dockge/qbittorrent/docker-compose.yml @@ -12,7 +12,7 @@ services: - UMASK=022 - WEBUI_PORT=${PANEL_APP_PORT_HTTP} - TORRENTING_PORT=${PANEL_APP_PORT_TORRENTING} - image: linuxserver/qbittorrent:4.6.7 + image: linuxserver/qbittorrent:5.1.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_1_2/.env b/dockge/qbittorrent_4_6_7/.env similarity index 100% rename from dockge/qbittorrent_5_1_2/.env rename to dockge/qbittorrent_4_6_7/.env diff --git a/dockge/qbittorrent_5_1_2/docker-compose.yml b/dockge/qbittorrent_4_6_7/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_5_1_2/docker-compose.yml rename to dockge/qbittorrent_4_6_7/docker-compose.yml index 116044519..5ec4b458b 100644 --- a/dockge/qbittorrent_5_1_2/docker-compose.yml +++ b/dockge/qbittorrent_4_6_7/docker-compose.yml @@ -12,7 +12,7 @@ services: - UMASK=022 - WEBUI_PORT=${PANEL_APP_PORT_HTTP} - TORRENTING_PORT=${PANEL_APP_PORT_TORRENTING} - image: linuxserver/qbittorrent:5.1.2 + image: linuxserver/qbittorrent:4.6.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_1_2/envs/default.env b/dockge/qbittorrent_4_6_7/envs/default.env similarity index 100% rename from dockge/qbittorrent_5_1_2/envs/default.env rename to dockge/qbittorrent_4_6_7/envs/default.env diff --git a/dockge/qbittorrent_5_1_2/envs/global.env b/dockge/qbittorrent_4_6_7/envs/global.env similarity index 100% rename from dockge/qbittorrent_5_1_2/envs/global.env rename to dockge/qbittorrent_4_6_7/envs/global.env diff --git a/dockge/rustdesk-api/.env b/dockge/rustdesk-api/.env index 057e9b006..96a0fb5a5 100644 --- a/dockge/rustdesk-api/.env +++ b/dockge/rustdesk-api/.env @@ -4,7 +4,7 @@ RUSTDESK_API_ROOT_PATH=/home/rustdesk-api # WebUI API 端口 [必填] PANEL_APP_PORT_HTTP=21114 -# NAT 测试服务端口 [必填] +# NAT 服务端口 [必填] PANEL_APP_PORT_NAT=21115 # ID 服务端口 [必填] diff --git a/dockge/rustdesk-api/docker-compose.yml b/dockge/rustdesk-api/docker-compose.yml index aad6a35ef..fbb90722f 100644 --- a/dockge/rustdesk-api/docker-compose.yml +++ b/dockge/rustdesk-api/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - rustdesk: + rustdesk-api: container_name: rustdesk-api env_file: - ./envs/global.env @@ -10,16 +10,33 @@ services: environment: - TZ=Asia/Shanghai - RUSTDESK_API_LANG=zh-CN + image: lejianwen/rustdesk-api:v2.6.25 + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:21114 + restart: always + volumes: + - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data + - ${RUSTDESK_API_ROOT_PATH}/api-config:/app/config + rustdesk-server-s6: + container_name: server-rustdesk-api + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - RUSTDESK_API_LANG=zh-CN - RELAY=${RUSTDESK_SERVER_URL} - ENCRYPTED_ONLY=1 - - MUST_LOGIN=N - image: lejianwen/rustdesk-server-s6:latest + image: rustdesk/rustdesk-server-s6:latest labels: createdBy: Apps networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:21114 - ${PANEL_APP_PORT_NAT}:21115 - ${PANEL_APP_PORT_ID}:21116 - ${PANEL_APP_PORT_ID}:21116/udp @@ -29,7 +46,5 @@ services: restart: always volumes: - ${RUSTDESK_API_ROOT_PATH}/server-data:/data - - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data - - ${RUSTDESK_API_ROOT_PATH}/api-config:/app/config - ${HBBR_RUN_FILE:-./conf/hbbr/run}:/etc/s6-overlay/s6-rc.d/hbbr/run - ${HBBS_RUN_FILE:-./conf/hbbs/run}:/etc/s6-overlay/s6-rc.d/hbbs/run diff --git a/dockge/rustdesk-api_2_6_25/.env b/dockge/rustdesk-api_s6-latest/.env similarity index 97% rename from dockge/rustdesk-api_2_6_25/.env rename to dockge/rustdesk-api_s6-latest/.env index 96a0fb5a5..057e9b006 100644 --- a/dockge/rustdesk-api_2_6_25/.env +++ b/dockge/rustdesk-api_s6-latest/.env @@ -4,7 +4,7 @@ RUSTDESK_API_ROOT_PATH=/home/rustdesk-api # WebUI API 端口 [必填] PANEL_APP_PORT_HTTP=21114 -# NAT 服务端口 [必填] +# NAT 测试服务端口 [必填] PANEL_APP_PORT_NAT=21115 # ID 服务端口 [必填] diff --git a/dockge/rustdesk-api_2_6_25/conf/hbbr/run b/dockge/rustdesk-api_s6-latest/conf/hbbr/run similarity index 100% rename from dockge/rustdesk-api_2_6_25/conf/hbbr/run rename to dockge/rustdesk-api_s6-latest/conf/hbbr/run diff --git a/dockge/rustdesk-api_2_6_25/conf/hbbs/run b/dockge/rustdesk-api_s6-latest/conf/hbbs/run similarity index 100% rename from dockge/rustdesk-api_2_6_25/conf/hbbs/run rename to dockge/rustdesk-api_s6-latest/conf/hbbs/run diff --git a/dockge/rustdesk-api_2_6_25/docker-compose.yml b/dockge/rustdesk-api_s6-latest/docker-compose.yml similarity index 70% rename from dockge/rustdesk-api_2_6_25/docker-compose.yml rename to dockge/rustdesk-api_s6-latest/docker-compose.yml index fbb90722f..aad6a35ef 100644 --- a/dockge/rustdesk-api_2_6_25/docker-compose.yml +++ b/dockge/rustdesk-api_s6-latest/docker-compose.yml @@ -2,7 +2,7 @@ networks: 1panel-network: external: true services: - rustdesk-api: + rustdesk: container_name: rustdesk-api env_file: - ./envs/global.env @@ -10,33 +10,16 @@ services: environment: - TZ=Asia/Shanghai - RUSTDESK_API_LANG=zh-CN - image: lejianwen/rustdesk-api:v2.6.25 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:21114 - restart: always - volumes: - - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data - - ${RUSTDESK_API_ROOT_PATH}/api-config:/app/config - rustdesk-server-s6: - container_name: server-rustdesk-api - env_file: - - ./envs/global.env - - .env - environment: - - TZ=Asia/Shanghai - - RUSTDESK_API_LANG=zh-CN - RELAY=${RUSTDESK_SERVER_URL} - ENCRYPTED_ONLY=1 - image: rustdesk/rustdesk-server-s6:latest + - MUST_LOGIN=N + image: lejianwen/rustdesk-server-s6:latest labels: createdBy: Apps networks: - 1panel-network ports: + - ${PANEL_APP_PORT_HTTP}:21114 - ${PANEL_APP_PORT_NAT}:21115 - ${PANEL_APP_PORT_ID}:21116 - ${PANEL_APP_PORT_ID}:21116/udp @@ -46,5 +29,7 @@ services: restart: always volumes: - ${RUSTDESK_API_ROOT_PATH}/server-data:/data + - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data + - ${RUSTDESK_API_ROOT_PATH}/api-config:/app/config - ${HBBR_RUN_FILE:-./conf/hbbr/run}:/etc/s6-overlay/s6-rc.d/hbbr/run - ${HBBS_RUN_FILE:-./conf/hbbs/run}:/etc/s6-overlay/s6-rc.d/hbbs/run diff --git a/dockge/rustdesk-api_2_6_25/envs/default.env b/dockge/rustdesk-api_s6-latest/envs/default.env similarity index 100% rename from dockge/rustdesk-api_2_6_25/envs/default.env rename to dockge/rustdesk-api_s6-latest/envs/default.env diff --git a/dockge/rustdesk-api_2_6_25/envs/global.env b/dockge/rustdesk-api_s6-latest/envs/global.env similarity index 100% rename from dockge/rustdesk-api_2_6_25/envs/global.env rename to dockge/rustdesk-api_s6-latest/envs/global.env diff --git a/dockge/stream-rec-backend/docker-compose.yml b/dockge/stream-rec-backend/docker-compose.yml index cca1bacc5..0d6d2566e 100644 --- a/dockge/stream-rec-backend/docker-compose.yml +++ b/dockge/stream-rec-backend/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:main + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_0_7_2/.env b/dockge/stream-rec-backend_main/.env similarity index 100% rename from dockge/stream-rec-backend_0_7_2/.env rename to dockge/stream-rec-backend_main/.env diff --git a/dockge/stream-rec-backend_0_7_2/docker-compose.yml b/dockge/stream-rec-backend_main/docker-compose.yml similarity index 92% rename from dockge/stream-rec-backend_0_7_2/docker-compose.yml rename to dockge/stream-rec-backend_main/docker-compose.yml index 0d6d2566e..cca1bacc5 100644 --- a/dockge/stream-rec-backend_0_7_2/docker-compose.yml +++ b/dockge/stream-rec-backend_main/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_0_7_2/envs/default.env b/dockge/stream-rec-backend_main/envs/default.env similarity index 100% rename from dockge/stream-rec-backend_0_7_2/envs/default.env rename to dockge/stream-rec-backend_main/envs/default.env diff --git a/dockge/stream-rec-backend_0_7_2/envs/global.env b/dockge/stream-rec-backend_main/envs/global.env similarity index 100% rename from dockge/stream-rec-backend_0_7_2/envs/global.env rename to dockge/stream-rec-backend_main/envs/global.env diff --git a/dockge/stream-rec-frontend/docker-compose.yml b/dockge/stream-rec-frontend/docker-compose.yml index adf7b34f0..1f4d40283 100644 --- a/dockge/stream-rec-frontend/docker-compose.yml +++ b/dockge/stream-rec-frontend/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:main + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_0_7_2/.env b/dockge/stream-rec-frontend_main/.env similarity index 100% rename from dockge/stream-rec-frontend_0_7_2/.env rename to dockge/stream-rec-frontend_main/.env diff --git a/dockge/stream-rec-frontend_0_7_2/docker-compose.yml b/dockge/stream-rec-frontend_main/docker-compose.yml similarity index 87% rename from dockge/stream-rec-frontend_0_7_2/docker-compose.yml rename to dockge/stream-rec-frontend_main/docker-compose.yml index 1f4d40283..adf7b34f0 100644 --- a/dockge/stream-rec-frontend_0_7_2/docker-compose.yml +++ b/dockge/stream-rec-frontend_main/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_0_7_2/envs/default.env b/dockge/stream-rec-frontend_main/envs/default.env similarity index 100% rename from dockge/stream-rec-frontend_0_7_2/envs/default.env rename to dockge/stream-rec-frontend_main/envs/default.env diff --git a/dockge/stream-rec-frontend_0_7_2/envs/global.env b/dockge/stream-rec-frontend_main/envs/global.env similarity index 100% rename from dockge/stream-rec-frontend_0_7_2/envs/global.env rename to dockge/stream-rec-frontend_main/envs/global.env diff --git a/dockge/stream-rec/docker-compose.yml b/dockge/stream-rec/docker-compose.yml index 8465b7136..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:dev + 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:dev + image: streamrec/stream-rec-front:latest labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_latest/.env b/dockge/stream-rec_dev/.env similarity index 100% rename from dockge/stream-rec_latest/.env rename to dockge/stream-rec_dev/.env diff --git a/dockge/stream-rec_latest/docker-compose.yml b/dockge/stream-rec_dev/docker-compose.yml similarity index 92% rename from dockge/stream-rec_latest/docker-compose.yml rename to dockge/stream-rec_dev/docker-compose.yml index cadb92c75..8465b7136 100644 --- a/dockge/stream-rec_latest/docker-compose.yml +++ b/dockge/stream-rec_dev/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:latest + image: streamrec/stream-rec:dev labels: createdBy: Apps networks: @@ -37,7 +37,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:latest + image: streamrec/stream-rec-front:dev labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_latest/envs/default.env b/dockge/stream-rec_dev/envs/default.env similarity index 100% rename from dockge/stream-rec_latest/envs/default.env rename to dockge/stream-rec_dev/envs/default.env diff --git a/dockge/stream-rec_latest/envs/global.env b/dockge/stream-rec_dev/envs/global.env similarity index 100% rename from dockge/stream-rec_latest/envs/global.env rename to dockge/stream-rec_dev/envs/global.env diff --git a/dockge/umami-mysql/docker-compose.yml b/dockge/umami-mysql/docker-compose.yml index 63d1197b2..2bc7a13bc 100644 --- a/dockge/umami-mysql/docker-compose.yml +++ b/dockge/umami-mysql/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:mysql-v2.19.0 + image: umamisoftware/umami:mysql-v2.16.0 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_16_0/.env b/dockge/umami-mysql_2_19_0/.env similarity index 100% rename from dockge/umami-mysql_2_16_0/.env rename to dockge/umami-mysql_2_19_0/.env diff --git a/dockge/umami-mysql_2_16_0/docker-compose.yml b/dockge/umami-mysql_2_19_0/docker-compose.yml similarity index 91% rename from dockge/umami-mysql_2_16_0/docker-compose.yml rename to dockge/umami-mysql_2_19_0/docker-compose.yml index 2bc7a13bc..63d1197b2 100644 --- a/dockge/umami-mysql_2_16_0/docker-compose.yml +++ b/dockge/umami-mysql_2_19_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:mysql-v2.16.0 + image: umamisoftware/umami:mysql-v2.19.0 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_16_0/envs/default.env b/dockge/umami-mysql_2_19_0/envs/default.env similarity index 100% rename from dockge/umami-mysql_2_16_0/envs/default.env rename to dockge/umami-mysql_2_19_0/envs/default.env diff --git a/dockge/umami-mysql_2_16_0/envs/global.env b/dockge/umami-mysql_2_19_0/envs/global.env similarity index 100% rename from dockge/umami-mysql_2_16_0/envs/global.env rename to dockge/umami-mysql_2_19_0/envs/global.env diff --git a/dockge/umami/docker-compose.yml b/dockge/umami/docker-compose.yml index f8dc6fb29..7f7a58660 100644 --- a/dockge/umami/docker-compose.yml +++ b/dockge/umami/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:postgresql-v2.19.0 + image: umamisoftware/umami:postgresql-v2.16.0 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_16_0/.env b/dockge/umami_2_19_0/.env similarity index 100% rename from dockge/umami_2_16_0/.env rename to dockge/umami_2_19_0/.env diff --git a/dockge/umami_2_16_0/docker-compose.yml b/dockge/umami_2_19_0/docker-compose.yml similarity index 90% rename from dockge/umami_2_16_0/docker-compose.yml rename to dockge/umami_2_19_0/docker-compose.yml index 7f7a58660..f8dc6fb29 100644 --- a/dockge/umami_2_16_0/docker-compose.yml +++ b/dockge/umami_2_19_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:postgresql-v2.16.0 + image: umamisoftware/umami:postgresql-v2.19.0 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_16_0/envs/default.env b/dockge/umami_2_19_0/envs/default.env similarity index 100% rename from dockge/umami_2_16_0/envs/default.env rename to dockge/umami_2_19_0/envs/default.env diff --git a/dockge/umami_2_16_0/envs/global.env b/dockge/umami_2_19_0/envs/global.env similarity index 100% rename from dockge/umami_2_16_0/envs/global.env rename to dockge/umami_2_19_0/envs/global.env