diff --git a/dockge/auto-lady/.env b/dockge/auto-lady/.env index a6f1eb1e9..3258da058 100644 --- a/dockge/auto-lady/.env +++ b/dockge/auto-lady/.env @@ -13,3 +13,9 @@ CUSTOM_MOUNT_DIRECTORY_2= # 自定义挂载目录 3 CUSTOM_MOUNT_DIRECTORY_3= +# 网络代理地址 +HTTP_PROXY= + +# 跳过代理地址 +NO_PROXY=localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local + diff --git a/dockge/auto-lady/docker-compose.yml b/dockge/auto-lady/docker-compose.yml index 40b13df53..d9c6c701e 100644 --- a/dockge/auto-lady/docker-compose.yml +++ b/dockge/auto-lady/docker-compose.yml @@ -7,7 +7,11 @@ services: env_file: - ./envs/global.env - .env - image: orekiiiiiiiiiiiii/auto-lady:1.4.5 + environment: + - HTTPS_PROXY=${HTTP_PROXY} + - HTTP_PROXY=${HTTP_PROXY:-} + - NO_PROXY=${NO_PROXY:-} + image: envyafish/byte-muse:1.5.3 labels: createdBy: Apps networks: diff --git a/dockge/auto-lady_1_5_3/.env b/dockge/auto-lady_1_4_5/.env similarity index 69% rename from dockge/auto-lady_1_5_3/.env rename to dockge/auto-lady_1_4_5/.env index 3258da058..a6f1eb1e9 100644 --- a/dockge/auto-lady_1_5_3/.env +++ b/dockge/auto-lady_1_4_5/.env @@ -13,9 +13,3 @@ CUSTOM_MOUNT_DIRECTORY_2= # 自定义挂载目录 3 CUSTOM_MOUNT_DIRECTORY_3= -# 网络代理地址 -HTTP_PROXY= - -# 跳过代理地址 -NO_PROXY=localhost,127.0.0.1,::1,192.168.0.0/16,10.0.0.0/8,*.local - diff --git a/dockge/auto-lady_1_5_3/docker-compose.yml b/dockge/auto-lady_1_4_5/docker-compose.yml similarity index 81% rename from dockge/auto-lady_1_5_3/docker-compose.yml rename to dockge/auto-lady_1_4_5/docker-compose.yml index d9c6c701e..40b13df53 100644 --- a/dockge/auto-lady_1_5_3/docker-compose.yml +++ b/dockge/auto-lady_1_4_5/docker-compose.yml @@ -7,11 +7,7 @@ services: env_file: - ./envs/global.env - .env - environment: - - HTTPS_PROXY=${HTTP_PROXY} - - HTTP_PROXY=${HTTP_PROXY:-} - - NO_PROXY=${NO_PROXY:-} - image: envyafish/byte-muse:1.5.3 + image: orekiiiiiiiiiiiii/auto-lady:1.4.5 labels: createdBy: Apps networks: diff --git a/dockge/auto-lady_1_5_3/envs/default.env b/dockge/auto-lady_1_4_5/envs/default.env similarity index 100% rename from dockge/auto-lady_1_5_3/envs/default.env rename to dockge/auto-lady_1_4_5/envs/default.env diff --git a/dockge/auto-lady_1_5_3/envs/global.env b/dockge/auto-lady_1_4_5/envs/global.env similarity index 100% rename from dockge/auto-lady_1_5_3/envs/global.env rename to dockge/auto-lady_1_4_5/envs/global.env diff --git a/dockge/elastic-elasticsearch/docker-compose.yml b/dockge/elastic-elasticsearch/docker-compose.yml index 317c00fe1..f458aaefe 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.1 + image: elasticsearch:8.18.2 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_8_18_2/.env b/dockge/elastic-elasticsearch_9_0_1/.env similarity index 100% rename from dockge/elastic-elasticsearch_8_18_2/.env rename to dockge/elastic-elasticsearch_9_0_1/.env diff --git a/dockge/elastic-elasticsearch_8_18_2/docker-compose.yml b/dockge/elastic-elasticsearch_9_0_1/docker-compose.yml similarity index 96% rename from dockge/elastic-elasticsearch_8_18_2/docker-compose.yml rename to dockge/elastic-elasticsearch_9_0_1/docker-compose.yml index f458aaefe..317c00fe1 100644 --- a/dockge/elastic-elasticsearch_8_18_2/docker-compose.yml +++ b/dockge/elastic-elasticsearch_9_0_1/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.2 + image: elasticsearch:9.0.1 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_8_18_2/envs/default.env b/dockge/elastic-elasticsearch_9_0_1/envs/default.env similarity index 100% rename from dockge/elastic-elasticsearch_8_18_2/envs/default.env rename to dockge/elastic-elasticsearch_9_0_1/envs/default.env diff --git a/dockge/elastic-elasticsearch_8_18_2/envs/global.env b/dockge/elastic-elasticsearch_9_0_1/envs/global.env similarity index 100% rename from dockge/elastic-elasticsearch_8_18_2/envs/global.env rename to dockge/elastic-elasticsearch_9_0_1/envs/global.env diff --git a/dockge/elastic-kibana/docker-compose.yml b/dockge/elastic-kibana/docker-compose.yml index e2d2e4c3a..76989c30f 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.1 + image: kibana:8.18.2 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_8_18_2/.env b/dockge/elastic-kibana_9_0_1/.env similarity index 100% rename from dockge/elastic-kibana_8_18_2/.env rename to dockge/elastic-kibana_9_0_1/.env diff --git a/dockge/elastic-kibana_8_18_2/docker-compose.yml b/dockge/elastic-kibana_9_0_1/docker-compose.yml similarity index 95% rename from dockge/elastic-kibana_8_18_2/docker-compose.yml rename to dockge/elastic-kibana_9_0_1/docker-compose.yml index 76989c30f..e2d2e4c3a 100644 --- a/dockge/elastic-kibana_8_18_2/docker-compose.yml +++ b/dockge/elastic-kibana_9_0_1/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.2 + image: kibana:9.0.1 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_8_18_2/envs/default.env b/dockge/elastic-kibana_9_0_1/envs/default.env similarity index 100% rename from dockge/elastic-kibana_8_18_2/envs/default.env rename to dockge/elastic-kibana_9_0_1/envs/default.env diff --git a/dockge/elastic-kibana_8_18_2/envs/global.env b/dockge/elastic-kibana_9_0_1/envs/global.env similarity index 100% rename from dockge/elastic-kibana_8_18_2/envs/global.env rename to dockge/elastic-kibana_9_0_1/envs/global.env diff --git a/dockge/emby-amilys/docker-compose.yml b/dockge/emby-amilys/docker-compose.yml index bfacccbaa..c65d6be5f 100644 --- a/dockge/emby-amilys/docker-compose.yml +++ b/dockge/emby-amilys/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: amilys/embyserver:4.9.0.57 + image: amilys/embyserver:4.8.10.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby-amilys_4_8_10_0/.env b/dockge/emby-amilys_4_9_0_57/.env similarity index 100% rename from dockge/emby-amilys_4_8_10_0/.env rename to dockge/emby-amilys_4_9_0_57/.env diff --git a/dockge/emby-amilys_4_8_10_0/docker-compose.yml b/dockge/emby-amilys_4_9_0_57/docker-compose.yml similarity index 95% rename from dockge/emby-amilys_4_8_10_0/docker-compose.yml rename to dockge/emby-amilys_4_9_0_57/docker-compose.yml index c65d6be5f..bfacccbaa 100644 --- a/dockge/emby-amilys_4_8_10_0/docker-compose.yml +++ b/dockge/emby-amilys_4_9_0_57/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: amilys/embyserver:4.8.10.0 + image: amilys/embyserver:4.9.0.57 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby-amilys_4_8_10_0/envs/default.env b/dockge/emby-amilys_4_9_0_57/envs/default.env similarity index 100% rename from dockge/emby-amilys_4_8_10_0/envs/default.env rename to dockge/emby-amilys_4_9_0_57/envs/default.env diff --git a/dockge/emby-amilys_4_8_10_0/envs/global.env b/dockge/emby-amilys_4_9_0_57/envs/global.env similarity index 100% rename from dockge/emby-amilys_4_8_10_0/envs/global.env rename to dockge/emby-amilys_4_9_0_57/envs/global.env diff --git a/dockge/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index c81f80b9c..a461e63ac 100644 --- a/dockge/emby/docker-compose.yml +++ b/dockge/emby/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.9.1.0 + image: emby/embyserver:4.8.11.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/.env b/dockge/emby_4_9_1_0/.env similarity index 100% rename from dockge/emby_4_8_11_0/.env rename to dockge/emby_4_9_1_0/.env diff --git a/dockge/emby_4_8_11_0/docker-compose.yml b/dockge/emby_4_9_1_0/docker-compose.yml similarity index 96% rename from dockge/emby_4_8_11_0/docker-compose.yml rename to dockge/emby_4_9_1_0/docker-compose.yml index a461e63ac..c81f80b9c 100644 --- a/dockge/emby_4_8_11_0/docker-compose.yml +++ b/dockge/emby_4_9_1_0/docker-compose.yml @@ -13,7 +13,7 @@ services: - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: emby/embyserver:4.8.11.0 + image: emby/embyserver:4.9.1.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/envs/default.env b/dockge/emby_4_9_1_0/envs/default.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/default.env rename to dockge/emby_4_9_1_0/envs/default.env diff --git a/dockge/emby_4_8_11_0/envs/global.env b/dockge/emby_4_9_1_0/envs/global.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/global.env rename to dockge/emby_4_9_1_0/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..c022892d1 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.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_8_4_5/.env b/dockge/mysql_5_7_44/.env similarity index 100% rename from dockge/mysql_8_4_5/.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_5/docker-compose.yml b/dockge/mysql_5_7_44/docker-compose.yml similarity index 65% rename from dockge/mysql_8_4_5/docker-compose.yml rename to dockge/mysql_5_7_44/docker-compose.yml index c022892d1..5cac14f48 100644 --- a/dockge/mysql_8_4_5/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.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_8_4_5/envs/default.env b/dockge/mysql_5_7_44/envs/default.env similarity index 100% rename from dockge/mysql_8_4_5/envs/default.env rename to dockge/mysql_5_7_44/envs/default.env diff --git a/dockge/mysql_8_4_5/envs/global.env b/dockge/mysql_5_7_44/envs/global.env similarity index 100% rename from dockge/mysql_8_4_5/envs/global.env rename to dockge/mysql_5_7_44/envs/global.env diff --git a/dockge/mysql_8_4_5/config/my.cnf b/dockge/mysql_8_4_5/config/my.cnf deleted file mode 100644 index c53ca32dc..000000000 --- a/dockge/mysql_8_4_5/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/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index 5ec4b458b..e4c5107a3 100644 --- a/dockge/qbittorrent/docker-compose.yml +++ b/dockge/qbittorrent/docker-compose.yml @@ -12,7 +12,7 @@ services: - UMASK=022 - WEBUI_PORT=${PANEL_APP_PORT_HTTP} - TORRENTING_PORT=${PANEL_APP_PORT_TORRENTING} - image: linuxserver/qbittorrent:4.6.7 + image: linuxserver/qbittorrent:5.1.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_1_0/.env b/dockge/qbittorrent_4_6_7/.env similarity index 100% rename from dockge/qbittorrent_5_1_0/.env rename to dockge/qbittorrent_4_6_7/.env diff --git a/dockge/qbittorrent_5_1_0/docker-compose.yml b/dockge/qbittorrent_4_6_7/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_5_1_0/docker-compose.yml rename to dockge/qbittorrent_4_6_7/docker-compose.yml index e4c5107a3..5ec4b458b 100644 --- a/dockge/qbittorrent_5_1_0/docker-compose.yml +++ b/dockge/qbittorrent_4_6_7/docker-compose.yml @@ -12,7 +12,7 @@ services: - UMASK=022 - WEBUI_PORT=${PANEL_APP_PORT_HTTP} - TORRENTING_PORT=${PANEL_APP_PORT_TORRENTING} - image: linuxserver/qbittorrent:5.1.0 + image: linuxserver/qbittorrent:4.6.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_5_1_0/envs/default.env b/dockge/qbittorrent_4_6_7/envs/default.env similarity index 100% rename from dockge/qbittorrent_5_1_0/envs/default.env rename to dockge/qbittorrent_4_6_7/envs/default.env diff --git a/dockge/qbittorrent_5_1_0/envs/global.env b/dockge/qbittorrent_4_6_7/envs/global.env similarity index 100% rename from dockge/qbittorrent_5_1_0/envs/global.env rename to dockge/qbittorrent_4_6_7/envs/global.env diff --git a/dockge/stream-rec-backend/docker-compose.yml b/dockge/stream-rec-backend/docker-compose.yml index 0d6d2566e..cca1bacc5 100644 --- a/dockge/stream-rec-backend/docker-compose.yml +++ b/dockge/stream-rec-backend/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_main/.env b/dockge/stream-rec-backend_0_7_2/.env similarity index 100% rename from dockge/stream-rec-backend_main/.env rename to dockge/stream-rec-backend_0_7_2/.env diff --git a/dockge/stream-rec-backend_main/docker-compose.yml b/dockge/stream-rec-backend_0_7_2/docker-compose.yml similarity index 92% rename from dockge/stream-rec-backend_main/docker-compose.yml rename to dockge/stream-rec-backend_0_7_2/docker-compose.yml index cca1bacc5..0d6d2566e 100644 --- a/dockge/stream-rec-backend_main/docker-compose.yml +++ b/dockge/stream-rec-backend_0_7_2/docker-compose.yml @@ -11,7 +11,7 @@ services: - LOG_LEVEL=INFO - DB_PATH=/opt/records - DOWNLOAD_PATH=/download - image: streamrec/stream-rec:main + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-backend_main/envs/default.env b/dockge/stream-rec-backend_0_7_2/envs/default.env similarity index 100% rename from dockge/stream-rec-backend_main/envs/default.env rename to dockge/stream-rec-backend_0_7_2/envs/default.env diff --git a/dockge/stream-rec-backend_main/envs/global.env b/dockge/stream-rec-backend_0_7_2/envs/global.env similarity index 100% rename from dockge/stream-rec-backend_main/envs/global.env rename to dockge/stream-rec-backend_0_7_2/envs/global.env diff --git a/dockge/stream-rec-frontend/docker-compose.yml b/dockge/stream-rec-frontend/docker-compose.yml index 1f4d40283..adf7b34f0 100644 --- a/dockge/stream-rec-frontend/docker-compose.yml +++ b/dockge/stream-rec-frontend/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_main/.env b/dockge/stream-rec-frontend_0_7_2/.env similarity index 100% rename from dockge/stream-rec-frontend_main/.env rename to dockge/stream-rec-frontend_0_7_2/.env diff --git a/dockge/stream-rec-frontend_main/docker-compose.yml b/dockge/stream-rec-frontend_0_7_2/docker-compose.yml similarity index 87% rename from dockge/stream-rec-frontend_main/docker-compose.yml rename to dockge/stream-rec-frontend_0_7_2/docker-compose.yml index adf7b34f0..1f4d40283 100644 --- a/dockge/stream-rec-frontend_main/docker-compose.yml +++ b/dockge/stream-rec-frontend_0_7_2/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: streamrec/stream-rec-front:main + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec-frontend_main/envs/default.env b/dockge/stream-rec-frontend_0_7_2/envs/default.env similarity index 100% rename from dockge/stream-rec-frontend_main/envs/default.env rename to dockge/stream-rec-frontend_0_7_2/envs/default.env diff --git a/dockge/stream-rec-frontend_main/envs/global.env b/dockge/stream-rec-frontend_0_7_2/envs/global.env similarity index 100% rename from dockge/stream-rec-frontend_main/envs/global.env rename to dockge/stream-rec-frontend_0_7_2/envs/global.env diff --git a/dockge/umami-mysql/docker-compose.yml b/dockge/umami-mysql/docker-compose.yml index 2bc7a13bc..0347d07c0 100644 --- a/dockge/umami-mysql/docker-compose.yml +++ b/dockge/umami-mysql/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:mysql-v2.16.0 + image: umamisoftware/umami:mysql-v2.18.1 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_18_1/.env b/dockge/umami-mysql_2_16_0/.env similarity index 100% rename from dockge/umami-mysql_2_18_1/.env rename to dockge/umami-mysql_2_16_0/.env diff --git a/dockge/umami-mysql_2_18_1/docker-compose.yml b/dockge/umami-mysql_2_16_0/docker-compose.yml similarity index 91% rename from dockge/umami-mysql_2_18_1/docker-compose.yml rename to dockge/umami-mysql_2_16_0/docker-compose.yml index 0347d07c0..2bc7a13bc 100644 --- a/dockge/umami-mysql_2_18_1/docker-compose.yml +++ b/dockge/umami-mysql_2_16_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:mysql-v2.18.1 + image: umamisoftware/umami:mysql-v2.16.0 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_18_1/envs/default.env b/dockge/umami-mysql_2_16_0/envs/default.env similarity index 100% rename from dockge/umami-mysql_2_18_1/envs/default.env rename to dockge/umami-mysql_2_16_0/envs/default.env diff --git a/dockge/umami-mysql_2_18_1/envs/global.env b/dockge/umami-mysql_2_16_0/envs/global.env similarity index 100% rename from dockge/umami-mysql_2_18_1/envs/global.env rename to dockge/umami-mysql_2_16_0/envs/global.env diff --git a/dockge/umami/docker-compose.yml b/dockge/umami/docker-compose.yml index 7f7a58660..9bbf23909 100644 --- a/dockge/umami/docker-compose.yml +++ b/dockge/umami/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:postgresql-v2.16.0 + image: umamisoftware/umami:postgresql-v2.18.1 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_18_1/.env b/dockge/umami_2_16_0/.env similarity index 100% rename from dockge/umami_2_18_1/.env rename to dockge/umami_2_16_0/.env diff --git a/dockge/umami_2_18_1/docker-compose.yml b/dockge/umami_2_16_0/docker-compose.yml similarity index 90% rename from dockge/umami_2_18_1/docker-compose.yml rename to dockge/umami_2_16_0/docker-compose.yml index 9bbf23909..7f7a58660 100644 --- a/dockge/umami_2_18_1/docker-compose.yml +++ b/dockge/umami_2_16_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:postgresql-v2.18.1 + image: umamisoftware/umami:postgresql-v2.16.0 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_18_1/envs/default.env b/dockge/umami_2_16_0/envs/default.env similarity index 100% rename from dockge/umami_2_18_1/envs/default.env rename to dockge/umami_2_16_0/envs/default.env diff --git a/dockge/umami_2_18_1/envs/global.env b/dockge/umami_2_16_0/envs/global.env similarity index 100% rename from dockge/umami_2_18_1/envs/global.env rename to dockge/umami_2_16_0/envs/global.env diff --git a/dockge/uptime-kuma/.env b/dockge/uptime-kuma/.env index 32a291fcd..5fa74c158 100644 --- a/dockge/uptime-kuma/.env +++ b/dockge/uptime-kuma/.env @@ -4,3 +4,9 @@ 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 c6ee97339..03b4560f7 100644 --- a/dockge/uptime-kuma/docker-compose.yml +++ b/dockge/uptime-kuma/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_1_23_16/.env b/dockge/uptime-kuma_1_23_16/.env deleted file mode 100644 index 5fa74c158..000000000 --- a/dockge/uptime-kuma_1_23_16/.env +++ /dev/null @@ -1,12 +0,0 @@ -# 数据持久化路径 [必填] -UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=3001 - -# Cloudflared 隧道令牌 -UPTIME_KUMA_CLOUDFLARED_TOKEN= - -# 禁用 Frame SameOrigin [必填] -UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=false - diff --git a/dockge/uptime-kuma_2_0_0/.env b/dockge/uptime-kuma_2_0_0/.env new file mode 100644 index 000000000..32a291fcd --- /dev/null +++ b/dockge/uptime-kuma_2_0_0/.env @@ -0,0 +1,6 @@ +# 数据持久化路径 [必填] +UPTIME_KUMA_ROOT_PATH=/home/uptime-kuma + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=3001 + diff --git a/dockge/uptime-kuma_1_23_16/docker-compose.yml b/dockge/uptime-kuma_2_0_0/docker-compose.yml similarity index 57% rename from dockge/uptime-kuma_1_23_16/docker-compose.yml rename to dockge/uptime-kuma_2_0_0/docker-compose.yml index 03b4560f7..c6ee97339 100644 --- a/dockge/uptime-kuma_1_23_16/docker-compose.yml +++ b/dockge/uptime-kuma_2_0_0/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/envs/default.env b/dockge/uptime-kuma_2_0_0/envs/default.env similarity index 100% rename from dockge/uptime-kuma_1_23_16/envs/default.env rename to dockge/uptime-kuma_2_0_0/envs/default.env diff --git a/dockge/uptime-kuma_1_23_16/envs/global.env b/dockge/uptime-kuma_2_0_0/envs/global.env similarity index 100% rename from dockge/uptime-kuma_1_23_16/envs/global.env rename to dockge/uptime-kuma_2_0_0/envs/global.env