From 37acd8b4cff7f6d0f5b19eac9a9c5ef59564afe4 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sat, 12 Jul 2025 01:57:08 +0000 Subject: [PATCH] Processed apps directory via GitHub Actions --- dockge/ani-rss/docker-compose.yml | 5 +-- .../{ani-rss_1_2_82 => ani-rss_2_0_22}/.env | 0 .../docker-compose.yml | 5 ++- .../envs/default.env | 0 .../envs/global.env | 0 dockge/bili-fetcher/docker-compose.yml | 4 +- .../.env | 0 .../config/categories.json | 0 .../config/config.yaml | 0 .../config/scheduler_config.yaml | 0 .../config/sql_statements_mysql.py | 0 .../config/sql_statements_sqlite.py | 0 .../config/template.html | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 .../elastic-elasticsearch/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/elastic-kibana/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 .../docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/immich-no-machine/docker-compose.yml | 27 +++++++++++- .../.env | 0 .../docker-compose.yml | 27 +----------- .../envs/default.env | 0 .../envs/global.env | 0 dockge/immich-server/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/immich/docker-compose.yml | 29 +++++++++++-- .../{immich_1_132_3 => immich_1_135_3}/.env | 0 .../docker-compose.yml | 29 ++----------- .../envs/default.env | 0 .../envs/global.env | 0 dockge/iyuu-plus/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/jellyfin/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/minio/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/mysql/config/my.cnf | 34 ++++++++++++--- dockge/mysql/docker-compose.yml | 11 ++--- dockge/mysql_5_7_44/config/my.cnf | 42 ------------------- dockge/{mysql_5_7_44 => mysql_8_4_5}/.env | 0 dockge/mysql_8_4_5/config/my.cnf | 20 +++++++++ .../docker-compose.yml | 11 +++-- .../envs/default.env | 0 .../envs/global.env | 0 dockge/postgresql/docker-compose.yml | 4 +- .../.env | 0 .../docker-compose.yml | 4 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/rustdesk-api/.env | 2 +- dockge/rustdesk-api/docker-compose.yml | 33 ++++++--------- .../.env | 2 +- .../conf/hbbr/run | 0 .../conf/hbbs/run | 0 .../docker-compose.yml | 33 +++++++++------ .../envs/default.env | 0 .../envs/global.env | 0 dockge/umami-mysql/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/umami/docker-compose.yml | 2 +- dockge/{umami_2_16_0 => umami_2_18_1}/.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/uptime-kuma/.env | 6 --- dockge/uptime-kuma/docker-compose.yml | 11 +---- dockge/uptime-kuma_1_23_16/.env | 12 ++++++ .../docker-compose.yml | 11 ++++- .../envs/default.env | 0 .../envs/global.env | 0 dockge/uptime-kuma_2_0_0/.env | 6 --- 99 files changed, 204 insertions(+), 204 deletions(-) rename dockge/{ani-rss_1_2_82 => ani-rss_2_0_22}/.env (100%) rename dockge/{ani-rss_1_2_82 => ani-rss_2_0_22}/docker-compose.yml (90%) rename dockge/{ani-rss_1_2_82 => ani-rss_2_0_22}/envs/default.env (100%) rename dockge/{ani-rss_1_2_82 => ani-rss_2_0_22}/envs/global.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_0}/.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_0}/config/categories.json (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_0}/config/config.yaml (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_0}/config/scheduler_config.yaml (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_0}/config/sql_statements_mysql.py (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_0}/config/sql_statements_sqlite.py (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_0}/config/template.html (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_0}/docker-compose.yml (88%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_0}/envs/default.env (100%) rename dockge/{bili-fetcher_latest => bili-fetcher_1_6_0}/envs/global.env (100%) rename dockge/{elastic-elasticsearch_8_18_3 => elastic-elasticsearch_9_0_3}/.env (100%) rename dockge/{elastic-elasticsearch_8_18_3 => elastic-elasticsearch_9_0_3}/docker-compose.yml (96%) rename dockge/{elastic-elasticsearch_8_18_3 => elastic-elasticsearch_9_0_3}/envs/default.env (100%) rename dockge/{elastic-elasticsearch_8_18_3 => elastic-elasticsearch_9_0_3}/envs/global.env (100%) rename dockge/{elastic-kibana_8_18_3 => elastic-kibana_9_0_3}/.env (100%) rename dockge/{elastic-kibana_8_18_3 => elastic-kibana_9_0_3}/docker-compose.yml (95%) rename dockge/{elastic-kibana_8_18_3 => elastic-kibana_9_0_3}/envs/default.env (100%) rename dockge/{elastic-kibana_8_18_3 => elastic-kibana_9_0_3}/envs/global.env (100%) rename dockge/{immich-machine-learning_1_132_3 => immich-machine-learning_1_135_3}/.env (100%) rename dockge/{immich-machine-learning_1_132_3 => immich-machine-learning_1_135_3}/docker-compose.yml (87%) rename dockge/{immich-machine-learning_1_132_3 => immich-machine-learning_1_135_3}/envs/default.env (100%) rename dockge/{immich-machine-learning_1_132_3 => immich-machine-learning_1_135_3}/envs/global.env (100%) rename dockge/{immich-no-machine_1_132_3 => immich-no-machine_1_135_3}/.env (100%) rename dockge/{immich-no-machine_1_132_3 => immich-no-machine_1_135_3}/docker-compose.yml (54%) rename dockge/{immich-no-machine_1_132_3 => immich-no-machine_1_135_3}/envs/default.env (100%) rename dockge/{immich-no-machine_1_132_3 => immich-no-machine_1_135_3}/envs/global.env (100%) rename dockge/{immich-server_1_132_3 => immich-server_1_135_3}/.env (100%) rename dockge/{immich-server_1_132_3 => immich-server_1_135_3}/docker-compose.yml (89%) rename dockge/{immich-server_1_132_3 => immich-server_1_135_3}/envs/default.env (100%) rename dockge/{immich-server_1_132_3 => immich-server_1_135_3}/envs/global.env (100%) rename dockge/{immich_1_132_3 => immich_1_135_3}/.env (100%) rename dockge/{immich_1_132_3 => immich_1_135_3}/docker-compose.yml (59%) rename dockge/{immich_1_132_3 => immich_1_135_3}/envs/default.env (100%) rename dockge/{immich_1_132_3 => immich_1_135_3}/envs/global.env (100%) rename dockge/{iyuu-plus_latest-mysql => iyuu-plus_latest}/.env (100%) rename dockge/{iyuu-plus_latest-mysql => iyuu-plus_latest}/docker-compose.yml (95%) rename dockge/{iyuu-plus_latest-mysql => iyuu-plus_latest}/envs/default.env (100%) rename dockge/{iyuu-plus_latest-mysql => iyuu-plus_latest}/envs/global.env (100%) rename dockge/{jellyfin_10_10_7 => jellyfin_10_9_11}/.env (100%) rename dockge/{jellyfin_10_10_7 => jellyfin_10_9_11}/docker-compose.yml (96%) rename dockge/{jellyfin_10_10_7 => jellyfin_10_9_11}/envs/default.env (100%) rename dockge/{jellyfin_10_10_7 => jellyfin_10_9_11}/envs/global.env (100%) rename dockge/{minio_2025-04-22 => minio_2025-06-13}/.env (100%) rename dockge/{minio_2025-04-22 => minio_2025-06-13}/docker-compose.yml (93%) rename dockge/{minio_2025-04-22 => minio_2025-06-13}/envs/default.env (100%) rename dockge/{minio_2025-04-22 => minio_2025-06-13}/envs/global.env (100%) delete mode 100644 dockge/mysql_5_7_44/config/my.cnf rename dockge/{mysql_5_7_44 => mysql_8_4_5}/.env (100%) create mode 100644 dockge/mysql_8_4_5/config/my.cnf rename dockge/{mysql_5_7_44 => mysql_8_4_5}/docker-compose.yml (65%) rename dockge/{mysql_5_7_44 => mysql_8_4_5}/envs/default.env (100%) rename dockge/{mysql_5_7_44 => mysql_8_4_5}/envs/global.env (100%) rename dockge/{postgresql_pg16 => postgresql_16_9-alpine}/.env (100%) rename dockge/{postgresql_pg16 => postgresql_16_9-alpine}/docker-compose.yml (89%) rename dockge/{postgresql_pg16 => postgresql_16_9-alpine}/envs/default.env (100%) rename dockge/{postgresql_pg16 => postgresql_16_9-alpine}/envs/global.env (100%) rename dockge/{rustdesk-api_s6-latest => rustdesk-api_2_6_25}/.env (97%) rename dockge/{rustdesk-api_s6-latest => rustdesk-api_2_6_25}/conf/hbbr/run (100%) rename dockge/{rustdesk-api_s6-latest => rustdesk-api_2_6_25}/conf/hbbs/run (100%) rename dockge/{rustdesk-api_s6-latest => rustdesk-api_2_6_25}/docker-compose.yml (77%) rename dockge/{rustdesk-api_s6-latest => rustdesk-api_2_6_25}/envs/default.env (100%) rename dockge/{rustdesk-api_s6-latest => rustdesk-api_2_6_25}/envs/global.env (100%) rename dockge/{umami-mysql_2_16_0 => umami-mysql_2_18_1}/.env (100%) rename dockge/{umami-mysql_2_16_0 => umami-mysql_2_18_1}/docker-compose.yml (91%) rename dockge/{umami-mysql_2_16_0 => umami-mysql_2_18_1}/envs/default.env (100%) rename dockge/{umami-mysql_2_16_0 => umami-mysql_2_18_1}/envs/global.env (100%) rename dockge/{umami_2_16_0 => umami_2_18_1}/.env (100%) rename dockge/{umami_2_16_0 => umami_2_18_1}/docker-compose.yml (90%) rename dockge/{umami_2_16_0 => umami_2_18_1}/envs/default.env (100%) rename dockge/{umami_2_16_0 => umami_2_18_1}/envs/global.env (100%) create mode 100644 dockge/uptime-kuma_1_23_16/.env rename dockge/{uptime-kuma_2_0_0 => uptime-kuma_1_23_16}/docker-compose.yml (57%) rename dockge/{uptime-kuma_2_0_0 => uptime-kuma_1_23_16}/envs/default.env (100%) rename dockge/{uptime-kuma_2_0_0 => uptime-kuma_1_23_16}/envs/global.env (100%) delete mode 100644 dockge/uptime-kuma_2_0_0/.env diff --git a/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index 075d74ff7..9c6e13c66 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/docker-compose.yml @@ -8,13 +8,10 @@ services: - ./envs/global.env - .env environment: - - PUID=0 - - PGID=0 - - UMASK=022 - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v2.0.22 + image: wushuo894/ani-rss:v1.2.82 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_1_2_82/.env b/dockge/ani-rss_2_0_22/.env similarity index 100% rename from dockge/ani-rss_1_2_82/.env rename to dockge/ani-rss_2_0_22/.env diff --git a/dockge/ani-rss_1_2_82/docker-compose.yml b/dockge/ani-rss_2_0_22/docker-compose.yml similarity index 90% rename from dockge/ani-rss_1_2_82/docker-compose.yml rename to dockge/ani-rss_2_0_22/docker-compose.yml index 9c6e13c66..075d74ff7 100644 --- a/dockge/ani-rss_1_2_82/docker-compose.yml +++ b/dockge/ani-rss_2_0_22/docker-compose.yml @@ -8,10 +8,13 @@ services: - ./envs/global.env - .env environment: + - PUID=0 + - PGID=0 + - UMASK=022 - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v1.2.82 + image: wushuo894/ani-rss:v2.0.22 labels: createdBy: Apps networks: diff --git a/dockge/ani-rss_1_2_82/envs/default.env b/dockge/ani-rss_2_0_22/envs/default.env similarity index 100% rename from dockge/ani-rss_1_2_82/envs/default.env rename to dockge/ani-rss_2_0_22/envs/default.env diff --git a/dockge/ani-rss_1_2_82/envs/global.env b/dockge/ani-rss_2_0_22/envs/global.env similarity index 100% rename from dockge/ani-rss_1_2_82/envs/global.env rename to dockge/ani-rss_2_0_22/envs/global.env diff --git a/dockge/bili-fetcher/docker-compose.yml b/dockge/bili-fetcher/docker-compose.yml index d6ac7c0ac..c68c76b14 100644 --- a/dockge/bili-fetcher/docker-compose.yml +++ b/dockge/bili-fetcher/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:v1.6.0 + image: qyg2297248353/bili-fetcher:latest networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:v1.6.0 + image: qyg2297248353/bili-fetcher-web:latest labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_latest/.env b/dockge/bili-fetcher_1_6_0/.env similarity index 100% rename from dockge/bili-fetcher_latest/.env rename to dockge/bili-fetcher_1_6_0/.env diff --git a/dockge/bili-fetcher_latest/config/categories.json b/dockge/bili-fetcher_1_6_0/config/categories.json similarity index 100% rename from dockge/bili-fetcher_latest/config/categories.json rename to dockge/bili-fetcher_1_6_0/config/categories.json diff --git a/dockge/bili-fetcher_latest/config/config.yaml b/dockge/bili-fetcher_1_6_0/config/config.yaml similarity index 100% rename from dockge/bili-fetcher_latest/config/config.yaml rename to dockge/bili-fetcher_1_6_0/config/config.yaml diff --git a/dockge/bili-fetcher_latest/config/scheduler_config.yaml b/dockge/bili-fetcher_1_6_0/config/scheduler_config.yaml similarity index 100% rename from dockge/bili-fetcher_latest/config/scheduler_config.yaml rename to dockge/bili-fetcher_1_6_0/config/scheduler_config.yaml diff --git a/dockge/bili-fetcher_latest/config/sql_statements_mysql.py b/dockge/bili-fetcher_1_6_0/config/sql_statements_mysql.py similarity index 100% rename from dockge/bili-fetcher_latest/config/sql_statements_mysql.py rename to dockge/bili-fetcher_1_6_0/config/sql_statements_mysql.py diff --git a/dockge/bili-fetcher_latest/config/sql_statements_sqlite.py b/dockge/bili-fetcher_1_6_0/config/sql_statements_sqlite.py similarity index 100% rename from dockge/bili-fetcher_latest/config/sql_statements_sqlite.py rename to dockge/bili-fetcher_1_6_0/config/sql_statements_sqlite.py diff --git a/dockge/bili-fetcher_latest/config/template.html b/dockge/bili-fetcher_1_6_0/config/template.html similarity index 100% rename from dockge/bili-fetcher_latest/config/template.html rename to dockge/bili-fetcher_1_6_0/config/template.html diff --git a/dockge/bili-fetcher_latest/docker-compose.yml b/dockge/bili-fetcher_1_6_0/docker-compose.yml similarity index 88% rename from dockge/bili-fetcher_latest/docker-compose.yml rename to dockge/bili-fetcher_1_6_0/docker-compose.yml index c68c76b14..d6ac7c0ac 100644 --- a/dockge/bili-fetcher_latest/docker-compose.yml +++ b/dockge/bili-fetcher_1_6_0/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - DOCKER_ENV=true - image: qyg2297248353/bili-fetcher:latest + image: qyg2297248353/bili-fetcher:v1.6.0 networks: - 1panel-network ports: @@ -26,7 +26,7 @@ services: environment: - BACKEND_URL=http://bili-fetcher-api:8899 - TZ=Asia/Shanghai - image: qyg2297248353/bili-fetcher-web:latest + image: qyg2297248353/bili-fetcher-web:v1.6.0 labels: createdBy: Apps networks: diff --git a/dockge/bili-fetcher_latest/envs/default.env b/dockge/bili-fetcher_1_6_0/envs/default.env similarity index 100% rename from dockge/bili-fetcher_latest/envs/default.env rename to dockge/bili-fetcher_1_6_0/envs/default.env diff --git a/dockge/bili-fetcher_latest/envs/global.env b/dockge/bili-fetcher_1_6_0/envs/global.env similarity index 100% rename from dockge/bili-fetcher_latest/envs/global.env rename to dockge/bili-fetcher_1_6_0/envs/global.env diff --git a/dockge/elastic-elasticsearch/docker-compose.yml b/dockge/elastic-elasticsearch/docker-compose.yml index 4c7ede3ad..ad48150b1 100644 --- a/dockge/elastic-elasticsearch/docker-compose.yml +++ b/dockge/elastic-elasticsearch/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:9.0.3 + image: elasticsearch:8.18.3 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_8_18_3/.env b/dockge/elastic-elasticsearch_9_0_3/.env similarity index 100% rename from dockge/elastic-elasticsearch_8_18_3/.env rename to dockge/elastic-elasticsearch_9_0_3/.env diff --git a/dockge/elastic-elasticsearch_8_18_3/docker-compose.yml b/dockge/elastic-elasticsearch_9_0_3/docker-compose.yml similarity index 96% rename from dockge/elastic-elasticsearch_8_18_3/docker-compose.yml rename to dockge/elastic-elasticsearch_9_0_3/docker-compose.yml index ad48150b1..4c7ede3ad 100644 --- a/dockge/elastic-elasticsearch_8_18_3/docker-compose.yml +++ b/dockge/elastic-elasticsearch_9_0_3/docker-compose.yml @@ -11,7 +11,7 @@ services: - LICENSE=basic - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup - image: elasticsearch:8.18.3 + image: elasticsearch:9.0.3 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_8_18_3/envs/default.env b/dockge/elastic-elasticsearch_9_0_3/envs/default.env similarity index 100% rename from dockge/elastic-elasticsearch_8_18_3/envs/default.env rename to dockge/elastic-elasticsearch_9_0_3/envs/default.env diff --git a/dockge/elastic-elasticsearch_8_18_3/envs/global.env b/dockge/elastic-elasticsearch_9_0_3/envs/global.env similarity index 100% rename from dockge/elastic-elasticsearch_8_18_3/envs/global.env rename to dockge/elastic-elasticsearch_9_0_3/envs/global.env diff --git a/dockge/elastic-kibana/docker-compose.yml b/dockge/elastic-kibana/docker-compose.yml index 49f2e1c81..c090766d2 100644 --- a/dockge/elastic-kibana/docker-compose.yml +++ b/dockge/elastic-kibana/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:9.0.3 + image: kibana:8.18.3 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_8_18_3/.env b/dockge/elastic-kibana_9_0_3/.env similarity index 100% rename from dockge/elastic-kibana_8_18_3/.env rename to dockge/elastic-kibana_9_0_3/.env diff --git a/dockge/elastic-kibana_8_18_3/docker-compose.yml b/dockge/elastic-kibana_9_0_3/docker-compose.yml similarity index 95% rename from dockge/elastic-kibana_8_18_3/docker-compose.yml rename to dockge/elastic-kibana_9_0_3/docker-compose.yml index c090766d2..49f2e1c81 100644 --- a/dockge/elastic-kibana_8_18_3/docker-compose.yml +++ b/dockge/elastic-kibana_9_0_3/docker-compose.yml @@ -14,7 +14,7 @@ services: - I18N_LOCALE="zh-CN" - SERVER_SHUTDOWNTIMEOUT="5s" - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true - image: kibana:8.18.3 + image: kibana:9.0.3 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_8_18_3/envs/default.env b/dockge/elastic-kibana_9_0_3/envs/default.env similarity index 100% rename from dockge/elastic-kibana_8_18_3/envs/default.env rename to dockge/elastic-kibana_9_0_3/envs/default.env diff --git a/dockge/elastic-kibana_8_18_3/envs/global.env b/dockge/elastic-kibana_9_0_3/envs/global.env similarity index 100% rename from dockge/elastic-kibana_8_18_3/envs/global.env rename to dockge/elastic-kibana_9_0_3/envs/global.env diff --git a/dockge/immich-machine-learning/docker-compose.yml b/dockge/immich-machine-learning/docker-compose.yml index 8aa758179..0c0530ffe 100644 --- a/dockge/immich-machine-learning/docker-compose.yml +++ b/dockge/immich-machine-learning/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.135.3 + image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 labels: createdBy: Apps networks: diff --git a/dockge/immich-machine-learning_1_132_3/.env b/dockge/immich-machine-learning_1_135_3/.env similarity index 100% rename from dockge/immich-machine-learning_1_132_3/.env rename to dockge/immich-machine-learning_1_135_3/.env diff --git a/dockge/immich-machine-learning_1_132_3/docker-compose.yml b/dockge/immich-machine-learning_1_135_3/docker-compose.yml similarity index 87% rename from dockge/immich-machine-learning_1_132_3/docker-compose.yml rename to dockge/immich-machine-learning_1_135_3/docker-compose.yml index 0c0530ffe..8aa758179 100644 --- a/dockge/immich-machine-learning_1_132_3/docker-compose.yml +++ b/dockge/immich-machine-learning_1_135_3/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 + image: ghcr.io/immich-app/immich-machine-learning:v1.135.3 labels: createdBy: Apps networks: diff --git a/dockge/immich-machine-learning_1_132_3/envs/default.env b/dockge/immich-machine-learning_1_135_3/envs/default.env similarity index 100% rename from dockge/immich-machine-learning_1_132_3/envs/default.env rename to dockge/immich-machine-learning_1_135_3/envs/default.env diff --git a/dockge/immich-machine-learning_1_132_3/envs/global.env b/dockge/immich-machine-learning_1_135_3/envs/global.env similarity index 100% rename from dockge/immich-machine-learning_1_132_3/envs/global.env rename to dockge/immich-machine-learning_1_135_3/envs/global.env diff --git a/dockge/immich-no-machine/docker-compose.yml b/dockge/immich-no-machine/docker-compose.yml index b174763a8..0ad713e57 100644 --- a/dockge/immich-no-machine/docker-compose.yml +++ b/dockge/immich-no-machine/docker-compose.yml @@ -4,13 +4,36 @@ networks: external: true services: immich-pg14-vectors: + command: + - postgres + - -c + - shared_preload_libraries=vectors.so + - -c + - search_path="$$user", public, vectors + - -c + - logging_collector=on + - -c + - max_wal_size=2GB + - -c + - shared_buffers=512MB + - -c + - wal_compression=on container_name: pg14-vectors-immich-no-machine environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0 + healthcheck: + interval: 5m + start_interval: 30s + start_period: 5m + test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' + || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' + --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), + 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ + "$$Chksum" = '0' ] || exit 1 + image: tensorchord/pgvecto-rs:pg14-v0.2.0 labels: createdBy: Apps networks: @@ -29,7 +52,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.135.3 + image: ghcr.io/immich-app/immich-server:v1.132.3 labels: createdBy: Apps networks: diff --git a/dockge/immich-no-machine_1_132_3/.env b/dockge/immich-no-machine_1_135_3/.env similarity index 100% rename from dockge/immich-no-machine_1_132_3/.env rename to dockge/immich-no-machine_1_135_3/.env diff --git a/dockge/immich-no-machine_1_132_3/docker-compose.yml b/dockge/immich-no-machine_1_135_3/docker-compose.yml similarity index 54% rename from dockge/immich-no-machine_1_132_3/docker-compose.yml rename to dockge/immich-no-machine_1_135_3/docker-compose.yml index 0ad713e57..b174763a8 100644 --- a/dockge/immich-no-machine_1_132_3/docker-compose.yml +++ b/dockge/immich-no-machine_1_135_3/docker-compose.yml @@ -4,36 +4,13 @@ networks: external: true services: immich-pg14-vectors: - command: - - postgres - - -c - - shared_preload_libraries=vectors.so - - -c - - search_path="$$user", public, vectors - - -c - - logging_collector=on - - -c - - max_wal_size=2GB - - -c - - shared_buffers=512MB - - -c - - wal_compression=on container_name: pg14-vectors-immich-no-machine environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - healthcheck: - interval: 5m - start_interval: 30s - start_period: 5m - test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), - 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ - "$$Chksum" = '0' ] || exit 1 - image: tensorchord/pgvecto-rs:pg14-v0.2.0 + image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0 labels: createdBy: Apps networks: @@ -52,7 +29,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 + image: ghcr.io/immich-app/immich-server:v1.135.3 labels: createdBy: Apps networks: diff --git a/dockge/immich-no-machine_1_132_3/envs/default.env b/dockge/immich-no-machine_1_135_3/envs/default.env similarity index 100% rename from dockge/immich-no-machine_1_132_3/envs/default.env rename to dockge/immich-no-machine_1_135_3/envs/default.env diff --git a/dockge/immich-no-machine_1_132_3/envs/global.env b/dockge/immich-no-machine_1_135_3/envs/global.env similarity index 100% rename from dockge/immich-no-machine_1_132_3/envs/global.env rename to dockge/immich-no-machine_1_135_3/envs/global.env diff --git a/dockge/immich-server/docker-compose.yml b/dockge/immich-server/docker-compose.yml index a6a472d9a..1f7695a07 100644 --- a/dockge/immich-server/docker-compose.yml +++ b/dockge/immich-server/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.135.3 + image: ghcr.io/immich-app/immich-server:v1.132.3 labels: createdBy: Apps networks: diff --git a/dockge/immich-server_1_132_3/.env b/dockge/immich-server_1_135_3/.env similarity index 100% rename from dockge/immich-server_1_132_3/.env rename to dockge/immich-server_1_135_3/.env diff --git a/dockge/immich-server_1_132_3/docker-compose.yml b/dockge/immich-server_1_135_3/docker-compose.yml similarity index 89% rename from dockge/immich-server_1_132_3/docker-compose.yml rename to dockge/immich-server_1_135_3/docker-compose.yml index 1f7695a07..a6a472d9a 100644 --- a/dockge/immich-server_1_132_3/docker-compose.yml +++ b/dockge/immich-server_1_135_3/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 + image: ghcr.io/immich-app/immich-server:v1.135.3 labels: createdBy: Apps networks: diff --git a/dockge/immich-server_1_132_3/envs/default.env b/dockge/immich-server_1_135_3/envs/default.env similarity index 100% rename from dockge/immich-server_1_132_3/envs/default.env rename to dockge/immich-server_1_135_3/envs/default.env diff --git a/dockge/immich-server_1_132_3/envs/global.env b/dockge/immich-server_1_135_3/envs/global.env similarity index 100% rename from dockge/immich-server_1_132_3/envs/global.env rename to dockge/immich-server_1_135_3/envs/global.env diff --git a/dockge/immich/docker-compose.yml b/dockge/immich/docker-compose.yml index 680035b9c..44a2398ec 100644 --- a/dockge/immich/docker-compose.yml +++ b/dockge/immich/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.135.3 + image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 labels: createdBy: Apps networks: @@ -21,13 +21,36 @@ services: volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache immich-pg14-vectors: + command: + - postgres + - -c + - shared_preload_libraries=vectors.so + - -c + - search_path="$$user", public, vectors + - -c + - logging_collector=on + - -c + - max_wal_size=2GB + - -c + - shared_buffers=512MB + - -c + - wal_compression=on container_name: pg14-vectors-immich environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - image: ghcr.io/immich-app/postgres:14-vectorchord0.4.1-pgvectors0.2.0 + healthcheck: + interval: 5m + start_interval: 30s + start_period: 5m + test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' + || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' + --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), + 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ + "$$Chksum" = '0' ] || exit 1 + image: tensorchord/pgvecto-rs:pg14-v0.2.0 labels: createdBy: Apps networks: @@ -45,7 +68,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.135.3 + image: ghcr.io/immich-app/immich-server:v1.132.3 labels: createdBy: Apps networks: diff --git a/dockge/immich_1_132_3/.env b/dockge/immich_1_135_3/.env similarity index 100% rename from dockge/immich_1_132_3/.env rename to dockge/immich_1_135_3/.env diff --git a/dockge/immich_1_132_3/docker-compose.yml b/dockge/immich_1_135_3/docker-compose.yml similarity index 59% rename from dockge/immich_1_132_3/docker-compose.yml rename to dockge/immich_1_135_3/docker-compose.yml index 44a2398ec..680035b9c 100644 --- a/dockge/immich_1_132_3/docker-compose.yml +++ b/dockge/immich_1_135_3/docker-compose.yml @@ -10,7 +10,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-machine-learning:v1.132.3 + image: ghcr.io/immich-app/immich-machine-learning:v1.135.3 labels: createdBy: Apps networks: @@ -21,36 +21,13 @@ services: volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache immich-pg14-vectors: - command: - - postgres - - -c - - shared_preload_libraries=vectors.so - - -c - - search_path="$$user", public, vectors - - -c - - logging_collector=on - - -c - - max_wal_size=2GB - - -c - - shared_buffers=512MB - - -c - - wal_compression=on container_name: pg14-vectors-immich environment: POSTGRES_DB: ${DB_DATABASE_NAME:-immich} POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_USER: ${DB_USERNAME:-postgres} - healthcheck: - interval: 5m - start_interval: 30s - start_period: 5m - test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' - --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), - 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ - "$$Chksum" = '0' ] || exit 1 - image: tensorchord/pgvecto-rs:pg14-v0.2.0 + image: ghcr.io/immich-app/postgres:14-vectorchord0.4.1-pgvectors0.2.0 labels: createdBy: Apps networks: @@ -68,7 +45,7 @@ services: env_file: - ./envs/global.env - .env - image: ghcr.io/immich-app/immich-server:v1.132.3 + image: ghcr.io/immich-app/immich-server:v1.135.3 labels: createdBy: Apps networks: diff --git a/dockge/immich_1_132_3/envs/default.env b/dockge/immich_1_135_3/envs/default.env similarity index 100% rename from dockge/immich_1_132_3/envs/default.env rename to dockge/immich_1_135_3/envs/default.env diff --git a/dockge/immich_1_132_3/envs/global.env b/dockge/immich_1_135_3/envs/global.env similarity index 100% rename from dockge/immich_1_132_3/envs/global.env rename to dockge/immich_1_135_3/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/jellyfin/docker-compose.yml b/dockge/jellyfin/docker-compose.yml index 88affa9a4..ea6fe3ec2 100644 --- a/dockge/jellyfin/docker-compose.yml +++ b/dockge/jellyfin/docker-compose.yml @@ -10,7 +10,7 @@ services: - ROC_ENABLE_PRE_VEGA=1 - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: jellyfin/jellyfin:10.9.11 + image: jellyfin/jellyfin:10.10.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/jellyfin_10_10_7/.env b/dockge/jellyfin_10_9_11/.env similarity index 100% rename from dockge/jellyfin_10_10_7/.env rename to dockge/jellyfin_10_9_11/.env diff --git a/dockge/jellyfin_10_10_7/docker-compose.yml b/dockge/jellyfin_10_9_11/docker-compose.yml similarity index 96% rename from dockge/jellyfin_10_10_7/docker-compose.yml rename to dockge/jellyfin_10_9_11/docker-compose.yml index ea6fe3ec2..88affa9a4 100644 --- a/dockge/jellyfin_10_10_7/docker-compose.yml +++ b/dockge/jellyfin_10_9_11/docker-compose.yml @@ -10,7 +10,7 @@ services: - ROC_ENABLE_PRE_VEGA=1 - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: jellyfin/jellyfin:10.10.7 + image: jellyfin/jellyfin:10.9.11 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/jellyfin_10_10_7/envs/default.env b/dockge/jellyfin_10_9_11/envs/default.env similarity index 100% rename from dockge/jellyfin_10_10_7/envs/default.env rename to dockge/jellyfin_10_9_11/envs/default.env diff --git a/dockge/jellyfin_10_10_7/envs/global.env b/dockge/jellyfin_10_9_11/envs/global.env similarity index 100% rename from dockge/jellyfin_10_10_7/envs/global.env rename to dockge/jellyfin_10_9_11/envs/global.env diff --git a/dockge/minio/docker-compose.yml b/dockge/minio/docker-compose.yml index b8ee979c9..c50712755 100644 --- a/dockge/minio/docker-compose.yml +++ b/dockge/minio/docker-compose.yml @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: minio/minio:RELEASE.2025-06-13T11-33-47Z + image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z labels: createdBy: Apps logging: diff --git a/dockge/minio_2025-04-22/.env b/dockge/minio_2025-06-13/.env similarity index 100% rename from dockge/minio_2025-04-22/.env rename to dockge/minio_2025-06-13/.env diff --git a/dockge/minio_2025-04-22/docker-compose.yml b/dockge/minio_2025-06-13/docker-compose.yml similarity index 93% rename from dockge/minio_2025-04-22/docker-compose.yml rename to dockge/minio_2025-06-13/docker-compose.yml index c50712755..b8ee979c9 100644 --- a/dockge/minio_2025-04-22/docker-compose.yml +++ b/dockge/minio_2025-06-13/docker-compose.yml @@ -15,7 +15,7 @@ services: - MINIO_BROWSER_REDIRECT=true extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 - image: qyg2297248353/minio:RELEASE.2025-04-22T22-12-26Z + image: minio/minio:RELEASE.2025-06-13T11-33-47Z labels: createdBy: Apps logging: diff --git a/dockge/minio_2025-04-22/envs/default.env b/dockge/minio_2025-06-13/envs/default.env similarity index 100% rename from dockge/minio_2025-04-22/envs/default.env rename to dockge/minio_2025-06-13/envs/default.env diff --git a/dockge/minio_2025-04-22/envs/global.env b/dockge/minio_2025-06-13/envs/global.env similarity index 100% rename from dockge/minio_2025-04-22/envs/global.env rename to dockge/minio_2025-06-13/envs/global.env diff --git a/dockge/mysql/config/my.cnf b/dockge/mysql/config/my.cnf index c53ca32dc..6d6e1a932 100644 --- a/dockge/mysql/config/my.cnf +++ b/dockge/mysql/config/my.cnf @@ -1,20 +1,42 @@ +# For advice on how to change settings please see +# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html + [mysqld] -host_cache_size=0 +# +# Remove leading # and set to the amount of RAM for the most important data +# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# innodb_buffer_pool_size = 128M +# +# Remove leading # to turn on a very important data integrity option: logging +# changes to the binary log between backups. +# log_bin +# +# Remove leading # to set options mainly useful for reporting servers. +# The server defaults are faster for transactions and fast SELECTs. +# Adjust sizes as needed, experiment to find the optimal values. +# join_buffer_size = 128M +# sort_buffer_size = 2M +# read_rnd_buffer_size = 2M +skip-host-cache skip-name-resolve datadir=/var/lib/mysql socket=/var/run/mysqld/mysqld.sock +secure-file-priv=/var/lib/mysql-files user=mysql -mysql_native_password=ON +# Disabling symbolic-links is recommended to prevent assorted security risks +symbolic-links=0 + +#log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid + +max_allowed_packet=64M character_set_server=utf8mb4 -collation_server=utf8mb4_unicode_ci lower_case_table_names=1 group_concat_max_len=1024000 -log_bin_trust_function_creators=1 -secure_file_priv= -pid_file=/var/run/mysqld/mysqld.pid [client] socket=/var/run/mysqld/mysqld.sock !includedir /etc/mysql/conf.d/ +!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql/docker-compose.yml b/dockge/mysql/docker-compose.yml index c022892d1..5cac14f48 100644 --- a/dockge/mysql/docker-compose.yml +++ b/dockge/mysql/docker-compose.yml @@ -5,13 +5,14 @@ services: mysql: command: - --character-set-server=utf8mb4 - - --collation-server=utf8mb4_unicode_ci - - --mysql-native-password=ON + - --lower_case_table_names=1 + - --collation-server=utf8mb4_general_ci + - --explicit_defaults_for_timestamp=true container_name: mysql env_file: - ./envs/global.env - .env - image: mysql:8.4.5 + image: mysql:5.7.44 labels: createdBy: Apps networks: @@ -21,8 +22,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf + - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_5_7_44/config/my.cnf b/dockge/mysql_5_7_44/config/my.cnf deleted file mode 100644 index 6d6e1a932..000000000 --- a/dockge/mysql_5_7_44/config/my.cnf +++ /dev/null @@ -1,42 +0,0 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html - -[mysqld] -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove leading # to turn on a very important data integrity option: logging -# changes to the binary log between backups. -# log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M -skip-host-cache -skip-name-resolve -datadir=/var/lib/mysql -socket=/var/run/mysqld/mysqld.sock -secure-file-priv=/var/lib/mysql-files -user=mysql - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -#log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid - -max_allowed_packet=64M -character_set_server=utf8mb4 -lower_case_table_names=1 -group_concat_max_len=1024000 - -[client] -socket=/var/run/mysqld/mysqld.sock - -!includedir /etc/mysql/conf.d/ -!includedir /etc/mysql/mysql.conf.d/ diff --git a/dockge/mysql_5_7_44/.env b/dockge/mysql_8_4_5/.env similarity index 100% rename from dockge/mysql_5_7_44/.env rename to dockge/mysql_8_4_5/.env diff --git a/dockge/mysql_8_4_5/config/my.cnf b/dockge/mysql_8_4_5/config/my.cnf new file mode 100644 index 000000000..c53ca32dc --- /dev/null +++ b/dockge/mysql_8_4_5/config/my.cnf @@ -0,0 +1,20 @@ +[mysqld] +host_cache_size=0 +skip-name-resolve +datadir=/var/lib/mysql +socket=/var/run/mysqld/mysqld.sock +user=mysql + +mysql_native_password=ON +character_set_server=utf8mb4 +collation_server=utf8mb4_unicode_ci +lower_case_table_names=1 +group_concat_max_len=1024000 +log_bin_trust_function_creators=1 + +secure_file_priv= +pid_file=/var/run/mysqld/mysqld.pid +[client] +socket=/var/run/mysqld/mysqld.sock + +!includedir /etc/mysql/conf.d/ diff --git a/dockge/mysql_5_7_44/docker-compose.yml b/dockge/mysql_8_4_5/docker-compose.yml similarity index 65% rename from dockge/mysql_5_7_44/docker-compose.yml rename to dockge/mysql_8_4_5/docker-compose.yml index 5cac14f48..c022892d1 100644 --- a/dockge/mysql_5_7_44/docker-compose.yml +++ b/dockge/mysql_8_4_5/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.5 labels: createdBy: Apps networks: @@ -22,8 +21,8 @@ services: restart: always user: 1000:1000 volumes: - - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql - - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/mysql/my.cnf + - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql + - ${MYSQL_ROOT_PATH}/config/my.cnf:/etc/my.cnf - ${MYSQL_ROOT_PATH}/log:/var/log/mysql - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro diff --git a/dockge/mysql_5_7_44/envs/default.env b/dockge/mysql_8_4_5/envs/default.env similarity index 100% rename from dockge/mysql_5_7_44/envs/default.env rename to dockge/mysql_8_4_5/envs/default.env diff --git a/dockge/mysql_5_7_44/envs/global.env b/dockge/mysql_8_4_5/envs/global.env similarity index 100% rename from dockge/mysql_5_7_44/envs/global.env rename to dockge/mysql_8_4_5/envs/global.env diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index aad82d79a..531217471 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: postgresql + container_name: pg16-postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:16.9-alpine + image: postgres:16 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg16/.env b/dockge/postgresql_16_9-alpine/.env similarity index 100% rename from dockge/postgresql_pg16/.env rename to dockge/postgresql_16_9-alpine/.env diff --git a/dockge/postgresql_pg16/docker-compose.yml b/dockge/postgresql_16_9-alpine/docker-compose.yml similarity index 89% rename from dockge/postgresql_pg16/docker-compose.yml rename to dockge/postgresql_16_9-alpine/docker-compose.yml index 531217471..aad82d79a 100644 --- a/dockge/postgresql_pg16/docker-compose.yml +++ b/dockge/postgresql_16_9-alpine/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg16-postgresql + container_name: postgresql env_file: - ./envs/global.env - .env @@ -12,7 +12,7 @@ services: POSTGRES_INITDB_ARGS: --data-checksums POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: ${POSTGRES_USER:-postgres} - image: postgres:16 + image: postgres:16.9-alpine labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg16/envs/default.env b/dockge/postgresql_16_9-alpine/envs/default.env similarity index 100% rename from dockge/postgresql_pg16/envs/default.env rename to dockge/postgresql_16_9-alpine/envs/default.env diff --git a/dockge/postgresql_pg16/envs/global.env b/dockge/postgresql_16_9-alpine/envs/global.env similarity index 100% rename from dockge/postgresql_pg16/envs/global.env rename to dockge/postgresql_16_9-alpine/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 726b7634e..3bc084b58 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,32 +10,13 @@ services: environment: - TZ=Asia/Shanghai - RUSTDESK_API_LANG=zh-CN - image: lejianwen/rustdesk-api:v2.6.25 + image: lejianwen/rustdesk-server-s6:latest labels: createdBy: Apps networks: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:21114 - restart: always - volumes: - - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data - 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 - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - ${PANEL_APP_PORT_NAT}:21115 - ${PANEL_APP_PORT_ID}:21116 - ${PANEL_APP_PORT_ID}:21116/udp @@ -44,6 +25,16 @@ services: - ${PANEL_APP_PORT_SERVER_WS}:21119 restart: always volumes: + - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data + rustdesk-server-s6: + environment: + - TZ=Asia/Shanghai + - MUST_LOGIN=N + - ENCRYPTED_ONLY=1 + - RUSTDESK_API_LANG=zh-CN + - RELAY=${RUSTDESK_SERVER_URL} + volumes: - ${RUSTDESK_API_ROOT_PATH}/server-data:/data + - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data - ${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_25/.env similarity index 97% rename from dockge/rustdesk-api_s6-latest/.env rename to dockge/rustdesk-api_2_6_25/.env index 057e9b006..96a0fb5a5 100644 --- a/dockge/rustdesk-api_s6-latest/.env +++ b/dockge/rustdesk-api_2_6_25/.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_25/conf/hbbr/run similarity index 100% rename from dockge/rustdesk-api_s6-latest/conf/hbbr/run rename to dockge/rustdesk-api_2_6_25/conf/hbbr/run diff --git a/dockge/rustdesk-api_s6-latest/conf/hbbs/run b/dockge/rustdesk-api_2_6_25/conf/hbbs/run similarity index 100% rename from dockge/rustdesk-api_s6-latest/conf/hbbs/run rename to dockge/rustdesk-api_2_6_25/conf/hbbs/run diff --git a/dockge/rustdesk-api_s6-latest/docker-compose.yml b/dockge/rustdesk-api_2_6_25/docker-compose.yml similarity index 77% rename from dockge/rustdesk-api_s6-latest/docker-compose.yml rename to dockge/rustdesk-api_2_6_25/docker-compose.yml index 3bc084b58..726b7634e 100644 --- a/dockge/rustdesk-api_s6-latest/docker-compose.yml +++ b/dockge/rustdesk-api_2_6_25/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,13 +10,32 @@ services: environment: - TZ=Asia/Shanghai - RUSTDESK_API_LANG=zh-CN - image: lejianwen/rustdesk-server-s6:latest + image: lejianwen/rustdesk-api:v2.6.25 labels: createdBy: Apps networks: - 1panel-network ports: - ${PANEL_APP_PORT_HTTP}:21114 + restart: always + volumes: + - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data + rustdesk-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 + labels: + createdBy: Apps + networks: + - 1panel-network + ports: - ${PANEL_APP_PORT_NAT}:21115 - ${PANEL_APP_PORT_ID}:21116 - ${PANEL_APP_PORT_ID}:21116/udp @@ -25,16 +44,6 @@ services: - ${PANEL_APP_PORT_SERVER_WS}:21119 restart: always volumes: - - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data - rustdesk-server-s6: - environment: - - TZ=Asia/Shanghai - - MUST_LOGIN=N - - ENCRYPTED_ONLY=1 - - RUSTDESK_API_LANG=zh-CN - - RELAY=${RUSTDESK_SERVER_URL} - volumes: - ${RUSTDESK_API_ROOT_PATH}/server-data:/data - - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data - ${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_25/envs/default.env similarity index 100% rename from dockge/rustdesk-api_s6-latest/envs/default.env rename to dockge/rustdesk-api_2_6_25/envs/default.env diff --git a/dockge/rustdesk-api_s6-latest/envs/global.env b/dockge/rustdesk-api_2_6_25/envs/global.env similarity index 100% rename from dockge/rustdesk-api_s6-latest/envs/global.env rename to dockge/rustdesk-api_2_6_25/envs/global.env diff --git a/dockge/umami-mysql/docker-compose.yml b/dockge/umami-mysql/docker-compose.yml index 0347d07c0..2bc7a13bc 100644 --- a/dockge/umami-mysql/docker-compose.yml +++ b/dockge/umami-mysql/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:mysql-v2.18.1 + 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_18_1/.env similarity index 100% rename from dockge/umami-mysql_2_16_0/.env rename to dockge/umami-mysql_2_18_1/.env diff --git a/dockge/umami-mysql_2_16_0/docker-compose.yml b/dockge/umami-mysql_2_18_1/docker-compose.yml similarity index 91% rename from dockge/umami-mysql_2_16_0/docker-compose.yml rename to dockge/umami-mysql_2_18_1/docker-compose.yml index 2bc7a13bc..0347d07c0 100644 --- a/dockge/umami-mysql_2_16_0/docker-compose.yml +++ b/dockge/umami-mysql_2_18_1/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:mysql-v2.16.0 + image: umamisoftware/umami:mysql-v2.18.1 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_16_0/envs/default.env b/dockge/umami-mysql_2_18_1/envs/default.env similarity index 100% rename from dockge/umami-mysql_2_16_0/envs/default.env rename to dockge/umami-mysql_2_18_1/envs/default.env diff --git a/dockge/umami-mysql_2_16_0/envs/global.env b/dockge/umami-mysql_2_18_1/envs/global.env similarity index 100% rename from dockge/umami-mysql_2_16_0/envs/global.env rename to dockge/umami-mysql_2_18_1/envs/global.env diff --git a/dockge/umami/docker-compose.yml b/dockge/umami/docker-compose.yml index 9bbf23909..7f7a58660 100644 --- a/dockge/umami/docker-compose.yml +++ b/dockge/umami/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:postgresql-v2.18.1 + image: umamisoftware/umami:postgresql-v2.16.0 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_16_0/.env b/dockge/umami_2_18_1/.env similarity index 100% rename from dockge/umami_2_16_0/.env rename to dockge/umami_2_18_1/.env diff --git a/dockge/umami_2_16_0/docker-compose.yml b/dockge/umami_2_18_1/docker-compose.yml similarity index 90% rename from dockge/umami_2_16_0/docker-compose.yml rename to dockge/umami_2_18_1/docker-compose.yml index 7f7a58660..9bbf23909 100644 --- a/dockge/umami_2_16_0/docker-compose.yml +++ b/dockge/umami_2_18_1/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:postgresql-v2.16.0 + image: umamisoftware/umami:postgresql-v2.18.1 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_16_0/envs/default.env b/dockge/umami_2_18_1/envs/default.env similarity index 100% rename from dockge/umami_2_16_0/envs/default.env rename to dockge/umami_2_18_1/envs/default.env diff --git a/dockge/umami_2_16_0/envs/global.env b/dockge/umami_2_18_1/envs/global.env similarity index 100% rename from dockge/umami_2_16_0/envs/global.env rename to dockge/umami_2_18_1/envs/global.env diff --git a/dockge/uptime-kuma/.env b/dockge/uptime-kuma/.env index 5fa74c158..32a291fcd 100644 --- a/dockge/uptime-kuma/.env +++ b/dockge/uptime-kuma/.env @@ -4,9 +4,3 @@ UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=3001 -# Cloudflared 隧道令牌 -UPTIME_KUMA_CLOUDFLARED_TOKEN= - -# 禁用 Frame SameOrigin [必填] -UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false - diff --git a/dockge/uptime-kuma/docker-compose.yml b/dockge/uptime-kuma/docker-compose.yml index 03b4560f7..c6ee97339 100644 --- a/dockge/uptime-kuma/docker-compose.yml +++ b/dockge/uptime-kuma/docker-compose.yml @@ -7,16 +7,7 @@ services: env_file: - ./envs/global.env - .env - environment: - - PUID=0 - - PGID=0 - - UPTIME_KUMA_PORT=3001 - - UPTIME_KUMA_HOST=0.0.0.0 - - DATA_DIR=/app/data - - NODE_TLS_REJECT_UNAUTHORIZED=0 - - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 - - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like - image: louislam/uptime-kuma:1.23.16 + image: louislam/uptime-kuma:2.0.0-beta.3 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_1_23_16/.env b/dockge/uptime-kuma_1_23_16/.env new file mode 100644 index 000000000..5fa74c158 --- /dev/null +++ b/dockge/uptime-kuma_1_23_16/.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_0_0/docker-compose.yml b/dockge/uptime-kuma_1_23_16/docker-compose.yml similarity index 57% rename from dockge/uptime-kuma_2_0_0/docker-compose.yml rename to dockge/uptime-kuma_1_23_16/docker-compose.yml index c6ee97339..03b4560f7 100644 --- a/dockge/uptime-kuma_2_0_0/docker-compose.yml +++ b/dockge/uptime-kuma_1_23_16/docker-compose.yml @@ -7,7 +7,16 @@ services: env_file: - ./envs/global.env - .env - image: louislam/uptime-kuma:2.0.0-beta.3 + environment: + - PUID=0 + - PGID=0 + - UPTIME_KUMA_PORT=3001 + - UPTIME_KUMA_HOST=0.0.0.0 + - DATA_DIR=/app/data + - NODE_TLS_REJECT_UNAUTHORIZED=0 + - UPTIME_KUMA_ALLOW_ALL_CHROME_EXEC=0 + - UPTIME_KUMA_WS_ORIGIN_CHECK=cors-like + image: louislam/uptime-kuma:1.23.16 labels: createdBy: Apps networks: diff --git a/dockge/uptime-kuma_2_0_0/envs/default.env b/dockge/uptime-kuma_1_23_16/envs/default.env similarity index 100% rename from dockge/uptime-kuma_2_0_0/envs/default.env rename to dockge/uptime-kuma_1_23_16/envs/default.env diff --git a/dockge/uptime-kuma_2_0_0/envs/global.env b/dockge/uptime-kuma_1_23_16/envs/global.env similarity index 100% rename from dockge/uptime-kuma_2_0_0/envs/global.env rename to dockge/uptime-kuma_1_23_16/envs/global.env diff --git a/dockge/uptime-kuma_2_0_0/.env b/dockge/uptime-kuma_2_0_0/.env deleted file mode 100644 index 32a291fcd..000000000 --- a/dockge/uptime-kuma_2_0_0/.env +++ /dev/null @@ -1,6 +0,0 @@ -# 数据持久化路径 [必填] -UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3001 -