diff --git a/dockge/affine/docker-compose.yml b/dockge/affine/docker-compose.yml index 18926413f..94a383ee2 100644 --- a/dockge/affine/docker-compose.yml +++ b/dockge/affine/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-1623f5d + image: ghcr.io/toeverything/affine-graphql:stable-e98f035 labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-e98f035/.env b/dockge/affine_stable-1623f5d/.env similarity index 100% rename from dockge/affine_stable-e98f035/.env rename to dockge/affine_stable-1623f5d/.env diff --git a/dockge/affine_stable-e98f035/docker-compose.yml b/dockge/affine_stable-1623f5d/docker-compose.yml similarity index 94% rename from dockge/affine_stable-e98f035/docker-compose.yml rename to dockge/affine_stable-1623f5d/docker-compose.yml index 94a383ee2..18926413f 100644 --- a/dockge/affine_stable-e98f035/docker-compose.yml +++ b/dockge/affine_stable-1623f5d/docker-compose.yml @@ -22,7 +22,7 @@ services: - AFFINE_SERVER_PORT=3010 - AFFINE_SERVER_HTTPS=false - AFFINE_SERVER_EXTERNAL_URL=http://127.0.0.1:3010 - image: ghcr.io/toeverything/affine-graphql:stable-e98f035 + image: ghcr.io/toeverything/affine-graphql:stable-1623f5d labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-e98f035/envs/default.env b/dockge/affine_stable-1623f5d/envs/default.env similarity index 100% rename from dockge/affine_stable-e98f035/envs/default.env rename to dockge/affine_stable-1623f5d/envs/default.env diff --git a/dockge/affine_stable-e98f035/envs/global.env b/dockge/affine_stable-1623f5d/envs/global.env similarity index 100% rename from dockge/affine_stable-e98f035/envs/global.env rename to dockge/affine_stable-1623f5d/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-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/aria2-superng6/docker-compose.yml b/dockge/aria2-superng6/docker-compose.yml index 6cd98c41e..52b1b90c2 100644 --- a/dockge/aria2-superng6/docker-compose.yml +++ b/dockge/aria2-superng6/docker-compose.yml @@ -22,7 +22,7 @@ services: - SMD=true - CRA2B=2h - QUIET=true - image: superng6/aria2:a2b-stable-24-11-01 + image: superng6/aria2:25-08-29 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/aria2-superng6_25-08-29/.env b/dockge/aria2-superng6_24-11-01/.env similarity index 100% rename from dockge/aria2-superng6_25-08-29/.env rename to dockge/aria2-superng6_24-11-01/.env diff --git a/dockge/aria2-superng6_25-08-29/docker-compose.yml b/dockge/aria2-superng6_24-11-01/docker-compose.yml similarity index 96% rename from dockge/aria2-superng6_25-08-29/docker-compose.yml rename to dockge/aria2-superng6_24-11-01/docker-compose.yml index 52b1b90c2..6cd98c41e 100644 --- a/dockge/aria2-superng6_25-08-29/docker-compose.yml +++ b/dockge/aria2-superng6_24-11-01/docker-compose.yml @@ -22,7 +22,7 @@ services: - SMD=true - CRA2B=2h - QUIET=true - image: superng6/aria2:25-08-29 + image: superng6/aria2:a2b-stable-24-11-01 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/aria2-superng6_25-08-29/envs/default.env b/dockge/aria2-superng6_24-11-01/envs/default.env similarity index 100% rename from dockge/aria2-superng6_25-08-29/envs/default.env rename to dockge/aria2-superng6_24-11-01/envs/default.env diff --git a/dockge/aria2-superng6_25-08-29/envs/global.env b/dockge/aria2-superng6_24-11-01/envs/global.env similarity index 100% rename from dockge/aria2-superng6_25-08-29/envs/global.env rename to dockge/aria2-superng6_24-11-01/envs/global.env diff --git a/dockge/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index a461e63ac..c6c114077 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.8.11.0 + image: emby/embyserver:4.9.4.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_9_4_1/.env b/dockge/emby_4_8_11_0/.env similarity index 100% rename from dockge/emby_4_9_4_1/.env rename to dockge/emby_4_8_11_0/.env diff --git a/dockge/emby_4_9_4_1/docker-compose.yml b/dockge/emby_4_8_11_0/docker-compose.yml similarity index 96% rename from dockge/emby_4_9_4_1/docker-compose.yml rename to dockge/emby_4_8_11_0/docker-compose.yml index c6c114077..a461e63ac 100644 --- a/dockge/emby_4_9_4_1/docker-compose.yml +++ b/dockge/emby_4_8_11_0/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.4.1 + image: emby/embyserver:4.8.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_9_4_1/envs/default.env b/dockge/emby_4_8_11_0/envs/default.env similarity index 100% rename from dockge/emby_4_9_4_1/envs/default.env rename to dockge/emby_4_8_11_0/envs/default.env diff --git a/dockge/emby_4_9_4_1/envs/global.env b/dockge/emby_4_8_11_0/envs/global.env similarity index 100% rename from dockge/emby_4_9_4_1/envs/global.env rename to dockge/emby_4_8_11_0/envs/global.env diff --git a/dockge/iyuu-plus/docker-compose.yml b/dockge/iyuu-plus/docker-compose.yml index 142aaa4d5..39b4c1ba0 100644 --- a/dockge/iyuu-plus/docker-compose.yml +++ b/dockge/iyuu-plus/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: iyuuplus: container_name: iyuu-plus - image: iyuucn/iyuuplus:latest + image: iyuucn/iyuuplus-nodb:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest/.env b/dockge/iyuu-plus_latest-mysql/.env similarity index 100% rename from dockge/iyuu-plus_latest/.env rename to dockge/iyuu-plus_latest-mysql/.env diff --git a/dockge/iyuu-plus_latest/docker-compose.yml b/dockge/iyuu-plus_latest-mysql/docker-compose.yml similarity index 95% rename from dockge/iyuu-plus_latest/docker-compose.yml rename to dockge/iyuu-plus_latest-mysql/docker-compose.yml index 39b4c1ba0..142aaa4d5 100644 --- a/dockge/iyuu-plus_latest/docker-compose.yml +++ b/dockge/iyuu-plus_latest-mysql/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: iyuuplus: container_name: iyuu-plus - image: iyuucn/iyuuplus-nodb:latest + image: iyuucn/iyuuplus:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest/envs/default.env b/dockge/iyuu-plus_latest-mysql/envs/default.env similarity index 100% rename from dockge/iyuu-plus_latest/envs/default.env rename to dockge/iyuu-plus_latest-mysql/envs/default.env diff --git a/dockge/iyuu-plus_latest/envs/global.env b/dockge/iyuu-plus_latest-mysql/envs/global.env similarity index 100% rename from dockge/iyuu-plus_latest/envs/global.env rename to dockge/iyuu-plus_latest-mysql/envs/global.env diff --git a/dockge/mediacms/.env b/dockge/mediacms/.env index cb8a090ef..e86cd2493 100644 --- a/dockge/mediacms/.env +++ b/dockge/mediacms/.env @@ -32,14 +32,14 @@ REDIS_LOCATION=redis://127.0.0.1:6379/1 POSTGRES_HOST=127.0.0.1 # 数据库 端口 [必填] -DB_PORT=5432 +POSTGRES_PORT=5432 # 数据库 名称 [必填] -DB_NAME=mediacms +POSTGRES_NAME=mediacms # 数据库 用户名 [必填] -DB_USER=mediacms +POSTGRES_USER=mediacms # 数据库 密码 [必填] -DB_PASSWORD= +POSTGRES_PASSWORD= diff --git a/dockge/mediacms/docker-compose.yml b/dockge/mediacms/docker-compose.yml index 250eae7fd..5c5c8be7e 100644 --- a/dockge/mediacms/docker-compose.yml +++ b/dockge/mediacms/docker-compose.yml @@ -14,7 +14,7 @@ services: - ENABLE_CELERY_SHORT=no - ENABLE_CELERY_LONG=no - ENABLE_MIGRATIONS=no - image: qyg2297248353/mediacms:v4.1.0 + image: qyg2297248353/mediacms:v7.2.0 labels: createdBy: Apps networks: @@ -34,7 +34,7 @@ services: - ENABLE_CELERY_SHORT=no - ENABLE_CELERY_LONG=no - ENABLE_MIGRATIONS=no - image: qyg2297248353/mediacms:v4.1.0 + image: qyg2297248353/mediacms:v7.2.0 volumes: - ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls - ${MEDIACMS_ROOT_PATH}/media_files/original:/home/mediacms.io/mediacms/media_files/original @@ -48,7 +48,7 @@ services: - ENABLE_NGINX=no - ENABLE_CELERY_BEAT=no - ENABLE_MIGRATIONS=no - image: qyg2297248353/mediacms:v4.1.0 + image: qyg2297248353/mediacms:v7.2.0 volumes: - ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls - ${MEDIACMS_ROOT_PATH}/media_files/original:/home/mediacms.io/mediacms/media_files/original @@ -69,7 +69,7 @@ services: - ADMIN_USER=${ADMIN_USER} - ADMIN_EMAIL=${ADMIN_EMAIL} - ADMIN_PASSWORD=${ADMIN_PASSWORD} - image: qyg2297248353/mediacms:v4.1.0 + image: qyg2297248353/mediacms:v7.2.0 restart: on-failure volumes: - ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls diff --git a/dockge/mediacms_7_2_0/.env b/dockge/mediacms_4_1_0/.env similarity index 89% rename from dockge/mediacms_7_2_0/.env rename to dockge/mediacms_4_1_0/.env index e86cd2493..cb8a090ef 100644 --- a/dockge/mediacms_7_2_0/.env +++ b/dockge/mediacms_4_1_0/.env @@ -32,14 +32,14 @@ REDIS_LOCATION=redis://127.0.0.1:6379/1 POSTGRES_HOST=127.0.0.1 # 数据库 端口 [必填] -POSTGRES_PORT=5432 +DB_PORT=5432 # 数据库 名称 [必填] -POSTGRES_NAME=mediacms +DB_NAME=mediacms # 数据库 用户名 [必填] -POSTGRES_USER=mediacms +DB_USER=mediacms # 数据库 密码 [必填] -POSTGRES_PASSWORD= +DB_PASSWORD= diff --git a/dockge/mediacms_7_2_0/docker-compose.yml b/dockge/mediacms_4_1_0/docker-compose.yml similarity index 93% rename from dockge/mediacms_7_2_0/docker-compose.yml rename to dockge/mediacms_4_1_0/docker-compose.yml index 5c5c8be7e..250eae7fd 100644 --- a/dockge/mediacms_7_2_0/docker-compose.yml +++ b/dockge/mediacms_4_1_0/docker-compose.yml @@ -14,7 +14,7 @@ services: - ENABLE_CELERY_SHORT=no - ENABLE_CELERY_LONG=no - ENABLE_MIGRATIONS=no - image: qyg2297248353/mediacms:v7.2.0 + image: qyg2297248353/mediacms:v4.1.0 labels: createdBy: Apps networks: @@ -34,7 +34,7 @@ services: - ENABLE_CELERY_SHORT=no - ENABLE_CELERY_LONG=no - ENABLE_MIGRATIONS=no - image: qyg2297248353/mediacms:v7.2.0 + image: qyg2297248353/mediacms:v4.1.0 volumes: - ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls - ${MEDIACMS_ROOT_PATH}/media_files/original:/home/mediacms.io/mediacms/media_files/original @@ -48,7 +48,7 @@ services: - ENABLE_NGINX=no - ENABLE_CELERY_BEAT=no - ENABLE_MIGRATIONS=no - image: qyg2297248353/mediacms:v7.2.0 + image: qyg2297248353/mediacms:v4.1.0 volumes: - ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls - ${MEDIACMS_ROOT_PATH}/media_files/original:/home/mediacms.io/mediacms/media_files/original @@ -69,7 +69,7 @@ services: - ADMIN_USER=${ADMIN_USER} - ADMIN_EMAIL=${ADMIN_EMAIL} - ADMIN_PASSWORD=${ADMIN_PASSWORD} - image: qyg2297248353/mediacms:v7.2.0 + image: qyg2297248353/mediacms:v4.1.0 restart: on-failure volumes: - ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls diff --git a/dockge/mediacms_7_2_0/envs/default.env b/dockge/mediacms_4_1_0/envs/default.env similarity index 100% rename from dockge/mediacms_7_2_0/envs/default.env rename to dockge/mediacms_4_1_0/envs/default.env diff --git a/dockge/mediacms_7_2_0/envs/global.env b/dockge/mediacms_4_1_0/envs/global.env similarity index 100% rename from dockge/mediacms_7_2_0/envs/global.env rename to dockge/mediacms_4_1_0/envs/global.env diff --git a/dockge/minio/.env b/dockge/minio/.env index 7addb6af6..f98243a34 100644 --- a/dockge/minio/.env +++ b/dockge/minio/.env @@ -4,12 +4,9 @@ MINIO_ROOT_PATH=/home/minio # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=9001 -# API 端口 (映射内部端口) [必填] +# API 端口 [必填] PANEL_APP_PORT_API=9000 -# API 内部端口 [必填] -MINIO_API_PORT=9000 - # 管理员 用户名 [必填] MINIO_ROOT_USER=minio diff --git a/dockge/minio/docker-compose.yml b/dockge/minio/docker-compose.yml index 4e37e835a..2bc78e830 100644 --- a/dockge/minio/docker-compose.yml +++ b/dockge/minio/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: minio: - command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} + command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${PANEL_APP_PORT_API} --json container_name: minio env_file: @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: minio/minio:RELEASE.2025-09-07T16-13-09Z + image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z labels: createdBy: Apps logging: @@ -27,7 +27,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} + - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} restart: always volumes: - ${MINIO_ROOT_PATH}/certs:/root/.minio/certs diff --git a/dockge/minio_2025-04-22/.env b/dockge/minio_2025-09-07/.env similarity index 86% rename from dockge/minio_2025-04-22/.env rename to dockge/minio_2025-09-07/.env index f98243a34..7addb6af6 100644 --- a/dockge/minio_2025-04-22/.env +++ b/dockge/minio_2025-09-07/.env @@ -4,9 +4,12 @@ MINIO_ROOT_PATH=/home/minio # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=9001 -# API 端口 [必填] +# API 端口 (映射内部端口) [必填] PANEL_APP_PORT_API=9000 +# API 内部端口 [必填] +MINIO_API_PORT=9000 + # 管理员 用户名 [必填] MINIO_ROOT_USER=minio diff --git a/dockge/minio_2025-04-22/docker-compose.yml b/dockge/minio_2025-09-07/docker-compose.yml similarity index 83% rename from dockge/minio_2025-04-22/docker-compose.yml rename to dockge/minio_2025-09-07/docker-compose.yml index 2bc78e830..4e37e835a 100644 --- a/dockge/minio_2025-04-22/docker-compose.yml +++ b/dockge/minio_2025-09-07/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: minio: - command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${PANEL_APP_PORT_API} + command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} --json container_name: minio env_file: @@ -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-09-07T16-13-09Z labels: createdBy: Apps logging: @@ -27,7 +27,7 @@ services: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API} + - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} restart: always volumes: - ${MINIO_ROOT_PATH}/certs:/root/.minio/certs diff --git a/dockge/minio_2025-04-22/envs/default.env b/dockge/minio_2025-09-07/envs/default.env similarity index 100% rename from dockge/minio_2025-04-22/envs/default.env rename to dockge/minio_2025-09-07/envs/default.env diff --git a/dockge/minio_2025-04-22/envs/global.env b/dockge/minio_2025-09-07/envs/global.env similarity index 100% rename from dockge/minio_2025-04-22/envs/global.env rename to dockge/minio_2025-09-07/envs/global.env diff --git a/dockge/mysql/config/my.cnf b/dockge/mysql/config/my.cnf index c53ca32dc..6d6e1a932 100644 --- a/dockge/mysql/config/my.cnf +++ b/dockge/mysql/config/my.cnf @@ -1,20 +1,42 @@ +# For advice on how to change settings please see +# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html + [mysqld] -host_cache_size=0 +# +# Remove leading # and set to the amount of RAM for the most important data +# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# innodb_buffer_pool_size = 128M +# +# Remove leading # to turn on a very important data integrity option: logging +# changes to the binary log between backups. +# log_bin +# +# Remove leading # to set options mainly useful for reporting servers. +# The server defaults are faster for transactions and fast SELECTs. +# Adjust sizes as needed, experiment to find the optimal values. +# join_buffer_size = 128M +# sort_buffer_size = 2M +# read_rnd_buffer_size = 2M +skip-host-cache skip-name-resolve datadir=/var/lib/mysql socket=/var/run/mysqld/mysqld.sock +secure-file-priv=/var/lib/mysql-files user=mysql -mysql_native_password=ON +# Disabling symbolic-links is recommended to prevent assorted security risks +symbolic-links=0 + +#log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +max_allowed_packet=64M character_set_server=utf8mb4 -collation_server=utf8mb4_unicode_ci lower_case_table_names=1 group_concat_max_len=1024000 -log_bin_trust_function_creators=1 -secure_file_priv= -pid_file=/var/run/mysqld/mysqld.pid [client] socket=/var/run/mysqld/mysqld.sock !includedir /etc/mysql/conf.d/ +!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql/docker-compose.yml b/dockge/mysql/docker-compose.yml index f2401c2cc..5cac14f48 100644 --- a/dockge/mysql/docker-compose.yml +++ b/dockge/mysql/docker-compose.yml @@ -5,13 +5,14 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --collation-server=utf8mb4_unicode_ci - - --mysql-native-password=ON + - --lower_case_table_names=1 + - --collation-server=utf8mb4_general_ci + - --explicit_defaults_for_timestamp=true container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:8.4.9 + image: mysql:5.7.44 labels: createdBy: Apps networks: @@ -21,8 +22,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf + - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_5_7_44/config/my.cnf b/dockge/mysql_5_7_44/config/my.cnf deleted file mode 100644 index 6d6e1a932..000000000 --- a/dockge/mysql_5_7_44/config/my.cnf +++ /dev/null @@ -1,42 +0,0 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html - -[mysqld] -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove leading # to turn on a very important data integrity option: logging -# changes to the binary log between backups. -# log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M -skip-host-cache -skip-name-resolve -datadir=/var/lib/mysql -socket=/var/run/mysqld/mysqld.sock -secure-file-priv=/var/lib/mysql-files -user=mysql - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -#log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid - -max_allowed_packet=64M -character_set_server=utf8mb4 -lower_case_table_names=1 -group_concat_max_len=1024000 - -[client] -socket=/var/run/mysqld/mysqld.sock - -!includedir /etc/mysql/conf.d/ -!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql_5_7_44/.env b/dockge/mysql_8_4_9/.env similarity index 100% rename from dockge/mysql_5_7_44/.env rename to dockge/mysql_8_4_9/.env diff --git a/dockge/mysql_8_4_9/config/my.cnf b/dockge/mysql_8_4_9/config/my.cnf new file mode 100644 index 000000000..c53ca32dc --- /dev/null +++ b/dockge/mysql_8_4_9/config/my.cnf @@ -0,0 +1,20 @@ +[mysqld] +host_cache_size=0 +skip-name-resolve +datadir=/var/lib/mysql +socket=/var/run/mysqld/mysqld.sock +user=mysql + +mysql_native_password=ON +character_set_server=utf8mb4 +collation_server=utf8mb4_unicode_ci +lower_case_table_names=1 +group_concat_max_len=1024000 +log_bin_trust_function_creators=1 + +secure_file_priv= +pid_file=/var/run/mysqld/mysqld.pid +[client] +socket=/var/run/mysqld/mysqld.sock + +!includedir /etc/mysql/conf.d/ diff --git a/dockge/mysql_5_7_44/docker-compose.yml b/dockge/mysql_8_4_9/docker-compose.yml similarity index 65% rename from dockge/mysql_5_7_44/docker-compose.yml rename to dockge/mysql_8_4_9/docker-compose.yml index 5cac14f48..f2401c2cc 100644 --- a/dockge/mysql_5_7_44/docker-compose.yml +++ b/dockge/mysql_8_4_9/docker-compose.yml @@ -5,14 +5,13 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --lower_case_table_names=1 - - --collation-server=utf8mb4_general_ci - - --explicit_defaults_for_timestamp=true + - --collation-server=utf8mb4_unicode_ci + - --mysql-native-password=ON container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:5.7.44 + image: mysql:8.4.9 labels: createdBy: Apps networks: @@ -22,8 +21,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf + - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_5_7_44/envs/default.env b/dockge/mysql_8_4_9/envs/default.env similarity index 100% rename from dockge/mysql_5_7_44/envs/default.env rename to dockge/mysql_8_4_9/envs/default.env diff --git a/dockge/mysql_5_7_44/envs/global.env b/dockge/mysql_8_4_9/envs/global.env similarity index 100% rename from dockge/mysql_5_7_44/envs/global.env rename to dockge/mysql_8_4_9/envs/global.env diff --git a/dockge/nodepassdash/docker-compose.yml b/dockge/nodepassdash/docker-compose.yml index b9a42c35e..1802df3f3 100644 --- a/dockge/nodepassdash/docker-compose.yml +++ b/dockge/nodepassdash/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - PORT=${PANEL_APP_PORT_HTTP} - image: ghcr.io/nodepassproject/nodepassdash:2.2.1 + image: ghcr.io/nodepassproject/nodepassdash:3.3.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nodepassdash_3_3_1/.env b/dockge/nodepassdash_2_2_1/.env similarity index 100% rename from dockge/nodepassdash_3_3_1/.env rename to dockge/nodepassdash_2_2_1/.env diff --git a/dockge/nodepassdash_3_3_1/docker-compose.yml b/dockge/nodepassdash_2_2_1/docker-compose.yml similarity index 90% rename from dockge/nodepassdash_3_3_1/docker-compose.yml rename to dockge/nodepassdash_2_2_1/docker-compose.yml index 1802df3f3..b9a42c35e 100644 --- a/dockge/nodepassdash_3_3_1/docker-compose.yml +++ b/dockge/nodepassdash_2_2_1/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - PORT=${PANEL_APP_PORT_HTTP} - image: ghcr.io/nodepassproject/nodepassdash:3.3.1 + image: ghcr.io/nodepassproject/nodepassdash:2.2.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nodepassdash_3_3_1/envs/default.env b/dockge/nodepassdash_2_2_1/envs/default.env similarity index 100% rename from dockge/nodepassdash_3_3_1/envs/default.env rename to dockge/nodepassdash_2_2_1/envs/default.env diff --git a/dockge/nodepassdash_3_3_1/envs/global.env b/dockge/nodepassdash_2_2_1/envs/global.env similarity index 100% rename from dockge/nodepassdash_3_3_1/envs/global.env rename to dockge/nodepassdash_2_2_1/envs/global.env diff --git a/dockge/omnibox/docker-compose.yml b/dockge/omnibox/docker-compose.yml index 84904bb9f..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.1.3 + image: lampon/omnibox:v1.4.4 labels: createdBy: Apps networks: diff --git a/dockge/omnibox_1_4_4/.env b/dockge/omnibox_2_1_3/.env similarity index 100% rename from dockge/omnibox_1_4_4/.env rename to dockge/omnibox_2_1_3/.env diff --git a/dockge/omnibox/2.0.4-lite/docker-compose.yml b/dockge/omnibox_2_1_3/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_1_3/2.0.4-lite/docker-compose.yml diff --git a/dockge/omnibox/2.0.4-lite/envs/default.env b/dockge/omnibox_2_1_3/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_1_3/2.0.4-lite/envs/default.env diff --git a/dockge/omnibox/2.0.4-lite/envs/global.env b/dockge/omnibox_2_1_3/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_1_3/2.0.4-lite/envs/global.env diff --git a/dockge/omnibox_1_4_4/docker-compose.yml b/dockge/omnibox_2_1_3/docker-compose.yml similarity index 81% rename from dockge/omnibox_1_4_4/docker-compose.yml rename to dockge/omnibox_2_1_3/docker-compose.yml index 906fd45a4..84904bb9f 100644 --- a/dockge/omnibox_1_4_4/docker-compose.yml +++ b/dockge/omnibox_2_1_3/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.1.3 labels: createdBy: Apps networks: diff --git a/dockge/omnibox_1_4_4/envs/default.env b/dockge/omnibox_2_1_3/envs/default.env similarity index 100% rename from dockge/omnibox_1_4_4/envs/default.env rename to dockge/omnibox_2_1_3/envs/default.env diff --git a/dockge/omnibox_1_4_4/envs/global.env b/dockge/omnibox_2_1_3/envs/global.env similarity index 100% rename from dockge/omnibox_1_4_4/envs/global.env rename to dockge/omnibox_2_1_3/envs/global.env diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index 3f2aed531..701ed5d91 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:16.13 + image: postgres:16.13-alpine labels: createdBy: Apps networks: diff --git a/dockge/postgresql_16_13-alpine/.env b/dockge/postgresql_16_13/.env similarity index 100% rename from dockge/postgresql_16_13-alpine/.env rename to dockge/postgresql_16_13/.env diff --git a/dockge/postgresql_16_13-alpine/docker-compose.yml b/dockge/postgresql_16_13/docker-compose.yml similarity index 94% rename from dockge/postgresql_16_13-alpine/docker-compose.yml rename to dockge/postgresql_16_13/docker-compose.yml index 701ed5d91..3f2aed531 100644 --- a/dockge/postgresql_16_13-alpine/docker-compose.yml +++ b/dockge/postgresql_16_13/docker-compose.yml @@ -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: postgres:16.13 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_16_13-alpine/envs/default.env b/dockge/postgresql_16_13/envs/default.env similarity index 100% rename from dockge/postgresql_16_13-alpine/envs/default.env rename to dockge/postgresql_16_13/envs/default.env diff --git a/dockge/postgresql_16_13-alpine/envs/global.env b/dockge/postgresql_16_13/envs/global.env similarity index 100% rename from dockge/postgresql_16_13-alpine/envs/global.env rename to dockge/postgresql_16_13/envs/global.env diff --git a/dockge/rust-srec/docker-compose.yml b/dockge/rust-srec/docker-compose.yml index 44648cc45..fdea97fa8 100644 --- a/dockge/rust-srec/docker-compose.yml +++ b/dockge/rust-srec/docker-compose.yml @@ -14,7 +14,7 @@ services: - TZ=Asia/Shanghai - BACKEND_URL=${BACKEND_URL:-http://rust-srec-backend:8080} - COOKIE_SECURE=${COOKIE_SECURE:-} - image: ghcr.io/hua0512/rust-srec-frontend:dev + image: ghcr.io/hua0512/rust-srec-frontend:v0.2.1 labels: createdBy: Apps logging: @@ -53,7 +53,7 @@ services: - -f - http://localhost:8080/api/health/live timeout: 10s - image: ghcr.io/hua0512/rust-srec:dev + image: ghcr.io/hua0512/rust-srec:v0.2.1 logging: driver: json-file options: diff --git a/dockge/rust-srec_0_2_1/.env b/dockge/rust-srec_dev/.env similarity index 100% rename from dockge/rust-srec_0_2_1/.env rename to dockge/rust-srec_dev/.env diff --git a/dockge/rust-srec_0_2_1/docker-compose.yml b/dockge/rust-srec_dev/docker-compose.yml similarity index 94% rename from dockge/rust-srec_0_2_1/docker-compose.yml rename to dockge/rust-srec_dev/docker-compose.yml index fdea97fa8..44648cc45 100644 --- a/dockge/rust-srec_0_2_1/docker-compose.yml +++ b/dockge/rust-srec_dev/docker-compose.yml @@ -14,7 +14,7 @@ services: - TZ=Asia/Shanghai - BACKEND_URL=${BACKEND_URL:-http://rust-srec-backend:8080} - COOKIE_SECURE=${COOKIE_SECURE:-} - image: ghcr.io/hua0512/rust-srec-frontend:v0.2.1 + image: ghcr.io/hua0512/rust-srec-frontend:dev labels: createdBy: Apps logging: @@ -53,7 +53,7 @@ services: - -f - http://localhost:8080/api/health/live timeout: 10s - image: ghcr.io/hua0512/rust-srec:v0.2.1 + image: ghcr.io/hua0512/rust-srec:dev logging: driver: json-file options: diff --git a/dockge/rust-srec_0_2_1/envs/default.env b/dockge/rust-srec_dev/envs/default.env similarity index 100% rename from dockge/rust-srec_0_2_1/envs/default.env rename to dockge/rust-srec_dev/envs/default.env diff --git a/dockge/rust-srec_0_2_1/envs/global.env b/dockge/rust-srec_dev/envs/global.env similarity index 100% rename from dockge/rust-srec_0_2_1/envs/global.env rename to dockge/rust-srec_dev/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..a532d45e1 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.29 + 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_29/.env b/dockge/rustdesk-api_s6-latest/.env similarity index 97% rename from dockge/rustdesk-api_2_6_29/.env rename to dockge/rustdesk-api_s6-latest/.env index 96a0fb5a5..057e9b006 100644 --- a/dockge/rustdesk-api_2_6_29/.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_29/conf/hbbr/run b/dockge/rustdesk-api_s6-latest/conf/hbbr/run similarity index 100% rename from dockge/rustdesk-api_2_6_29/conf/hbbr/run rename to dockge/rustdesk-api_s6-latest/conf/hbbr/run diff --git a/dockge/rustdesk-api_2_6_29/conf/hbbs/run b/dockge/rustdesk-api_s6-latest/conf/hbbs/run similarity index 100% rename from dockge/rustdesk-api_2_6_29/conf/hbbs/run rename to dockge/rustdesk-api_s6-latest/conf/hbbs/run diff --git a/dockge/rustdesk-api_2_6_29/docker-compose.yml b/dockge/rustdesk-api_s6-latest/docker-compose.yml similarity index 70% rename from dockge/rustdesk-api_2_6_29/docker-compose.yml rename to dockge/rustdesk-api_s6-latest/docker-compose.yml index a532d45e1..aad6a35ef 100644 --- a/dockge/rustdesk-api_2_6_29/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.29 - 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_29/envs/default.env b/dockge/rustdesk-api_s6-latest/envs/default.env similarity index 100% rename from dockge/rustdesk-api_2_6_29/envs/default.env rename to dockge/rustdesk-api_s6-latest/envs/default.env diff --git a/dockge/rustdesk-api_2_6_29/envs/global.env b/dockge/rustdesk-api_s6-latest/envs/global.env similarity index 100% rename from dockge/rustdesk-api_2_6_29/envs/global.env rename to dockge/rustdesk-api_s6-latest/envs/global.env diff --git a/dockge/umami-mysql/docker-compose.yml b/dockge/umami-mysql/docker-compose.yml index 0ed830dcb..3767a8aeb 100644 --- a/dockge/umami-mysql/docker-compose.yml +++ b/dockge/umami-mysql/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH=1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:mysql-v2.16.0 + image: umamisoftware/umami:mysql-v2.20.0 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_20_0/.env b/dockge/umami-mysql_2_16_0/.env similarity index 100% rename from dockge/umami-mysql_2_20_0/.env rename to dockge/umami-mysql_2_16_0/.env diff --git a/dockge/umami-mysql_2_20_0/docker-compose.yml b/dockge/umami-mysql_2_16_0/docker-compose.yml similarity index 91% rename from dockge/umami-mysql_2_20_0/docker-compose.yml rename to dockge/umami-mysql_2_16_0/docker-compose.yml index 3767a8aeb..0ed830dcb 100644 --- a/dockge/umami-mysql_2_20_0/docker-compose.yml +++ b/dockge/umami-mysql_2_16_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH=1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:mysql-v2.20.0 + image: umamisoftware/umami:mysql-v2.16.0 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_20_0/envs/default.env b/dockge/umami-mysql_2_16_0/envs/default.env similarity index 100% rename from dockge/umami-mysql_2_20_0/envs/default.env rename to dockge/umami-mysql_2_16_0/envs/default.env diff --git a/dockge/umami-mysql_2_20_0/envs/global.env b/dockge/umami-mysql_2_16_0/envs/global.env similarity index 100% rename from dockge/umami-mysql_2_20_0/envs/global.env rename to dockge/umami-mysql_2_16_0/envs/global.env diff --git a/dockge/umami/docker-compose.yml b/dockge/umami/docker-compose.yml index 73fb562d5..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:postgresql-v2.16.0 + image: umamisoftware/umami:postgresql-v2.20.0 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_20_0/.env b/dockge/umami_2_16_0/.env similarity index 100% rename from dockge/umami_2_20_0/.env rename to dockge/umami_2_16_0/.env diff --git a/dockge/umami_2_20_0/docker-compose.yml b/dockge/umami_2_16_0/docker-compose.yml similarity index 90% rename from dockge/umami_2_20_0/docker-compose.yml rename to dockge/umami_2_16_0/docker-compose.yml index 220221cf9..73fb562d5 100644 --- a/dockge/umami_2_20_0/docker-compose.yml +++ b/dockge/umami_2_16_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH=1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:postgresql-v2.20.0 + image: umamisoftware/umami:postgresql-v2.16.0 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_20_0/envs/default.env b/dockge/umami_2_16_0/envs/default.env similarity index 100% rename from dockge/umami_2_20_0/envs/default.env rename to dockge/umami_2_16_0/envs/default.env diff --git a/dockge/umami_2_20_0/envs/global.env b/dockge/umami_2_16_0/envs/global.env similarity index 100% rename from dockge/umami_2_20_0/envs/global.env rename to dockge/umami_2_16_0/envs/global.env diff --git a/dockge/uptime-kuma/.env b/dockge/uptime-kuma/.env index 046e55ee2..5fa74c158 100644 --- a/dockge/uptime-kuma/.env +++ b/dockge/uptime-kuma/.env @@ -4,21 +4,9 @@ UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3001 -# 数据库类型 [必填] -UPTIME_KUMA_DB_TYPE=sqlite +# Cloudflared 隧道令牌 +UPTIME_KUMA_CLOUDFLARED_TOKEN= -# 数据库主机名 (MariaDB) -UPTIME_KUMA_DB_HOSTNAME=127.0.0.1 - -# 数据库端口 (MariaDB) -UPTIME_KUMA_DB_PORT=3306 - -# 数据库名称 (MariaDB) -UPTIME_KUMA_DB_NAME=uptime_kuma - -# 数据库用户名 (MariaDB) -UPTIME_KUMA_DB_USERNAME=root - -# 密码 (MariaDB) -UPTIME_KUMA_DB_PASSWORD= +# 禁用 Frame SameOrigin [必填] +UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false diff --git a/dockge/uptime-kuma/docker-compose.yml b/dockge/uptime-kuma/docker-compose.yml index 9ec52b604..a7f5ebaaa 100644 --- a/dockge/uptime-kuma/docker-compose.yml +++ b/dockge/uptime-kuma/docker-compose.yml @@ -8,16 +8,15 @@ services: - ./envs/global.env - .env environment: - - TZ=Asia/Shanghai - - UPTIME_KUMA_HOST=0.0.0.0 + - PUID=0 + - PGID=0 - UPTIME_KUMA_PORT=3001 - - UPTIME_KUMA_DB_TYPE=${UPTIME_KUMA_DB_TYPE:-sqlite} - - UPTIME_KUMA_DB_HOSTNAME=${UPTIME_KUMA_DB_HOSTNAME:-127.0.0.1} - - UPTIME_KUMA_DB_PORT=${UPTIME_KUMA_DB_PORT:-3306} - - UPTIME_KUMA_DB_NAME=${UPTIME_KUMA_DB_NAME:-uptime_kuma} - - UPTIME_KUMA_DB_USERNAME=${UPTIME_KUMA_DB_USERNAME:-root} - - UPTIME_KUMA_DB_PASSWORD=${UPTIME_KUMA_DB_PASSWORD:-} - image: louislam/uptime-kuma:2.2.1 + - UPTIME_KUMA_HOST=0.0.0.0 + - DATA_DIR=/app/data + - NODE_TLS_REJECT_UNAUTHORIZED=0 + - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 + - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like + image: louislam/uptime-kuma:1.23.17 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_1_23_17/.env b/dockge/uptime-kuma_1_23_17/.env deleted file mode 100644 index 5fa74c158..000000000 --- a/dockge/uptime-kuma_1_23_17/.env +++ /dev/null @@ -1,12 +0,0 @@ -# 数据持久化路径 [必填] -UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3001 - -# Cloudflared 隧道令牌 -UPTIME_KUMA_CLOUDFLARED_TOKEN= - -# 禁用 Frame SameOrigin [必填] -UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false - diff --git a/dockge/uptime-kuma_2_2_1/.env b/dockge/uptime-kuma_2_2_1/.env new file mode 100644 index 000000000..046e55ee2 --- /dev/null +++ b/dockge/uptime-kuma_2_2_1/.env @@ -0,0 +1,24 @@ +# 数据持久化路径 [必填] +UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3001 + +# 数据库类型 [必填] +UPTIME_KUMA_DB_TYPE=sqlite + +# 数据库主机名 (MariaDB) +UPTIME_KUMA_DB_HOSTNAME=127.0.0.1 + +# 数据库端口 (MariaDB) +UPTIME_KUMA_DB_PORT=3306 + +# 数据库名称 (MariaDB) +UPTIME_KUMA_DB_NAME=uptime_kuma + +# 数据库用户名 (MariaDB) +UPTIME_KUMA_DB_USERNAME=root + +# 密码 (MariaDB) +UPTIME_KUMA_DB_PASSWORD= + diff --git a/dockge/uptime-kuma_1_23_17/docker-compose.yml b/dockge/uptime-kuma_2_2_1/docker-compose.yml similarity index 52% rename from dockge/uptime-kuma_1_23_17/docker-compose.yml rename to dockge/uptime-kuma_2_2_1/docker-compose.yml index a7f5ebaaa..9ec52b604 100644 --- a/dockge/uptime-kuma_1_23_17/docker-compose.yml +++ b/dockge/uptime-kuma_2_2_1/docker-compose.yml @@ -8,15 +8,16 @@ services: - ./envs/global.env - .env environment: - - PUID=0 - - PGID=0 - - UPTIME_KUMA_PORT=3001 + - TZ=Asia/Shanghai - UPTIME_KUMA_HOST=0.0.0.0 - - DATA_DIR=/app/data - - NODE_TLS_REJECT_UNAUTHORIZED=0 - - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 - - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like - image: louislam/uptime-kuma:1.23.17 + - UPTIME_KUMA_PORT=3001 + - UPTIME_KUMA_DB_TYPE=${UPTIME_KUMA_DB_TYPE:-sqlite} + - UPTIME_KUMA_DB_HOSTNAME=${UPTIME_KUMA_DB_HOSTNAME:-127.0.0.1} + - UPTIME_KUMA_DB_PORT=${UPTIME_KUMA_DB_PORT:-3306} + - UPTIME_KUMA_DB_NAME=${UPTIME_KUMA_DB_NAME:-uptime_kuma} + - UPTIME_KUMA_DB_USERNAME=${UPTIME_KUMA_DB_USERNAME:-root} + - UPTIME_KUMA_DB_PASSWORD=${UPTIME_KUMA_DB_PASSWORD:-} + image: louislam/uptime-kuma:2.2.1 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_1_23_17/envs/default.env b/dockge/uptime-kuma_2_2_1/envs/default.env similarity index 100% rename from dockge/uptime-kuma_1_23_17/envs/default.env rename to dockge/uptime-kuma_2_2_1/envs/default.env diff --git a/dockge/uptime-kuma_1_23_17/envs/global.env b/dockge/uptime-kuma_2_2_1/envs/global.env similarity index 100% rename from dockge/uptime-kuma_1_23_17/envs/global.env rename to dockge/uptime-kuma_2_2_1/envs/global.env