diff --git a/dockge/affine/docker-compose.yml b/dockge/affine/docker-compose.yml index 94a383ee2..18926413f 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-e98f035 + image: ghcr.io/toeverything/affine-graphql:stable-1623f5d labels: createdBy: Apps networks: diff --git a/dockge/affine_stable-1623f5d/.env b/dockge/affine_stable-e98f035/.env similarity index 100% rename from dockge/affine_stable-1623f5d/.env rename to dockge/affine_stable-e98f035/.env diff --git a/dockge/affine_stable-1623f5d/docker-compose.yml b/dockge/affine_stable-e98f035/docker-compose.yml similarity index 94% rename from dockge/affine_stable-1623f5d/docker-compose.yml rename to dockge/affine_stable-e98f035/docker-compose.yml index 18926413f..94a383ee2 100644 --- a/dockge/affine_stable-1623f5d/docker-compose.yml +++ b/dockge/affine_stable-e98f035/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-1623f5d/envs/default.env b/dockge/affine_stable-e98f035/envs/default.env similarity index 100% rename from dockge/affine_stable-1623f5d/envs/default.env rename to dockge/affine_stable-e98f035/envs/default.env diff --git a/dockge/affine_stable-1623f5d/envs/global.env b/dockge/affine_stable-e98f035/envs/global.env similarity index 100% rename from dockge/affine_stable-1623f5d/envs/global.env rename to dockge/affine_stable-e98f035/envs/global.env diff --git a/dockge/alist-ffmpeg/.env b/dockge/alist-ffmpeg/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist-ffmpeg/.env +++ b/dockge/alist-ffmpeg/.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/docker-compose.yml b/dockge/alist-ffmpeg/docker-compose.yml index ded9a5b7e..37149a612 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: - 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_3_45_0/.env b/dockge/alist-ffmpeg_4_0_2/.env similarity index 93% rename from dockge/alist-ffmpeg_3_45_0/.env rename to dockge/alist-ffmpeg_4_0_2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist-ffmpeg_3_45_0/.env +++ b/dockge/alist-ffmpeg_4_0_2/.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_3_45_0/docker-compose.yml b/dockge/alist-ffmpeg_4_0_2/docker-compose.yml similarity index 85% rename from dockge/alist-ffmpeg_3_45_0/docker-compose.yml rename to dockge/alist-ffmpeg_4_0_2/docker-compose.yml index 37149a612..ded9a5b7e 100644 --- a/dockge/alist-ffmpeg_3_45_0/docker-compose.yml +++ b/dockge/alist-ffmpeg_4_0_2/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_3_45_0/envs/default.env b/dockge/alist-ffmpeg_4_0_2/envs/default.env similarity index 100% rename from dockge/alist-ffmpeg_3_45_0/envs/default.env rename to dockge/alist-ffmpeg_4_0_2/envs/default.env diff --git a/dockge/alist-ffmpeg_3_45_0/envs/global.env b/dockge/alist-ffmpeg_4_0_2/envs/global.env similarity index 100% rename from dockge/alist-ffmpeg_3_45_0/envs/global.env rename to dockge/alist-ffmpeg_4_0_2/envs/global.env diff --git a/dockge/alist/.env b/dockge/alist/.env index c573106b5..6f75a8f45 100644 --- a/dockge/alist/.env +++ b/dockge/alist/.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/docker-compose.yml b/dockge/alist/docker-compose.yml index 8099cd02f..baa8abfb1 100644 --- a/dockge/alist/docker-compose.yml +++ b/dockge/alist/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_3_45_0/.env b/dockge/alist_4_0_2/.env similarity index 93% rename from dockge/alist_3_45_0/.env rename to dockge/alist_4_0_2/.env index 6f75a8f45..c573106b5 100644 --- a/dockge/alist_3_45_0/.env +++ b/dockge/alist_4_0_2/.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_3_45_0/docker-compose.yml b/dockge/alist_4_0_2/docker-compose.yml similarity index 86% rename from dockge/alist_3_45_0/docker-compose.yml rename to dockge/alist_4_0_2/docker-compose.yml index baa8abfb1..8099cd02f 100644 --- a/dockge/alist_3_45_0/docker-compose.yml +++ b/dockge/alist_4_0_2/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_3_45_0/envs/default.env b/dockge/alist_4_0_2/envs/default.env similarity index 100% rename from dockge/alist_3_45_0/envs/default.env rename to dockge/alist_4_0_2/envs/default.env diff --git a/dockge/alist_3_45_0/envs/global.env b/dockge/alist_4_0_2/envs/global.env similarity index 100% rename from dockge/alist_3_45_0/envs/global.env rename to dockge/alist_4_0_2/envs/global.env diff --git a/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index 60fd572f0..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:v3.0.14 + 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_3_0_14/.env similarity index 100% rename from dockge/ani-rss_1_2_82/.env rename to dockge/ani-rss_3_0_14/.env diff --git a/dockge/ani-rss_1_2_82/docker-compose.yml b/dockge/ani-rss_3_0_14/docker-compose.yml similarity index 90% rename from dockge/ani-rss_1_2_82/docker-compose.yml rename to dockge/ani-rss_3_0_14/docker-compose.yml index 9c6e13c66..60fd572f0 100644 --- a/dockge/ani-rss_1_2_82/docker-compose.yml +++ b/dockge/ani-rss_3_0_14/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_1_2_82/envs/default.env b/dockge/ani-rss_3_0_14/envs/default.env similarity index 100% rename from dockge/ani-rss_1_2_82/envs/default.env rename to dockge/ani-rss_3_0_14/envs/default.env diff --git a/dockge/ani-rss_1_2_82/envs/global.env b/dockge/ani-rss_3_0_14/envs/global.env similarity index 100% rename from dockge/ani-rss_1_2_82/envs/global.env rename to dockge/ani-rss_3_0_14/envs/global.env diff --git a/dockge/apifox-runner-team/docker-compose.yml b/dockge/apifox-runner-team/docker-compose.yml index dcf59fd91..9bd62c5de 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:slim + image: registry.cn-hangzhou.aliyuncs.com/apifox/self-hosted-general-runner labels: createdBy: Apps networks: diff --git a/dockge/apifox-runner-team_latest/.env b/dockge/apifox-runner-team_slim/.env similarity index 100% rename from dockge/apifox-runner-team_latest/.env rename to dockge/apifox-runner-team_slim/.env diff --git a/dockge/apifox-runner-team_latest/docker-compose.yml b/dockge/apifox-runner-team_slim/docker-compose.yml similarity index 95% rename from dockge/apifox-runner-team_latest/docker-compose.yml rename to dockge/apifox-runner-team_slim/docker-compose.yml index 9bd62c5de..dcf59fd91 100644 --- a/dockge/apifox-runner-team_latest/docker-compose.yml +++ b/dockge/apifox-runner-team_slim/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_latest/envs/default.env b/dockge/apifox-runner-team_slim/envs/default.env similarity index 100% rename from dockge/apifox-runner-team_latest/envs/default.env rename to dockge/apifox-runner-team_slim/envs/default.env diff --git a/dockge/apifox-runner-team_latest/envs/global.env b/dockge/apifox-runner-team_slim/envs/global.env similarity index 100% rename from dockge/apifox-runner-team_latest/envs/global.env rename to dockge/apifox-runner-team_slim/envs/global.env diff --git a/dockge/apifox-runner/docker-compose.yml b/dockge/apifox-runner/docker-compose.yml index bcacfcd4d..e1c1c862c 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:slim + image: registry.cn-hangzhou.aliyuncs.com/apifox/self-hosted-general-runner labels: createdBy: Apps networks: diff --git a/dockge/apifox-runner_latest/.env b/dockge/apifox-runner_slim/.env similarity index 100% rename from dockge/apifox-runner_latest/.env rename to dockge/apifox-runner_slim/.env diff --git a/dockge/apifox-runner_latest/docker-compose.yml b/dockge/apifox-runner_slim/docker-compose.yml similarity index 95% rename from dockge/apifox-runner_latest/docker-compose.yml rename to dockge/apifox-runner_slim/docker-compose.yml index e1c1c862c..bcacfcd4d 100644 --- a/dockge/apifox-runner_latest/docker-compose.yml +++ b/dockge/apifox-runner_slim/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_latest/envs/default.env b/dockge/apifox-runner_slim/envs/default.env similarity index 100% rename from dockge/apifox-runner_latest/envs/default.env rename to dockge/apifox-runner_slim/envs/default.env diff --git a/dockge/apifox-runner_latest/envs/global.env b/dockge/apifox-runner_slim/envs/global.env similarity index 100% rename from dockge/apifox-runner_latest/envs/global.env rename to dockge/apifox-runner_slim/envs/global.env diff --git a/dockge/archivebox/docker-compose.yml b/dockge/archivebox/docker-compose.yml index f70ce3cc2..41d4900e1 100644 --- a/dockge/archivebox/docker-compose.yml +++ b/dockge/archivebox/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_8_5/.env b/dockge/archivebox_0_7_3/.env similarity index 100% rename from dockge/archivebox_0_8_5/.env rename to dockge/archivebox_0_7_3/.env diff --git a/dockge/archivebox_0_8_5/docker-compose.yml b/dockge/archivebox_0_7_3/docker-compose.yml similarity index 60% rename from dockge/archivebox_0_8_5/docker-compose.yml rename to dockge/archivebox_0_7_3/docker-compose.yml index 41d4900e1..f70ce3cc2 100644 --- a/dockge/archivebox_0_8_5/docker-compose.yml +++ b/dockge/archivebox_0_7_3/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_8_5/envs/default.env b/dockge/archivebox_0_7_3/envs/default.env similarity index 100% rename from dockge/archivebox_0_8_5/envs/default.env rename to dockge/archivebox_0_7_3/envs/default.env diff --git a/dockge/archivebox_0_8_5/envs/global.env b/dockge/archivebox_0_7_3/envs/global.env similarity index 100% rename from dockge/archivebox_0_8_5/envs/global.env rename to dockge/archivebox_0_7_3/envs/global.env diff --git a/dockge/aria2-superng6/docker-compose.yml b/dockge/aria2-superng6/docker-compose.yml index 52b1b90c2..6cd98c41e 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:25-08-29 + image: superng6/aria2:a2b-stable-24-11-01 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/aria2-superng6_24-11-01/.env b/dockge/aria2-superng6_25-08-29/.env similarity index 100% rename from dockge/aria2-superng6_24-11-01/.env rename to dockge/aria2-superng6_25-08-29/.env diff --git a/dockge/aria2-superng6_24-11-01/docker-compose.yml b/dockge/aria2-superng6_25-08-29/docker-compose.yml similarity index 96% rename from dockge/aria2-superng6_24-11-01/docker-compose.yml rename to dockge/aria2-superng6_25-08-29/docker-compose.yml index 6cd98c41e..52b1b90c2 100644 --- a/dockge/aria2-superng6_24-11-01/docker-compose.yml +++ b/dockge/aria2-superng6_25-08-29/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_24-11-01/envs/default.env b/dockge/aria2-superng6_25-08-29/envs/default.env similarity index 100% rename from dockge/aria2-superng6_24-11-01/envs/default.env rename to dockge/aria2-superng6_25-08-29/envs/default.env diff --git a/dockge/aria2-superng6_24-11-01/envs/global.env b/dockge/aria2-superng6_25-08-29/envs/global.env similarity index 100% rename from dockge/aria2-superng6_24-11-01/envs/global.env rename to dockge/aria2-superng6_25-08-29/envs/global.env diff --git a/dockge/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index c6c114077..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.4.1 + image: emby/embyserver:4.8.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/.env b/dockge/emby_4_9_4_1/.env similarity index 100% rename from dockge/emby_4_8_11_0/.env rename to dockge/emby_4_9_4_1/.env diff --git a/dockge/emby_4_8_11_0/docker-compose.yml b/dockge/emby_4_9_4_1/docker-compose.yml similarity index 96% rename from dockge/emby_4_8_11_0/docker-compose.yml rename to dockge/emby_4_9_4_1/docker-compose.yml index a461e63ac..c6c114077 100644 --- a/dockge/emby_4_8_11_0/docker-compose.yml +++ b/dockge/emby_4_9_4_1/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_8_11_0/envs/default.env b/dockge/emby_4_9_4_1/envs/default.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/default.env rename to dockge/emby_4_9_4_1/envs/default.env diff --git a/dockge/emby_4_8_11_0/envs/global.env b/dockge/emby_4_9_4_1/envs/global.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/global.env rename to dockge/emby_4_9_4_1/envs/global.env diff --git a/dockge/homarr/.env b/dockge/homarr/.env index 820a114c6..4610427ed 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -7,3 +7,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..c85588cd2 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.59.2 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_59_2/.env b/dockge/homarr_0_15_10/.env similarity index 59% rename from dockge/homarr_1_59_2/.env rename to dockge/homarr_0_15_10/.env index 4610427ed..820a114c6 100644 --- a/dockge/homarr_1_59_2/.env +++ b/dockge/homarr_0_15_10/.env @@ -7,6 +7,3 @@ HOMARR_ROOT_PATH=/home/homarr # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=7575 -# 密钥 [必填] -SECRET_ENCRYPTION_KEY=7f0f511ce7898929066688ee9146aa509293a6c58a345ea0ea7270e7b34ff32d - diff --git a/dockge/homarr_1_59_2/docker-compose.yml b/dockge/homarr_0_15_10/docker-compose.yml similarity index 65% rename from dockge/homarr_1_59_2/docker-compose.yml rename to dockge/homarr_0_15_10/docker-compose.yml index c85588cd2..3b26c2c66 100644 --- a/dockge/homarr_1_59_2/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.59.2 + 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_59_2/envs/default.env b/dockge/homarr_0_15_10/envs/default.env similarity index 100% rename from dockge/homarr_1_59_2/envs/default.env rename to dockge/homarr_0_15_10/envs/default.env diff --git a/dockge/homarr_1_59_2/envs/global.env b/dockge/homarr_0_15_10/envs/global.env similarity index 100% rename from dockge/homarr_1_59_2/envs/global.env rename to dockge/homarr_0_15_10/envs/global.env diff --git a/dockge/iyuu-plus/docker-compose.yml b/dockge/iyuu-plus/docker-compose.yml index 39b4c1ba0..142aaa4d5 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-nodb:latest + image: iyuucn/iyuuplus:latest labels: createdBy: Apps networks: diff --git a/dockge/iyuu-plus_latest-mysql/.env b/dockge/iyuu-plus_latest/.env similarity index 100% rename from dockge/iyuu-plus_latest-mysql/.env rename to dockge/iyuu-plus_latest/.env diff --git a/dockge/iyuu-plus_latest-mysql/docker-compose.yml b/dockge/iyuu-plus_latest/docker-compose.yml similarity index 95% rename from dockge/iyuu-plus_latest-mysql/docker-compose.yml rename to dockge/iyuu-plus_latest/docker-compose.yml index 142aaa4d5..39b4c1ba0 100644 --- a/dockge/iyuu-plus_latest-mysql/docker-compose.yml +++ b/dockge/iyuu-plus_latest/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-mysql/envs/default.env b/dockge/iyuu-plus_latest/envs/default.env similarity index 100% rename from dockge/iyuu-plus_latest-mysql/envs/default.env rename to dockge/iyuu-plus_latest/envs/default.env diff --git a/dockge/iyuu-plus_latest-mysql/envs/global.env b/dockge/iyuu-plus_latest/envs/global.env similarity index 100% rename from dockge/iyuu-plus_latest-mysql/envs/global.env rename to dockge/iyuu-plus_latest/envs/global.env diff --git a/dockge/mediacms/.env b/dockge/mediacms/.env index e86cd2493..cb8a090ef 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 # 数据库 端口 [必填] -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/docker-compose.yml b/dockge/mediacms/docker-compose.yml index 5c5c8be7e..250eae7fd 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: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_4_1_0/.env b/dockge/mediacms_7_2_0/.env similarity index 89% rename from dockge/mediacms_4_1_0/.env rename to dockge/mediacms_7_2_0/.env index cb8a090ef..e86cd2493 100644 --- a/dockge/mediacms_4_1_0/.env +++ b/dockge/mediacms_7_2_0/.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_4_1_0/docker-compose.yml b/dockge/mediacms_7_2_0/docker-compose.yml similarity index 93% rename from dockge/mediacms_4_1_0/docker-compose.yml rename to dockge/mediacms_7_2_0/docker-compose.yml index 250eae7fd..5c5c8be7e 100644 --- a/dockge/mediacms_4_1_0/docker-compose.yml +++ b/dockge/mediacms_7_2_0/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_4_1_0/envs/default.env b/dockge/mediacms_7_2_0/envs/default.env similarity index 100% rename from dockge/mediacms_4_1_0/envs/default.env rename to dockge/mediacms_7_2_0/envs/default.env diff --git a/dockge/mediacms_4_1_0/envs/global.env b/dockge/mediacms_7_2_0/envs/global.env similarity index 100% rename from dockge/mediacms_4_1_0/envs/global.env rename to dockge/mediacms_7_2_0/envs/global.env diff --git a/dockge/minio/.env b/dockge/minio/.env index f98243a34..7addb6af6 100644 --- a/dockge/minio/.env +++ b/dockge/minio/.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/docker-compose.yml b/dockge/minio/docker-compose.yml index 2bc78e830..4e37e835a 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 :${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-09-07/.env b/dockge/minio_2025-04-22/.env similarity index 86% rename from dockge/minio_2025-09-07/.env rename to dockge/minio_2025-04-22/.env index 7addb6af6..f98243a34 100644 --- a/dockge/minio_2025-09-07/.env +++ b/dockge/minio_2025-04-22/.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_2025-09-07/docker-compose.yml b/dockge/minio_2025-04-22/docker-compose.yml similarity index 83% rename from dockge/minio_2025-09-07/docker-compose.yml rename to dockge/minio_2025-04-22/docker-compose.yml index 4e37e835a..2bc78e830 100644 --- a/dockge/minio_2025-09-07/docker-compose.yml +++ b/dockge/minio_2025-04-22/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-09-07/envs/default.env b/dockge/minio_2025-04-22/envs/default.env similarity index 100% rename from dockge/minio_2025-09-07/envs/default.env rename to dockge/minio_2025-04-22/envs/default.env diff --git a/dockge/minio_2025-09-07/envs/global.env b/dockge/minio_2025-04-22/envs/global.env similarity index 100% rename from dockge/minio_2025-09-07/envs/global.env rename to dockge/minio_2025-04-22/envs/global.env diff --git a/dockge/mysql/config/my.cnf b/dockge/mysql/config/my.cnf index 6d6e1a932..c53ca32dc 100644 --- a/dockge/mysql/config/my.cnf +++ b/dockge/mysql/config/my.cnf @@ -1,42 +1,20 @@ -# 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 +host_cache_size=0 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 +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/ -!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql/docker-compose.yml b/dockge/mysql/docker-compose.yml index 5cac14f48..f2401c2cc 100644 --- a/dockge/mysql/docker-compose.yml +++ b/dockge/mysql/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_8_4_9/.env b/dockge/mysql_5_7_44/.env similarity index 100% rename from dockge/mysql_8_4_9/.env rename to dockge/mysql_5_7_44/.env diff --git a/dockge/mysql_5_7_44/config/my.cnf b/dockge/mysql_5_7_44/config/my.cnf new file mode 100644 index 000000000..6d6e1a932 --- /dev/null +++ b/dockge/mysql_5_7_44/config/my.cnf @@ -0,0 +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] +# +# 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_8_4_9/docker-compose.yml b/dockge/mysql_5_7_44/docker-compose.yml similarity index 65% rename from dockge/mysql_8_4_9/docker-compose.yml rename to dockge/mysql_5_7_44/docker-compose.yml index f2401c2cc..5cac14f48 100644 --- a/dockge/mysql_8_4_9/docker-compose.yml +++ b/dockge/mysql_5_7_44/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_8_4_9/envs/default.env b/dockge/mysql_5_7_44/envs/default.env similarity index 100% rename from dockge/mysql_8_4_9/envs/default.env rename to dockge/mysql_5_7_44/envs/default.env diff --git a/dockge/mysql_8_4_9/envs/global.env b/dockge/mysql_5_7_44/envs/global.env similarity index 100% rename from dockge/mysql_8_4_9/envs/global.env rename to dockge/mysql_5_7_44/envs/global.env diff --git a/dockge/mysql_8_4_9/config/my.cnf b/dockge/mysql_8_4_9/config/my.cnf deleted file mode 100644 index c53ca32dc..000000000 --- a/dockge/mysql_8_4_9/config/my.cnf +++ /dev/null @@ -1,20 +0,0 @@ -[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/nodepassdash/docker-compose.yml b/dockge/nodepassdash/docker-compose.yml index 1802df3f3..b9a42c35e 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:3.3.1 + image: ghcr.io/nodepassproject/nodepassdash:2.2.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/nodepassdash_2_2_1/.env b/dockge/nodepassdash_3_3_1/.env similarity index 100% rename from dockge/nodepassdash_2_2_1/.env rename to dockge/nodepassdash_3_3_1/.env diff --git a/dockge/nodepassdash_2_2_1/docker-compose.yml b/dockge/nodepassdash_3_3_1/docker-compose.yml similarity index 90% rename from dockge/nodepassdash_2_2_1/docker-compose.yml rename to dockge/nodepassdash_3_3_1/docker-compose.yml index b9a42c35e..1802df3f3 100644 --- a/dockge/nodepassdash_2_2_1/docker-compose.yml +++ b/dockge/nodepassdash_3_3_1/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_2_2_1/envs/default.env b/dockge/nodepassdash_3_3_1/envs/default.env similarity index 100% rename from dockge/nodepassdash_2_2_1/envs/default.env rename to dockge/nodepassdash_3_3_1/envs/default.env diff --git a/dockge/nodepassdash_2_2_1/envs/global.env b/dockge/nodepassdash_3_3_1/envs/global.env similarity index 100% rename from dockge/nodepassdash_2_2_1/envs/global.env rename to dockge/nodepassdash_3_3_1/envs/global.env diff --git a/dockge/omnibox_2_1_3/2.0.4-lite/docker-compose.yml b/dockge/omnibox/2.0.4-lite/docker-compose.yml similarity index 100% rename from dockge/omnibox_2_1_3/2.0.4-lite/docker-compose.yml rename to dockge/omnibox/2.0.4-lite/docker-compose.yml diff --git a/dockge/omnibox_2_1_3/2.0.4-lite/envs/default.env b/dockge/omnibox/2.0.4-lite/envs/default.env similarity index 100% rename from dockge/omnibox_2_1_3/2.0.4-lite/envs/default.env rename to dockge/omnibox/2.0.4-lite/envs/default.env diff --git a/dockge/omnibox_2_1_3/2.0.4-lite/envs/global.env b/dockge/omnibox/2.0.4-lite/envs/global.env similarity index 100% rename from dockge/omnibox_2_1_3/2.0.4-lite/envs/global.env rename to dockge/omnibox/2.0.4-lite/envs/global.env diff --git a/dockge/omnibox/docker-compose.yml b/dockge/omnibox/docker-compose.yml index 906fd45a4..84904bb9f 100644 --- a/dockge/omnibox/docker-compose.yml +++ b/dockge/omnibox/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_2_1_3/.env b/dockge/omnibox_1_4_4/.env similarity index 100% rename from dockge/omnibox_2_1_3/.env rename to dockge/omnibox_1_4_4/.env diff --git a/dockge/omnibox_2_1_3/docker-compose.yml b/dockge/omnibox_1_4_4/docker-compose.yml similarity index 81% rename from dockge/omnibox_2_1_3/docker-compose.yml rename to dockge/omnibox_1_4_4/docker-compose.yml index 84904bb9f..906fd45a4 100644 --- a/dockge/omnibox_2_1_3/docker-compose.yml +++ b/dockge/omnibox_1_4_4/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_2_1_3/envs/default.env b/dockge/omnibox_1_4_4/envs/default.env similarity index 100% rename from dockge/omnibox_2_1_3/envs/default.env rename to dockge/omnibox_1_4_4/envs/default.env diff --git a/dockge/omnibox_2_1_3/envs/global.env b/dockge/omnibox_1_4_4/envs/global.env similarity index 100% rename from dockge/omnibox_2_1_3/envs/global.env rename to dockge/omnibox_1_4_4/envs/global.env diff --git a/dockge/outline/.env b/dockge/outline/.env index b19151eb8..2e9c1dd49 100644 --- a/dockge/outline/.env +++ b/dockge/outline/.env @@ -11,23 +11,14 @@ OUTLINE_ROOT_PATH=/home/outline PANEL_APP_PORT_HTTP=3000 # 加密密钥 [必填] -SECRET_KEY=fbad4f5da794acbc10f060cdfcf8673300f3302d87f076d7f6e781d4840e9c3d +SECRET_KEY= # 工具密钥 [必填] -UTILS_SECRET=b2be1c54acbfe6d965bda01e63195cc815e4743a6fb5ba5f82eae916d98989b5 +UTILS_SECRET= # 域名 [必填] URL=http://127.0.0.1:3000 -# CDN 域名 -CDN_URL= - -# iFramely 地址 [必填] -IFRAMELY_URL=https://iframe.ly/api/iframely - -# iFramely 密钥 -IFRAMELY_API_KEY= - # 数据库 主机地址 [必填] DB_HOSTNAME=127.0.0.1 @@ -52,57 +43,12 @@ SLACK_CLIENT_ID= # Slack 客户端密钥 (鉴权) SLACK_CLIENT_SECRET= -# Google 客户端 ID (鉴权) -GOOGLE_CLIENT_ID= +# 强制使用 HTTPS [必填] +FORCE_HTTPS=false -# Google 客户端密钥 (鉴权) -GOOGLE_CLIENT_SECRET= +# HTTP 代理 +HTTP_PROXY= -# Discord 客户端 ID (鉴权) -DISCORD_CLIENT_ID= - -# Discord 客户端密钥 (鉴权) -DISCORD_CLIENT_SECRET= - -# Discord 服务端 ID (鉴权) -DISCORD_SERVER_ID= - -# Discord 服务端角色 (鉴权) -DISCORD_SERVER_ROLES= - -# SMTP 主机 -SMTP_HOST= - -# SMTP 端口 -SMTP_PORT=465 - -# SMTP 用户名 -SMTP_USERNAME= - -# SMTP 密码 -SMTP_PASSWORD= - -# SMTP 发件人 -SMTP_FROM_EMAIL= - -# Slack 验证令牌 (Slack 集成) -SLACK_VERIFICATION_TOKEN= - -# Slack 应用ID (Slack 集成) -SLACK_APP_ID= - -# GitHub 客户端 ID (GitHub 集成) -GITHUB_CLIENT_ID= - -# GitHub 客户端密钥 (GitHub 集成) -GITHUB_CLIENT_SECRET= - -# GitHub 应用名称 (GitHub 集成) -GITHUB_APP_NAME= - -# GitHub 应用ID (GitHub 集成) -GITHUB_APP_ID= - -# GitHub 应用私钥 (GitHub 集成) -GITHUB_APP_PRIVATE_KEY= +# 忽略代理 +NO_PROXY=localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local diff --git a/dockge/outline/docker-compose.yml b/dockge/outline/docker-compose.yml index 3a643b7d6..1a43396d9 100644 --- a/dockge/outline/docker-compose.yml +++ b/dockge/outline/docker-compose.yml @@ -9,8 +9,11 @@ services: - ./envs/outline.env - .env environment: + - HTTP_PROXY=${HTTP_PROXY} + - HTTPS_PROXY=${HTTP_PROXY} + - NO_PROXY=${NO_PROXY} - DATABASE_URL=postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: outlinewiki/outline:1.2.0 + image: outlinewiki/outline:1.6.1 labels: createdBy: Apps networks: diff --git a/dockge/outline/envs/outline.env b/dockge/outline/envs/outline.env index 1e366c08f..f247c73fb 100644 --- a/dockge/outline/envs/outline.env +++ b/dockge/outline/envs/outline.env @@ -1,104 +1,156 @@ -# –––––––––––––––– REQUIRED –––––––––––––––– - NODE_ENV=production -# Generate a hex-encoded 32-byte random key. You should use `openssl rand -hex 32` -# in your terminal to generate a random value. -SECRET_KEY=generate_a_new_key +# 访问地址 +URL= -# Generate a unique random key. The format is not important but you could still use -# `openssl rand -hex 32` in your terminal to produce this. -UTILS_SECRET=generate_a_new_key - -# For production point these at your databases, in development the default -# should work out of the box. -DATABASE_URL=postgres://user:pass@localhost:5432/outline -DATABASE_CONNECTION_POOL_MIN= -DATABASE_CONNECTION_POOL_MAX= -# Uncomment this to disable SSL for connecting to Postgres -PGSSLMODE=disable - -# For redis you can either specify an ioredis compatible url like this -REDIS_URL=redis://localhost:6379 -# or alternatively, if you would like to provide additional connection options, -# use a base64 encoded JSON connection option object. Refer to the ioredis documentation -# for a list of available options. -# Example: Use Redis Sentinel for high availability -# {"sentinels":[{"host":"sentinel-0","port":26379},{"host":"sentinel-1","port":26379}],"name":"mymaster"} -# REDIS_URL=ioredis://eyJzZW50aW5lbHMiOlt7Imhvc3QiOiJzZW50aW5lbC0wIiwicG9ydCI6MjYzNzl9LHsiaG9zdCI6InNlbnRpbmVsLTEiLCJwb3J0IjoyNjM3OX1dLCJuYW1lIjoibXltYXN0ZXIifQ== - -# URL should point to the fully qualified, publicly accessible URL. If using a -# proxy the port in URL and PORT may be different. -URL=http://127.0.0.1:3000 +# 服务端口 PORT=3000 -# See [documentation](docs/SERVICES.md) on running a separate collaboration -# server, for normal operation this does not need to be set. +# 运行一个独立的协作服务 COLLABORATION_URL= -# Specify what storage system to use. Possible value is one of "s3" or "local". -# For "local", the avatar images and document attachments will be saved on local disk. +# CDN 分发服务 +CDN_URL= + +# 启动多少个 Web 进程 +WEB_CONCURRENCY=1 + +# 生成一个 32 字节的随机密钥（十六进制编码）。 +# 可在终端中使用命令：`openssl rand -hex 32` +# SECRET_KEY= + +# 生成一个唯一的随机密钥。 +# 格式并不重要，但同样可以使用：`openssl rand -hex 32` +# UTILS_SECRET= + +# 默认界面语言。 +# 可用语言代码及其大致翻译完成度请参考：https://translate.getoutline.com +DEFAULT_LANGUAGE=zh_CN + + +# –––––––––––––––––––––––––––––––––––––– +# ––––––––––––– 数据库（DATABASE） ––––––––––––– +# –––––––––––––––––––––––––––––––––––––– + +# 生产环境数据库连接地址， +# 需包含用户名、密码、主机、端口以及数据库名。 +# DATABASE_URL=postgres://user:pass@postgres:5432/outline + +# 每个进程的数据库连接池（内存中）配置。 +# 请确保连接池大小不会超过数据库允许的最大连接数。 +# 默认最小值为 0，最大值为 5。 +DATABASE_CONNECTION_POOL_MIN=0 +DATABASE_CONNECTION_POOL_MAX=5 + +# 如果你不打算使用 SSL 连接 Postgres，请取消注释此行。 +# 当数据库与应用部署在同一台机器上时，这是可以接受的。 +PGSSLMODE=disable + + +# –––––––––––––––––––––––––––––––––––––– +# –––––––––––––– Redis ––––––––––––––– +# –––––––––––––––––––––––––––––––––––––– + +# Redis 连接地址。 +# 可以是 ioredis 兼容的 URL，或者 Base64 编码后的配置对象。 +# 文档：https://docs.getoutline.com/s/hosting/doc/redis-LGM4BFXYp4 +# REDIS_URL=redis://redis:6379 + +# 若要启用协作服务的横向扩展（多实例），必须提供 Redis 地址。 +# 可以与上面的 REDIS_URL 相同，也可以使用不同的 Redis 服务。 +# 文档：https://docs.getoutline.com/s/hosting/doc/horizontal-scaling-hkfU5Stao7 +# REDIS_COLLABORATION_URL= + + +# –––––––––––––––––––––––––––––––––––––– +# ––––––––––– 文件存储（FILE STORAGE） ––––––––––– +# –––––––––––––––––––––––––––––––––––––– + +# 指定使用的存储系统。 +# 可选值："s3" 或 "local"。 +# - local：图片和文档附件存储在本地磁盘 +# - s3：存储在兼容 S3 的对象存储服务中 +# 文档：https://docs.getoutline.com/s/hosting/doc/file-storage-N4M0T6Ypu7 FILE_STORAGE=local -# If "local" is configured for FILE_STORAGE above, then this sets the parent directory under -# which all attachments/images go. Make sure that the process has permissions to create -# this path and also to write files to it. +# 当 FILE_STORAGE=local 时， +# 此路径为所有附件 / 图片的父目录。 +# 请确保进程有权限创建该目录并写入文件。 FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data -# Maximum allowed size for the uploaded attachment. +# 单个附件允许上传的最大大小（字节）。 FILE_STORAGE_UPLOAD_MAX_SIZE=262144000 -# Override the maximum size of document imports, generally this should be lower -# than the document attachment maximum size. +# 覆盖“文档导入”的最大文件大小， +# 通常应小于普通文档附件的最大限制。 FILE_STORAGE_IMPORT_MAX_SIZE= -# Override the maximum size of workspace imports, these can be especially large -# and the files are temporary being automatically deleted after a period of time. +# 覆盖“工作区导入”的最大文件大小。 +# 该类文件通常非常大，并且是临时文件， +# 在一段时间后会被自动删除。 FILE_STORAGE_WORKSPACE_IMPORT_MAX_SIZE= -# To support uploading of images for avatars and document attachments in a distributed -# architecture an s3-compatible storage can be configured if FILE_STORAGE=s3 above. -AWS_ACCESS_KEY_ID=get_a_key_from_aws -AWS_SECRET_ACCESS_KEY=get_the_secret_of_above_key -AWS_REGION=xx-xxxx-x -AWS_S3_ACCELERATE_URL= -AWS_S3_UPLOAD_BUCKET_URL=http://s3:4569 -AWS_S3_UPLOAD_BUCKET_NAME=bucket_name_here -AWS_S3_FORCE_PATH_STYLE=true -AWS_S3_ACL=private +# 若要在分布式架构中支持头像图片和文档附件上传， +# 当 FILE_STORAGE=s3 时，可配置兼容 S3 的对象存储。 +# AWS_ACCESS_KEY_ID=get_a_key_from_aws +# AWS_SECRET_ACCESS_KEY=get_the_secret_of_above_key +# AWS_REGION=xx-xxxx-x +# AWS_S3_ACCELERATE_URL= +# AWS_S3_UPLOAD_BUCKET_URL=http://s3:4569 +# AWS_S3_UPLOAD_BUCKET_NAME=bucket_name_here +# AWS_S3_FORCE_PATH_STYLE=true +# AWS_S3_ACL=private -# –––––––––––––– AUTHENTICATION –––––––––––––– -# Third party signin credentials, at least ONE OF EITHER Google, Slack, -# or Microsoft is required for a working installation or you'll have no sign-in -# options. +# –––––––––––––––––––––––––––––––––––––– +# –––––––––––––––– SSL ––––––––––––––– +# –––––––––––––––––––––––––––––––––––––– -# To configure Slack auth, you'll need to create an Application at -# => https://api.slack.com/apps -# -# When configuring the Client ID, add a redirect URL under "OAuth & Permissions": -# https:///auth/slack.callback -SLACK_CLIENT_ID=get_a_key_from_slack -SLACK_CLIENT_SECRET=get_the_secret_of_above_key +# HTTPS 终止所需的私钥和证书（Base64 编码）。 +# 这是三种 SSL 配置方式之一，可以留空。 +# 文档：https://docs.getoutline.com/s/hosting/doc/ssl-pzk7WO8d1n +SSL_KEY= +SSL_CERT= -# To configure Google auth, you'll need to create an OAuth Client ID at -# => https://console.cloud.google.com/apis/credentials -# -# When configuring the Client ID, add an Authorized redirect URI: -# https:///auth/google.callback +# 在生产环境中是否强制跳转到 HTTPS。 +# 默认值为 true； +# 如果你确定 SSL 已由外部负载均衡器终止，可以设置为 false。 +# FORCE_HTTPS=true + + +# –––––––––––––––––––––––––––––––––––––– +# –––––––––– 认证（AUTHENTICATION） –––––––––– +# –––––––––––––––––––––––––––––––––––––– + +# 第三方登录配置。 +# 至少需要配置以下之一：Google、Slack、Discord 或 Microsoft， +# 否则系统将没有任何登录方式。 + +# Slack 登录 +# 文档：https://docs.getoutline.com/s/hosting/doc/slack-sgMujR8J9J +SLACK_CLIENT_ID= +SLACK_CLIENT_SECRET= + +# Google 登录 +# 文档：https://docs.getoutline.com/s/hosting/doc/google-hOuvtCmTqQ GOOGLE_CLIENT_ID= GOOGLE_CLIENT_SECRET= -# To configure Microsoft/Azure auth, you'll need to create an OAuth Client. See -# the guide for details on setting up your Azure App: -# => https://wiki.generaloutline.com/share/dfa77e56-d4d2-4b51-8ff8-84ea6608faa4 +# Microsoft Entra / Azure AD 登录 +# 文档：https://docs.getoutline.com/s/hosting/doc/microsoft-entra-UVz6jsIOcv AZURE_CLIENT_ID= AZURE_CLIENT_SECRET= AZURE_RESOURCE_APP_ID= -# To configure generic OIDC auth, you'll need some kind of identity provider. -# See documentation for whichever IdP you use to acquire the following info: -# Redirect URI is https:///auth/oidc.callback +# Discord 登录 +# 文档：https://docs.getoutline.com/s/hosting/doc/discord-g4JdWFFub6 +DISCORD_CLIENT_ID= +DISCORD_CLIENT_SECRET= +DISCORD_SERVER_ID= +DISCORD_SERVER_ROLES= + +# 通用 OIDC（OpenID Connect）提供方 +# 文档：https://docs.getoutline.com/s/hosting/doc/oidc-8CPBm6uC0I OIDC_CLIENT_ID= OIDC_CLIENT_SECRET= OIDC_AUTH_URI= @@ -106,119 +158,107 @@ OIDC_TOKEN_URI= OIDC_USERINFO_URI= OIDC_LOGOUT_URI= -# Specify which claims to derive user information from -# Supports any valid JSON path with the JWT payload +# 指定用于派生用户信息的声明（claim）。 +# 支持任何 JWT payload 中的合法 JSON Path。 OIDC_USERNAME_CLAIM=preferred_username -# Display name for OIDC authentication +# OIDC 登录方式在界面上显示的名称 OIDC_DISPLAY_NAME=OpenID Connect -# Space separated auth scopes. +# OIDC 授权作用域（以空格分隔） OIDC_SCOPES=openid profile email -# To configure the GitHub integration, you'll need to create a GitHub App at -# => https://github.com/settings/apps -# -# When configuring the Client ID, add a redirect URL under "Permissions & events": -# https:///api/github.callback + +# –––––––––––––––––––––––––––––––––––––– +# –––––––––––––– 邮件（EMAIL） ––––––––––––––– +# –––––––––––––––––––––––––––––––––––––– + +# 若要发送诸如“文档更新通知”或“邮箱登录”等事务性邮件， +# 需要配置一个 SMTP 服务器。 +# 可使用以下列表中的任意服务： +# https://community.nodemailer.com/2-0-0-beta/setup-smtp/well-known-services/ +# 文档：https://docs.getoutline.com/s/hosting/doc/smtp-cqCJyZGMIB +SMTP_SERVICE= +SMTP_USERNAME= +SMTP_PASSWORD= +SMTP_FROM_EMAIL= + + +# –––––––––––––––––––––––––––––––––––––– +# –––––––––– 限流器（RATE LIMITER） –––––––––––– +# –––––––––––––––––––––––––––––––––––––– + +# 是否启用限流器 +RATE_LIMITER_ENABLED=true + +# 各个接口本身有硬编码的限流规则（在启用上项后生效）， +# 以下是一个全局限流器配置，作用于所有请求。 +RATE_LIMITER_REQUESTS=1000 +RATE_LIMITER_DURATION_WINDOW=60 + + +# –––––––––––––––––––––––––––––––––––––– +# ––––––––––– 集成（INTEGRATIONS） ––––––––––– +# –––––––––––––––––––––––––––––––––––––– + +# GitHub 集成，用于预览 Issue 和 Pull Request 链接 +# 文档：https://docs.getoutline.com/s/hosting/doc/github-GchT3NNxI9 GITHUB_CLIENT_ID= GITHUB_CLIENT_SECRET= +GITHUB_WEBHOOK_SECRET= GITHUB_APP_NAME= GITHUB_APP_ID= GITHUB_APP_PRIVATE_KEY= -# To configure Discord auth, you'll need to create a Discord Application at -# => https://discord.com/developers/applications/ -# -# When configuring the Client ID, add a redirect URL under "OAuth2": -# https:///auth/discord.callback -DISCORD_CLIENT_ID= -DISCORD_CLIENT_SECRET= +# Linear 集成，用于将 Issue 链接显示为富文本提及 +LINEAR_CLIENT_ID= +LINEAR_CLIENT_SECRET= -# DISCORD_SERVER_ID should be the ID of the Discord server that Outline is -# integrated with. -# Used to verify that the user is a member of the server as well as server -# metadata such as nicknames, server icon and name. -DISCORD_SERVER_ID= - -# DISCORD_SERVER_ROLES should be a comma separated list of role IDs that are -# allowed to access Outline. If this is not set, all members of the server -# will be allowed to access Outline. -# DISCORD_SERVER_ID and DISCORD_SERVER_ROLES must be set together. -DISCORD_SERVER_ROLES= - -# –––––––––––––––– OPTIONAL –––––––––––––––– - -# Base64 encoded private key and certificate for HTTPS termination. This is only -# required if you do not use an external reverse proxy. See documentation: -# https://wiki.generaloutline.com/share/1c922644-40d8-41fe-98f9-df2b67239d45 -SSL_KEY= -SSL_CERT= - -# If using a Cloudfront/Cloudflare distribution or similar it can be set below. -# This will cause paths to javascript, stylesheets, and images to be updated to -# the hostname defined in CDN_URL. In your CDN configuration the origin server -# should be set to the same as URL. -CDN_URL= - -# Auto-redirect to https in production. The default is true but you may set to -# false if you can be sure that SSL is terminated at an external loadbalancer. -FORCE_HTTPS=false - -# Have the installation check for updates by sending anonymized statistics to -# the maintainers -ENABLE_UPDATES=true - -# How many processes should be spawned. As a reasonable rule divide your servers -# available memory by 512 for a rough estimate -WEB_CONCURRENCY=1 - -# You can remove this line if your reverse proxy already logs incoming http -# requests and this ends up being duplicative -DEBUG=http - -# Configure lowest severity level for server logs. Should be one of -# error, warn, info, http, verbose, debug and silly -LOG_LEVEL=info - -# For a complete Slack integration with search and posting to channels the -# following configs are also needed, some more details -# => https://wiki.generaloutline.com/share/be25efd1-b3ef-4450-b8e5-c4a4fc11e02a -# -SLACK_VERIFICATION_TOKEN=your_token -SLACK_APP_ID=A0XXXXXXX +# 若要实现完整的 Slack 集成（搜索、向频道发送消息）， +# 除 Slack 登录外，还需要以下配置： +# 文档：https://docs.getoutline.com/s/hosting/doc/slack-G2mc8DOJHk +SLACK_VERIFICATION_TOKEN= +SLACK_APP_ID= SLACK_MESSAGE_ACTIONS=true -# Optionally enable Sentry (sentry.io) to track errors and performance, -# and optionally add a Sentry proxy tunnel for bypassing ad blockers in the UI: -# https://docs.sentry.io/platforms/javascript/troubleshooting/#using-the-tunnel-option) +# Figma 集成，用于将设计文件显示为富文本预览 +FIGMA_CLIENT_ID= +FIGMA_CLIENT_SECRET= + +# Dropbox 集成。 +# 按以下说明获取 key：https://www.dropbox.com/developers/embedder#setup +# 并记得在应用设置中将你的域名加入白名单。 +DROPBOX_APP_KEY= + +# 可选：启用 Sentry（sentry.io）用于错误和性能监控 +# 文档：https://docs.getoutline.com/s/hosting/doc/sentry-jxcFttcDl5 SENTRY_DSN= SENTRY_TUNNEL= -# To support sending outgoing transactional emails such as "document updated" or -# "you've been invited" you'll need to provide authentication for an SMTP server -SMTP_HOST= -SMTP_PORT= -SMTP_USERNAME= -SMTP_PASSWORD= -SMTP_FROM_EMAIL= -SMTP_REPLY_EMAIL= -SMTP_TLS_CIPHERS= -SMTP_SECURE=true +# 启用从 Notion 工作区导入页面 +# 文档：https://docs.getoutline.com/s/hosting/doc/notion-2v6g7WY3l3 +NOTION_CLIENT_ID= +NOTION_CLIENT_SECRET= -# The default interface language. See translate.getoutline.com for a list of -# available language codes and their rough percentage translated. -DEFAULT_LANGUAGE=zh_CN +# Iframely 集成，允许在 Outline 中预览第三方内容。 +# 例如：鼠标悬停在外部链接上时显示预览。 +# 文档：https://docs.getoutline.com/s/hosting/doc/iframely-HwLF1EZ9mo +IFRAMELY_URL= +IFRAMELY_API_KEY= -# Optionally enable rate limiter at application web server -RATE_LIMITER_ENABLED=true -# Configure default throttling parameters for rate limiter -RATE_LIMITER_REQUESTS=1000 -RATE_LIMITER_DURATION_WINDOW=60 +# –––––––––––––––––––––––––––––––––––––– +# ––––––––––––– 调试（DEBUGGING） –––––––––––– +# –––––––––––––––––––––––––––––––––––––– -# Iframely API config -# https://iframe.ly/api/oembed -# https://iframe.ly/api/iframely -IFRAMELY_URL=https://iframe.ly/api/iframely -# IFRAMELY_API_KEY= +# 是否通过发送匿名统计信息来检查更新 +ENABLE_UPDATES=false + +# 启用的调试分类。 +# 如果你的代理已经记录了 HTTP 请求日志， +# 可移除默认的 "http"，以避免重复日志。 +DEBUG=http + +# 服务器日志的最低级别，可选值： +# error, warn, info, http, verbose, debug, silly +LOG_LEVEL=info diff --git a/dockge/outline_1_2_0/.env b/dockge/outline_1_2_0/.env new file mode 100644 index 000000000..b19151eb8 --- /dev/null +++ b/dockge/outline_1_2_0/.env @@ -0,0 +1,108 @@ +# Redis 服务 (前置检查) [必填] +PANEL_REDIS_TYPE=redis + +# Postgres 服务 (前置检查) [必填] +PANEL_POSTGRES_TYPE=postgresql + +# 数据持久化路径 [必填] +OUTLINE_ROOT_PATH=/home/outline + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3000 + +# 加密密钥 [必填] +SECRET_KEY=fbad4f5da794acbc10f060cdfcf8673300f3302d87f076d7f6e781d4840e9c3d + +# 工具密钥 [必填] +UTILS_SECRET=b2be1c54acbfe6d965bda01e63195cc815e4743a6fb5ba5f82eae916d98989b5 + +# 域名 [必填] +URL=http://127.0.0.1:3000 + +# CDN 域名 +CDN_URL= + +# iFramely 地址 [必填] +IFRAMELY_URL=https://iframe.ly/api/iframely + +# iFramely 密钥 +IFRAMELY_API_KEY= + +# 数据库 主机地址 [必填] +DB_HOSTNAME=127.0.0.1 + +# 数据库 端口 [必填] +DB_PORT=5432 + +# 数据库 用户名 [必填] +DB_USERNAME=outline + +# 数据库 密码 [必填] +DB_PASSWORD= + +# 数据库 名称 [必填] +DB_DATABASE_NAME=outline + +# Redis 链接 [必填] +REDIS_URL=redis://localhost:6379 + +# Slack 客户端 ID (鉴权) +SLACK_CLIENT_ID= + +# Slack 客户端密钥 (鉴权) +SLACK_CLIENT_SECRET= + +# Google 客户端 ID (鉴权) +GOOGLE_CLIENT_ID= + +# Google 客户端密钥 (鉴权) +GOOGLE_CLIENT_SECRET= + +# Discord 客户端 ID (鉴权) +DISCORD_CLIENT_ID= + +# Discord 客户端密钥 (鉴权) +DISCORD_CLIENT_SECRET= + +# Discord 服务端 ID (鉴权) +DISCORD_SERVER_ID= + +# Discord 服务端角色 (鉴权) +DISCORD_SERVER_ROLES= + +# SMTP 主机 +SMTP_HOST= + +# SMTP 端口 +SMTP_PORT=465 + +# SMTP 用户名 +SMTP_USERNAME= + +# SMTP 密码 +SMTP_PASSWORD= + +# SMTP 发件人 +SMTP_FROM_EMAIL= + +# Slack 验证令牌 (Slack 集成) +SLACK_VERIFICATION_TOKEN= + +# Slack 应用ID (Slack 集成) +SLACK_APP_ID= + +# GitHub 客户端 ID (GitHub 集成) +GITHUB_CLIENT_ID= + +# GitHub 客户端密钥 (GitHub 集成) +GITHUB_CLIENT_SECRET= + +# GitHub 应用名称 (GitHub 集成) +GITHUB_APP_NAME= + +# GitHub 应用ID (GitHub 集成) +GITHUB_APP_ID= + +# GitHub 应用私钥 (GitHub 集成) +GITHUB_APP_PRIVATE_KEY= + diff --git a/dockge/outline_1_6_1/docker-compose.yml b/dockge/outline_1_2_0/docker-compose.yml similarity index 79% rename from dockge/outline_1_6_1/docker-compose.yml rename to dockge/outline_1_2_0/docker-compose.yml index 1a43396d9..3a643b7d6 100644 --- a/dockge/outline_1_6_1/docker-compose.yml +++ b/dockge/outline_1_2_0/docker-compose.yml @@ -9,11 +9,8 @@ services: - ./envs/outline.env - .env environment: - - HTTP_PROXY=${HTTP_PROXY} - - HTTPS_PROXY=${HTTP_PROXY} - - NO_PROXY=${NO_PROXY} - DATABASE_URL=postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: outlinewiki/outline:1.6.1 + image: outlinewiki/outline:1.2.0 labels: createdBy: Apps networks: diff --git a/dockge/outline_1_6_1/envs/default.env b/dockge/outline_1_2_0/envs/default.env similarity index 100% rename from dockge/outline_1_6_1/envs/default.env rename to dockge/outline_1_2_0/envs/default.env diff --git a/dockge/outline_1_6_1/envs/global.env b/dockge/outline_1_2_0/envs/global.env similarity index 100% rename from dockge/outline_1_6_1/envs/global.env rename to dockge/outline_1_2_0/envs/global.env diff --git a/dockge/outline_1_2_0/envs/outline.env b/dockge/outline_1_2_0/envs/outline.env new file mode 100644 index 000000000..1e366c08f --- /dev/null +++ b/dockge/outline_1_2_0/envs/outline.env @@ -0,0 +1,224 @@ +# –––––––––––––––– REQUIRED –––––––––––––––– + +NODE_ENV=production + +# Generate a hex-encoded 32-byte random key. You should use `openssl rand -hex 32` +# in your terminal to generate a random value. +SECRET_KEY=generate_a_new_key + +# Generate a unique random key. The format is not important but you could still use +# `openssl rand -hex 32` in your terminal to produce this. +UTILS_SECRET=generate_a_new_key + +# For production point these at your databases, in development the default +# should work out of the box. +DATABASE_URL=postgres://user:pass@localhost:5432/outline +DATABASE_CONNECTION_POOL_MIN= +DATABASE_CONNECTION_POOL_MAX= +# Uncomment this to disable SSL for connecting to Postgres +PGSSLMODE=disable + +# For redis you can either specify an ioredis compatible url like this +REDIS_URL=redis://localhost:6379 +# or alternatively, if you would like to provide additional connection options, +# use a base64 encoded JSON connection option object. Refer to the ioredis documentation +# for a list of available options. +# Example: Use Redis Sentinel for high availability +# {"sentinels":[{"host":"sentinel-0","port":26379},{"host":"sentinel-1","port":26379}],"name":"mymaster"} +# REDIS_URL=ioredis://eyJzZW50aW5lbHMiOlt7Imhvc3QiOiJzZW50aW5lbC0wIiwicG9ydCI6MjYzNzl9LHsiaG9zdCI6InNlbnRpbmVsLTEiLCJwb3J0IjoyNjM3OX1dLCJuYW1lIjoibXltYXN0ZXIifQ== + +# URL should point to the fully qualified, publicly accessible URL. If using a +# proxy the port in URL and PORT may be different. +URL=http://127.0.0.1:3000 +PORT=3000 + +# See [documentation](docs/SERVICES.md) on running a separate collaboration +# server, for normal operation this does not need to be set. +COLLABORATION_URL= + +# Specify what storage system to use. Possible value is one of "s3" or "local". +# For "local", the avatar images and document attachments will be saved on local disk. +FILE_STORAGE=local + +# If "local" is configured for FILE_STORAGE above, then this sets the parent directory under +# which all attachments/images go. Make sure that the process has permissions to create +# this path and also to write files to it. +FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data + +# Maximum allowed size for the uploaded attachment. +FILE_STORAGE_UPLOAD_MAX_SIZE=262144000 + +# Override the maximum size of document imports, generally this should be lower +# than the document attachment maximum size. +FILE_STORAGE_IMPORT_MAX_SIZE= + +# Override the maximum size of workspace imports, these can be especially large +# and the files are temporary being automatically deleted after a period of time. +FILE_STORAGE_WORKSPACE_IMPORT_MAX_SIZE= + +# To support uploading of images for avatars and document attachments in a distributed +# architecture an s3-compatible storage can be configured if FILE_STORAGE=s3 above. +AWS_ACCESS_KEY_ID=get_a_key_from_aws +AWS_SECRET_ACCESS_KEY=get_the_secret_of_above_key +AWS_REGION=xx-xxxx-x +AWS_S3_ACCELERATE_URL= +AWS_S3_UPLOAD_BUCKET_URL=http://s3:4569 +AWS_S3_UPLOAD_BUCKET_NAME=bucket_name_here +AWS_S3_FORCE_PATH_STYLE=true +AWS_S3_ACL=private + +# –––––––––––––– AUTHENTICATION –––––––––––––– + +# Third party signin credentials, at least ONE OF EITHER Google, Slack, +# or Microsoft is required for a working installation or you'll have no sign-in +# options. + +# To configure Slack auth, you'll need to create an Application at +# => https://api.slack.com/apps +# +# When configuring the Client ID, add a redirect URL under "OAuth & Permissions": +# https:///auth/slack.callback +SLACK_CLIENT_ID=get_a_key_from_slack +SLACK_CLIENT_SECRET=get_the_secret_of_above_key + +# To configure Google auth, you'll need to create an OAuth Client ID at +# => https://console.cloud.google.com/apis/credentials +# +# When configuring the Client ID, add an Authorized redirect URI: +# https:///auth/google.callback +GOOGLE_CLIENT_ID= +GOOGLE_CLIENT_SECRET= + +# To configure Microsoft/Azure auth, you'll need to create an OAuth Client. See +# the guide for details on setting up your Azure App: +# => https://wiki.generaloutline.com/share/dfa77e56-d4d2-4b51-8ff8-84ea6608faa4 +AZURE_CLIENT_ID= +AZURE_CLIENT_SECRET= +AZURE_RESOURCE_APP_ID= + +# To configure generic OIDC auth, you'll need some kind of identity provider. +# See documentation for whichever IdP you use to acquire the following info: +# Redirect URI is https:///auth/oidc.callback +OIDC_CLIENT_ID= +OIDC_CLIENT_SECRET= +OIDC_AUTH_URI= +OIDC_TOKEN_URI= +OIDC_USERINFO_URI= +OIDC_LOGOUT_URI= + +# Specify which claims to derive user information from +# Supports any valid JSON path with the JWT payload +OIDC_USERNAME_CLAIM=preferred_username + +# Display name for OIDC authentication +OIDC_DISPLAY_NAME=OpenID Connect + +# Space separated auth scopes. +OIDC_SCOPES=openid profile email + +# To configure the GitHub integration, you'll need to create a GitHub App at +# => https://github.com/settings/apps +# +# When configuring the Client ID, add a redirect URL under "Permissions & events": +# https:///api/github.callback +GITHUB_CLIENT_ID= +GITHUB_CLIENT_SECRET= +GITHUB_APP_NAME= +GITHUB_APP_ID= +GITHUB_APP_PRIVATE_KEY= + +# To configure Discord auth, you'll need to create a Discord Application at +# => https://discord.com/developers/applications/ +# +# When configuring the Client ID, add a redirect URL under "OAuth2": +# https:///auth/discord.callback +DISCORD_CLIENT_ID= +DISCORD_CLIENT_SECRET= + +# DISCORD_SERVER_ID should be the ID of the Discord server that Outline is +# integrated with. +# Used to verify that the user is a member of the server as well as server +# metadata such as nicknames, server icon and name. +DISCORD_SERVER_ID= + +# DISCORD_SERVER_ROLES should be a comma separated list of role IDs that are +# allowed to access Outline. If this is not set, all members of the server +# will be allowed to access Outline. +# DISCORD_SERVER_ID and DISCORD_SERVER_ROLES must be set together. +DISCORD_SERVER_ROLES= + +# –––––––––––––––– OPTIONAL –––––––––––––––– + +# Base64 encoded private key and certificate for HTTPS termination. This is only +# required if you do not use an external reverse proxy. See documentation: +# https://wiki.generaloutline.com/share/1c922644-40d8-41fe-98f9-df2b67239d45 +SSL_KEY= +SSL_CERT= + +# If using a Cloudfront/Cloudflare distribution or similar it can be set below. +# This will cause paths to javascript, stylesheets, and images to be updated to +# the hostname defined in CDN_URL. In your CDN configuration the origin server +# should be set to the same as URL. +CDN_URL= + +# Auto-redirect to https in production. The default is true but you may set to +# false if you can be sure that SSL is terminated at an external loadbalancer. +FORCE_HTTPS=false + +# Have the installation check for updates by sending anonymized statistics to +# the maintainers +ENABLE_UPDATES=true + +# How many processes should be spawned. As a reasonable rule divide your servers +# available memory by 512 for a rough estimate +WEB_CONCURRENCY=1 + +# You can remove this line if your reverse proxy already logs incoming http +# requests and this ends up being duplicative +DEBUG=http + +# Configure lowest severity level for server logs. Should be one of +# error, warn, info, http, verbose, debug and silly +LOG_LEVEL=info + +# For a complete Slack integration with search and posting to channels the +# following configs are also needed, some more details +# => https://wiki.generaloutline.com/share/be25efd1-b3ef-4450-b8e5-c4a4fc11e02a +# +SLACK_VERIFICATION_TOKEN=your_token +SLACK_APP_ID=A0XXXXXXX +SLACK_MESSAGE_ACTIONS=true + +# Optionally enable Sentry (sentry.io) to track errors and performance, +# and optionally add a Sentry proxy tunnel for bypassing ad blockers in the UI: +# https://docs.sentry.io/platforms/javascript/troubleshooting/#using-the-tunnel-option) +SENTRY_DSN= +SENTRY_TUNNEL= + +# To support sending outgoing transactional emails such as "document updated" or +# "you've been invited" you'll need to provide authentication for an SMTP server +SMTP_HOST= +SMTP_PORT= +SMTP_USERNAME= +SMTP_PASSWORD= +SMTP_FROM_EMAIL= +SMTP_REPLY_EMAIL= +SMTP_TLS_CIPHERS= +SMTP_SECURE=true + +# The default interface language. See translate.getoutline.com for a list of +# available language codes and their rough percentage translated. +DEFAULT_LANGUAGE=zh_CN + +# Optionally enable rate limiter at application web server +RATE_LIMITER_ENABLED=true + +# Configure default throttling parameters for rate limiter +RATE_LIMITER_REQUESTS=1000 +RATE_LIMITER_DURATION_WINDOW=60 + +# Iframely API config +# https://iframe.ly/api/oembed +# https://iframe.ly/api/iframely +IFRAMELY_URL=https://iframe.ly/api/iframely +# IFRAMELY_API_KEY= diff --git a/dockge/outline_1_6_1/.env b/dockge/outline_1_6_1/.env deleted file mode 100644 index 2e9c1dd49..000000000 --- a/dockge/outline_1_6_1/.env +++ /dev/null @@ -1,54 +0,0 @@ -# Redis 服务 (前置检查) [必填] -PANEL_REDIS_TYPE=redis - -# Postgres 服务 (前置检查) [必填] -PANEL_POSTGRES_TYPE=postgresql - -# 数据持久化路径 [必填] -OUTLINE_ROOT_PATH=/home/outline - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3000 - -# 加密密钥 [必填] -SECRET_KEY= - -# 工具密钥 [必填] -UTILS_SECRET= - -# 域名 [必填] -URL=http://127.0.0.1:3000 - -# 数据库 主机地址 [必填] -DB_HOSTNAME=127.0.0.1 - -# 数据库 端口 [必填] -DB_PORT=5432 - -# 数据库 用户名 [必填] -DB_USERNAME=outline - -# 数据库 密码 [必填] -DB_PASSWORD= - -# 数据库 名称 [必填] -DB_DATABASE_NAME=outline - -# Redis 链接 [必填] -REDIS_URL=redis://localhost:6379 - -# Slack 客户端 ID (鉴权) -SLACK_CLIENT_ID= - -# Slack 客户端密钥 (鉴权) -SLACK_CLIENT_SECRET= - -# 强制使用 HTTPS [必填] -FORCE_HTTPS=false - -# HTTP 代理 -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/outline_1_6_1/envs/outline.env b/dockge/outline_1_6_1/envs/outline.env deleted file mode 100644 index f247c73fb..000000000 --- a/dockge/outline_1_6_1/envs/outline.env +++ /dev/null @@ -1,264 +0,0 @@ -NODE_ENV=production - -# 访问地址 -URL= - -# 服务端口 -PORT=3000 - -# 运行一个独立的协作服务 -COLLABORATION_URL= - -# CDN 分发服务 -CDN_URL= - -# 启动多少个 Web 进程 -WEB_CONCURRENCY=1 - -# 生成一个 32 字节的随机密钥（十六进制编码）。 -# 可在终端中使用命令：`openssl rand -hex 32` -# SECRET_KEY= - -# 生成一个唯一的随机密钥。 -# 格式并不重要，但同样可以使用：`openssl rand -hex 32` -# UTILS_SECRET= - -# 默认界面语言。 -# 可用语言代码及其大致翻译完成度请参考：https://translate.getoutline.com -DEFAULT_LANGUAGE=zh_CN - - -# –––––––––––––––––––––––––––––––––––––– -# ––––––––––––– 数据库（DATABASE） ––––––––––––– -# –––––––––––––––––––––––––––––––––––––– - -# 生产环境数据库连接地址， -# 需包含用户名、密码、主机、端口以及数据库名。 -# DATABASE_URL=postgres://user:pass@postgres:5432/outline - -# 每个进程的数据库连接池（内存中）配置。 -# 请确保连接池大小不会超过数据库允许的最大连接数。 -# 默认最小值为 0，最大值为 5。 -DATABASE_CONNECTION_POOL_MIN=0 -DATABASE_CONNECTION_POOL_MAX=5 - -# 如果你不打算使用 SSL 连接 Postgres，请取消注释此行。 -# 当数据库与应用部署在同一台机器上时，这是可以接受的。 -PGSSLMODE=disable - - -# –––––––––––––––––––––––––––––––––––––– -# –––––––––––––– Redis ––––––––––––––– -# –––––––––––––––––––––––––––––––––––––– - -# Redis 连接地址。 -# 可以是 ioredis 兼容的 URL，或者 Base64 编码后的配置对象。 -# 文档：https://docs.getoutline.com/s/hosting/doc/redis-LGM4BFXYp4 -# REDIS_URL=redis://redis:6379 - -# 若要启用协作服务的横向扩展（多实例），必须提供 Redis 地址。 -# 可以与上面的 REDIS_URL 相同，也可以使用不同的 Redis 服务。 -# 文档：https://docs.getoutline.com/s/hosting/doc/horizontal-scaling-hkfU5Stao7 -# REDIS_COLLABORATION_URL= - - -# –––––––––––––––––––––––––––––––––––––– -# ––––––––––– 文件存储（FILE STORAGE） ––––––––––– -# –––––––––––––––––––––––––––––––––––––– - -# 指定使用的存储系统。 -# 可选值："s3" 或 "local"。 -# - local：图片和文档附件存储在本地磁盘 -# - s3：存储在兼容 S3 的对象存储服务中 -# 文档：https://docs.getoutline.com/s/hosting/doc/file-storage-N4M0T6Ypu7 -FILE_STORAGE=local - -# 当 FILE_STORAGE=local 时， -# 此路径为所有附件 / 图片的父目录。 -# 请确保进程有权限创建该目录并写入文件。 -FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data - -# 单个附件允许上传的最大大小（字节）。 -FILE_STORAGE_UPLOAD_MAX_SIZE=262144000 - -# 覆盖“文档导入”的最大文件大小， -# 通常应小于普通文档附件的最大限制。 -FILE_STORAGE_IMPORT_MAX_SIZE= - -# 覆盖“工作区导入”的最大文件大小。 -# 该类文件通常非常大，并且是临时文件， -# 在一段时间后会被自动删除。 -FILE_STORAGE_WORKSPACE_IMPORT_MAX_SIZE= - -# 若要在分布式架构中支持头像图片和文档附件上传， -# 当 FILE_STORAGE=s3 时，可配置兼容 S3 的对象存储。 -# AWS_ACCESS_KEY_ID=get_a_key_from_aws -# AWS_SECRET_ACCESS_KEY=get_the_secret_of_above_key -# AWS_REGION=xx-xxxx-x -# AWS_S3_ACCELERATE_URL= -# AWS_S3_UPLOAD_BUCKET_URL=http://s3:4569 -# AWS_S3_UPLOAD_BUCKET_NAME=bucket_name_here -# AWS_S3_FORCE_PATH_STYLE=true -# AWS_S3_ACL=private - - -# –––––––––––––––––––––––––––––––––––––– -# –––––––––––––––– SSL ––––––––––––––– -# –––––––––––––––––––––––––––––––––––––– - -# HTTPS 终止所需的私钥和证书（Base64 编码）。 -# 这是三种 SSL 配置方式之一，可以留空。 -# 文档：https://docs.getoutline.com/s/hosting/doc/ssl-pzk7WO8d1n -SSL_KEY= -SSL_CERT= - -# 在生产环境中是否强制跳转到 HTTPS。 -# 默认值为 true； -# 如果你确定 SSL 已由外部负载均衡器终止，可以设置为 false。 -# FORCE_HTTPS=true - - -# –––––––––––––––––––––––––––––––––––––– -# –––––––––– 认证（AUTHENTICATION） –––––––––– -# –––––––––––––––––––––––––––––––––––––– - -# 第三方登录配置。 -# 至少需要配置以下之一：Google、Slack、Discord 或 Microsoft， -# 否则系统将没有任何登录方式。 - -# Slack 登录 -# 文档：https://docs.getoutline.com/s/hosting/doc/slack-sgMujR8J9J -SLACK_CLIENT_ID= -SLACK_CLIENT_SECRET= - -# Google 登录 -# 文档：https://docs.getoutline.com/s/hosting/doc/google-hOuvtCmTqQ -GOOGLE_CLIENT_ID= -GOOGLE_CLIENT_SECRET= - -# Microsoft Entra / Azure AD 登录 -# 文档：https://docs.getoutline.com/s/hosting/doc/microsoft-entra-UVz6jsIOcv -AZURE_CLIENT_ID= -AZURE_CLIENT_SECRET= -AZURE_RESOURCE_APP_ID= - -# Discord 登录 -# 文档：https://docs.getoutline.com/s/hosting/doc/discord-g4JdWFFub6 -DISCORD_CLIENT_ID= -DISCORD_CLIENT_SECRET= -DISCORD_SERVER_ID= -DISCORD_SERVER_ROLES= - -# 通用 OIDC（OpenID Connect）提供方 -# 文档：https://docs.getoutline.com/s/hosting/doc/oidc-8CPBm6uC0I -OIDC_CLIENT_ID= -OIDC_CLIENT_SECRET= -OIDC_AUTH_URI= -OIDC_TOKEN_URI= -OIDC_USERINFO_URI= -OIDC_LOGOUT_URI= - -# 指定用于派生用户信息的声明（claim）。 -# 支持任何 JWT payload 中的合法 JSON Path。 -OIDC_USERNAME_CLAIM=preferred_username - -# OIDC 登录方式在界面上显示的名称 -OIDC_DISPLAY_NAME=OpenID Connect - -# OIDC 授权作用域（以空格分隔） -OIDC_SCOPES=openid profile email - - -# –––––––––––––––––––––––––––––––––––––– -# –––––––––––––– 邮件（EMAIL） ––––––––––––––– -# –––––––––––––––––––––––––––––––––––––– - -# 若要发送诸如“文档更新通知”或“邮箱登录”等事务性邮件， -# 需要配置一个 SMTP 服务器。 -# 可使用以下列表中的任意服务： -# https://community.nodemailer.com/2-0-0-beta/setup-smtp/well-known-services/ -# 文档：https://docs.getoutline.com/s/hosting/doc/smtp-cqCJyZGMIB -SMTP_SERVICE= -SMTP_USERNAME= -SMTP_PASSWORD= -SMTP_FROM_EMAIL= - - -# –––––––––––––––––––––––––––––––––––––– -# –––––––––– 限流器（RATE LIMITER） –––––––––––– -# –––––––––––––––––––––––––––––––––––––– - -# 是否启用限流器 -RATE_LIMITER_ENABLED=true - -# 各个接口本身有硬编码的限流规则（在启用上项后生效）， -# 以下是一个全局限流器配置，作用于所有请求。 -RATE_LIMITER_REQUESTS=1000 -RATE_LIMITER_DURATION_WINDOW=60 - - -# –––––––––––––––––––––––––––––––––––––– -# ––––––––––– 集成（INTEGRATIONS） ––––––––––– -# –––––––––––––––––––––––––––––––––––––– - -# GitHub 集成，用于预览 Issue 和 Pull Request 链接 -# 文档：https://docs.getoutline.com/s/hosting/doc/github-GchT3NNxI9 -GITHUB_CLIENT_ID= -GITHUB_CLIENT_SECRET= -GITHUB_WEBHOOK_SECRET= -GITHUB_APP_NAME= -GITHUB_APP_ID= -GITHUB_APP_PRIVATE_KEY= - -# Linear 集成，用于将 Issue 链接显示为富文本提及 -LINEAR_CLIENT_ID= -LINEAR_CLIENT_SECRET= - -# 若要实现完整的 Slack 集成（搜索、向频道发送消息）， -# 除 Slack 登录外，还需要以下配置： -# 文档：https://docs.getoutline.com/s/hosting/doc/slack-G2mc8DOJHk -SLACK_VERIFICATION_TOKEN= -SLACK_APP_ID= -SLACK_MESSAGE_ACTIONS=true - -# Figma 集成，用于将设计文件显示为富文本预览 -FIGMA_CLIENT_ID= -FIGMA_CLIENT_SECRET= - -# Dropbox 集成。 -# 按以下说明获取 key：https://www.dropbox.com/developers/embedder#setup -# 并记得在应用设置中将你的域名加入白名单。 -DROPBOX_APP_KEY= - -# 可选：启用 Sentry（sentry.io）用于错误和性能监控 -# 文档：https://docs.getoutline.com/s/hosting/doc/sentry-jxcFttcDl5 -SENTRY_DSN= -SENTRY_TUNNEL= - -# 启用从 Notion 工作区导入页面 -# 文档：https://docs.getoutline.com/s/hosting/doc/notion-2v6g7WY3l3 -NOTION_CLIENT_ID= -NOTION_CLIENT_SECRET= - -# Iframely 集成，允许在 Outline 中预览第三方内容。 -# 例如：鼠标悬停在外部链接上时显示预览。 -# 文档：https://docs.getoutline.com/s/hosting/doc/iframely-HwLF1EZ9mo -IFRAMELY_URL= -IFRAMELY_API_KEY= - - -# –––––––––––––––––––––––––––––––––––––– -# ––––––––––––– 调试（DEBUGGING） –––––––––––– -# –––––––––––––––––––––––––––––––––––––– - -# 是否通过发送匿名统计信息来检查更新 -ENABLE_UPDATES=false - -# 启用的调试分类。 -# 如果你的代理已经记录了 HTTP 请求日志， -# 可移除默认的 "http"，以避免重复日志。 -DEBUG=http - -# 服务器日志的最低级别，可选值： -# error, warn, info, http, verbose, debug, silly -LOG_LEVEL=info diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index 701ed5d91..3f2aed531 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-alpine + image: postgres:16.13 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_16_13/.env b/dockge/postgresql_16_13-alpine/.env similarity index 100% rename from dockge/postgresql_16_13/.env rename to dockge/postgresql_16_13-alpine/.env diff --git a/dockge/postgresql_16_13/docker-compose.yml b/dockge/postgresql_16_13-alpine/docker-compose.yml similarity index 94% rename from dockge/postgresql_16_13/docker-compose.yml rename to dockge/postgresql_16_13-alpine/docker-compose.yml index 3f2aed531..701ed5d91 100644 --- a/dockge/postgresql_16_13/docker-compose.yml +++ b/dockge/postgresql_16_13-alpine/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/envs/default.env b/dockge/postgresql_16_13-alpine/envs/default.env similarity index 100% rename from dockge/postgresql_16_13/envs/default.env rename to dockge/postgresql_16_13-alpine/envs/default.env diff --git a/dockge/postgresql_16_13/envs/global.env b/dockge/postgresql_16_13-alpine/envs/global.env similarity index 100% rename from dockge/postgresql_16_13/envs/global.env rename to dockge/postgresql_16_13-alpine/envs/global.env diff --git a/dockge/rust-srec/docker-compose.yml b/dockge/rust-srec/docker-compose.yml index fdea97fa8..44648cc45 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: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_dev/.env b/dockge/rust-srec_0_2_1/.env similarity index 100% rename from dockge/rust-srec_dev/.env rename to dockge/rust-srec_0_2_1/.env diff --git a/dockge/rust-srec_dev/docker-compose.yml b/dockge/rust-srec_0_2_1/docker-compose.yml similarity index 94% rename from dockge/rust-srec_dev/docker-compose.yml rename to dockge/rust-srec_0_2_1/docker-compose.yml index 44648cc45..fdea97fa8 100644 --- a/dockge/rust-srec_dev/docker-compose.yml +++ b/dockge/rust-srec_0_2_1/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_dev/envs/default.env b/dockge/rust-srec_0_2_1/envs/default.env similarity index 100% rename from dockge/rust-srec_dev/envs/default.env rename to dockge/rust-srec_0_2_1/envs/default.env diff --git a/dockge/rust-srec_dev/envs/global.env b/dockge/rust-srec_0_2_1/envs/global.env similarity index 100% rename from dockge/rust-srec_dev/envs/global.env rename to dockge/rust-srec_0_2_1/envs/global.env diff --git a/dockge/rustdesk-api/.env b/dockge/rustdesk-api/.env index 96a0fb5a5..057e9b006 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 a532d45e1..aad6a35ef 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-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_s6-latest/.env b/dockge/rustdesk-api_2_6_29/.env similarity index 97% rename from dockge/rustdesk-api_s6-latest/.env rename to dockge/rustdesk-api_2_6_29/.env index 057e9b006..96a0fb5a5 100644 --- a/dockge/rustdesk-api_s6-latest/.env +++ b/dockge/rustdesk-api_2_6_29/.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_s6-latest/conf/hbbr/run b/dockge/rustdesk-api_2_6_29/conf/hbbr/run similarity index 100% rename from dockge/rustdesk-api_s6-latest/conf/hbbr/run rename to dockge/rustdesk-api_2_6_29/conf/hbbr/run diff --git a/dockge/rustdesk-api_s6-latest/conf/hbbs/run b/dockge/rustdesk-api_2_6_29/conf/hbbs/run similarity index 100% rename from dockge/rustdesk-api_s6-latest/conf/hbbs/run rename to dockge/rustdesk-api_2_6_29/conf/hbbs/run diff --git a/dockge/rustdesk-api_s6-latest/docker-compose.yml b/dockge/rustdesk-api_2_6_29/docker-compose.yml similarity index 70% rename from dockge/rustdesk-api_s6-latest/docker-compose.yml rename to dockge/rustdesk-api_2_6_29/docker-compose.yml index aad6a35ef..a532d45e1 100644 --- a/dockge/rustdesk-api_s6-latest/docker-compose.yml +++ b/dockge/rustdesk-api_2_6_29/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_s6-latest/envs/default.env b/dockge/rustdesk-api_2_6_29/envs/default.env similarity index 100% rename from dockge/rustdesk-api_s6-latest/envs/default.env rename to dockge/rustdesk-api_2_6_29/envs/default.env diff --git a/dockge/rustdesk-api_s6-latest/envs/global.env b/dockge/rustdesk-api_2_6_29/envs/global.env similarity index 100% rename from dockge/rustdesk-api_s6-latest/envs/global.env rename to dockge/rustdesk-api_2_6_29/envs/global.env diff --git a/dockge/umami-mysql/docker-compose.yml b/dockge/umami-mysql/docker-compose.yml index 3767a8aeb..0ed830dcb 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.20.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_20_0/.env similarity index 100% rename from dockge/umami-mysql_2_16_0/.env rename to dockge/umami-mysql_2_20_0/.env diff --git a/dockge/umami-mysql_2_16_0/docker-compose.yml b/dockge/umami-mysql_2_20_0/docker-compose.yml similarity index 91% rename from dockge/umami-mysql_2_16_0/docker-compose.yml rename to dockge/umami-mysql_2_20_0/docker-compose.yml index 0ed830dcb..3767a8aeb 100644 --- a/dockge/umami-mysql_2_16_0/docker-compose.yml +++ b/dockge/umami-mysql_2_20_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.20.0 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_16_0/envs/default.env b/dockge/umami-mysql_2_20_0/envs/default.env similarity index 100% rename from dockge/umami-mysql_2_16_0/envs/default.env rename to dockge/umami-mysql_2_20_0/envs/default.env diff --git a/dockge/umami-mysql_2_16_0/envs/global.env b/dockge/umami-mysql_2_20_0/envs/global.env similarity index 100% rename from dockge/umami-mysql_2_16_0/envs/global.env rename to dockge/umami-mysql_2_20_0/envs/global.env diff --git a/dockge/umami/docker-compose.yml b/dockge/umami/docker-compose.yml index 220221cf9..73fb562d5 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.20.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_20_0/.env similarity index 100% rename from dockge/umami_2_16_0/.env rename to dockge/umami_2_20_0/.env diff --git a/dockge/umami_2_16_0/docker-compose.yml b/dockge/umami_2_20_0/docker-compose.yml similarity index 90% rename from dockge/umami_2_16_0/docker-compose.yml rename to dockge/umami_2_20_0/docker-compose.yml index 73fb562d5..220221cf9 100644 --- a/dockge/umami_2_16_0/docker-compose.yml +++ b/dockge/umami_2_20_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.20.0 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_16_0/envs/default.env b/dockge/umami_2_20_0/envs/default.env similarity index 100% rename from dockge/umami_2_16_0/envs/default.env rename to dockge/umami_2_20_0/envs/default.env diff --git a/dockge/umami_2_16_0/envs/global.env b/dockge/umami_2_20_0/envs/global.env similarity index 100% rename from dockge/umami_2_16_0/envs/global.env rename to dockge/umami_2_20_0/envs/global.env diff --git a/dockge/uptime-kuma/.env b/dockge/uptime-kuma/.env index 5fa74c158..046e55ee2 100644 --- a/dockge/uptime-kuma/.env +++ b/dockge/uptime-kuma/.env @@ -4,9 +4,21 @@ UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3001 -# Cloudflared 隧道令牌 -UPTIME_KUMA_CLOUDFLARED_TOKEN= +# 数据库类型 [必填] +UPTIME_KUMA_DB_TYPE=sqlite -# 禁用 Frame SameOrigin [必填] -UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false +# 数据库主机名 (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/docker-compose.yml b/dockge/uptime-kuma/docker-compose.yml index a7f5ebaaa..9ec52b604 100644 --- a/dockge/uptime-kuma/docker-compose.yml +++ b/dockge/uptime-kuma/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/.env b/dockge/uptime-kuma_1_23_17/.env new file mode 100644 index 000000000..5fa74c158 --- /dev/null +++ b/dockge/uptime-kuma_1_23_17/.env @@ -0,0 +1,12 @@ +# 数据持久化路径 [必填] +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/docker-compose.yml b/dockge/uptime-kuma_1_23_17/docker-compose.yml similarity index 52% rename from dockge/uptime-kuma_2_2_1/docker-compose.yml rename to dockge/uptime-kuma_1_23_17/docker-compose.yml index 9ec52b604..a7f5ebaaa 100644 --- a/dockge/uptime-kuma_2_2_1/docker-compose.yml +++ b/dockge/uptime-kuma_1_23_17/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_2_2_1/envs/default.env b/dockge/uptime-kuma_1_23_17/envs/default.env similarity index 100% rename from dockge/uptime-kuma_2_2_1/envs/default.env rename to dockge/uptime-kuma_1_23_17/envs/default.env diff --git a/dockge/uptime-kuma_2_2_1/envs/global.env b/dockge/uptime-kuma_1_23_17/envs/global.env similarity index 100% rename from dockge/uptime-kuma_2_2_1/envs/global.env rename to dockge/uptime-kuma_1_23_17/envs/global.env diff --git a/dockge/uptime-kuma_2_2_1/.env b/dockge/uptime-kuma_2_2_1/.env deleted file mode 100644 index 046e55ee2..000000000 --- a/dockge/uptime-kuma_2_2_1/.env +++ /dev/null @@ -1,24 +0,0 @@ -# 数据持久化路径 [必填] -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= -