diff --git a/dockge/byte-muse/.env b/dockge/byte-muse/.env index 7198039bd..e633719fd 100644 --- a/dockge/byte-muse/.env +++ b/dockge/byte-muse/.env @@ -1,21 +1,3 @@ -# 数据持久化路径 [必填] -AUTO_LADY_ROOT_PATH=/home/byte-muse - # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8080 - -# 自定义挂载目录 1 -CUSTOM_MOUNT_DIRECTORY_1= - -# 自定义挂载目录 2 -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 +PANEL_APP_PORT_HTTP=5000 diff --git a/dockge/byte-muse/docker-compose.yml b/dockge/byte-muse/docker-compose.yml index c2e23f3ad..e70ac8e43 100644 --- a/dockge/byte-muse/docker-compose.yml +++ b/dockge/byte-muse/docker-compose.yml @@ -2,25 +2,13 @@ networks: 1panel-network: external: true services: - auto-lady: + byte-muse-license: container_name: byte-muse - env_file: - - ./envs/global.env - - .env - environment: - - HTTPS_PROXY=${HTTP_PROXY} - - HTTP_PROXY=${HTTP_PROXY:-} - - NO_PROXY=${NO_PROXY:-} - image: envyafish/byte-muse:1.11.5 + image: envyafish/byte-muse-license:latest labels: createdBy: Apps networks: - 1panel-network ports: - - ${PANEL_APP_PORT_HTTP}:80 + - ${PANEL_APP_PORT_HTTP}:5000 restart: always - volumes: - - ${AUTO_LADY_ROOT_PATH}/config:/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/byte-muse_1_11_5/.env b/dockge/byte-muse_1_11_5/.env new file mode 100644 index 000000000..7198039bd --- /dev/null +++ b/dockge/byte-muse_1_11_5/.env @@ -0,0 +1,21 @@ +# 数据持久化路径 [必填] +AUTO_LADY_ROOT_PATH=/home/byte-muse + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8080 + +# 自定义挂载目录 1 +CUSTOM_MOUNT_DIRECTORY_1= + +# 自定义挂载目录 2 +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/byte-muse_1_11_5/docker-compose.yml b/dockge/byte-muse_1_11_5/docker-compose.yml new file mode 100644 index 000000000..c2e23f3ad --- /dev/null +++ b/dockge/byte-muse_1_11_5/docker-compose.yml @@ -0,0 +1,26 @@ +networks: + 1panel-network: + external: true +services: + auto-lady: + container_name: byte-muse + env_file: + - ./envs/global.env + - .env + environment: + - HTTPS_PROXY=${HTTP_PROXY} + - HTTP_PROXY=${HTTP_PROXY:-} + - NO_PROXY=${NO_PROXY:-} + image: envyafish/byte-muse:1.11.5 + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:80 + restart: always + volumes: + - ${AUTO_LADY_ROOT_PATH}/config:/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/byte-muse_license/envs/default.env b/dockge/byte-muse_1_11_5/envs/default.env similarity index 100% rename from dockge/byte-muse_license/envs/default.env rename to dockge/byte-muse_1_11_5/envs/default.env diff --git a/dockge/byte-muse_license/envs/global.env b/dockge/byte-muse_1_11_5/envs/global.env similarity index 100% rename from dockge/byte-muse_license/envs/global.env rename to dockge/byte-muse_1_11_5/envs/global.env diff --git a/dockge/byte-muse_license/.env b/dockge/byte-muse_license/.env deleted file mode 100644 index e633719fd..000000000 --- a/dockge/byte-muse_license/.env +++ /dev/null @@ -1,3 +0,0 @@ -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=5000 - diff --git a/dockge/byte-muse_license/docker-compose.yml b/dockge/byte-muse_license/docker-compose.yml deleted file mode 100644 index e70ac8e43..000000000 --- a/dockge/byte-muse_license/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -networks: - 1panel-network: - external: true -services: - byte-muse-license: - container_name: byte-muse - image: envyafish/byte-muse-license:latest - labels: - createdBy: Apps - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:5000 - restart: always diff --git a/dockge/emby/docker-compose.yml b/dockge/emby/docker-compose.yml index 95e0b22bb..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.0.52 + 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_0_52/.env similarity index 100% rename from dockge/emby_4_8_11_0/.env rename to dockge/emby_4_9_0_52/.env diff --git a/dockge/emby_4_8_11_0/docker-compose.yml b/dockge/emby_4_9_0_52/docker-compose.yml similarity index 96% rename from dockge/emby_4_8_11_0/docker-compose.yml rename to dockge/emby_4_9_0_52/docker-compose.yml index a461e63ac..95e0b22bb 100644 --- a/dockge/emby_4_8_11_0/docker-compose.yml +++ b/dockge/emby_4_9_0_52/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.0.52 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/emby_4_8_11_0/envs/default.env b/dockge/emby_4_9_0_52/envs/default.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/default.env rename to dockge/emby_4_9_0_52/envs/default.env diff --git a/dockge/emby_4_8_11_0/envs/global.env b/dockge/emby_4_9_0_52/envs/global.env similarity index 100% rename from dockge/emby_4_8_11_0/envs/global.env rename to dockge/emby_4_9_0_52/envs/global.env diff --git a/dockge/homarr/.env b/dockge/homarr/.env index 39cbf2014..ab5a7db42 100644 --- a/dockge/homarr/.env +++ b/dockge/homarr/.env @@ -4,6 +4,3 @@ HOMARR_ROOT_PATH=/home/homarr # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=7575 -# 密钥 [必填] -SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 - diff --git a/dockge/homarr/docker-compose.yml b/dockge/homarr/docker-compose.yml index c9303a621..3b26c2c66 100644 --- a/dockge/homarr/docker-compose.yml +++ b/dockge/homarr/docker-compose.yml @@ -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_0_15_10/.env b/dockge/homarr_1_18_1/.env similarity index 52% rename from dockge/homarr_0_15_10/.env rename to dockge/homarr_1_18_1/.env index ab5a7db42..39cbf2014 100644 --- a/dockge/homarr_0_15_10/.env +++ b/dockge/homarr_1_18_1/.env @@ -4,3 +4,6 @@ HOMARR_ROOT_PATH=/home/homarr # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=7575 +# 密钥 [必填] +SECRET_ENCRYPTION_KEY=b7fa3f6f09ac8084ca03b94589d799e6a9225212e8f691c6b419a139acf412c7 + diff --git a/dockge/homarr_0_15_10/docker-compose.yml b/dockge/homarr_1_18_1/docker-compose.yml similarity index 73% rename from dockge/homarr_0_15_10/docker-compose.yml rename to dockge/homarr_1_18_1/docker-compose.yml index 3b26c2c66..c9303a621 100644 --- a/dockge/homarr_0_15_10/docker-compose.yml +++ b/dockge/homarr_1_18_1/docker-compose.yml @@ -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_0_15_10/envs/default.env b/dockge/homarr_1_18_1/envs/default.env similarity index 100% rename from dockge/homarr_0_15_10/envs/default.env rename to dockge/homarr_1_18_1/envs/default.env diff --git a/dockge/homarr_0_15_10/envs/global.env b/dockge/homarr_1_18_1/envs/global.env similarity index 100% rename from dockge/homarr_0_15_10/envs/global.env rename to dockge/homarr_1_18_1/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 ea6fe3ec2..88affa9a4 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.10.7 + image: jellyfin/jellyfin:10.9.11 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/jellyfin_10_9_11/.env b/dockge/jellyfin_10_10_7/.env similarity index 100% rename from dockge/jellyfin_10_9_11/.env rename to dockge/jellyfin_10_10_7/.env diff --git a/dockge/jellyfin_10_9_11/docker-compose.yml b/dockge/jellyfin_10_10_7/docker-compose.yml similarity index 96% rename from dockge/jellyfin_10_9_11/docker-compose.yml rename to dockge/jellyfin_10_10_7/docker-compose.yml index 88affa9a4..ea6fe3ec2 100644 --- a/dockge/jellyfin_10_9_11/docker-compose.yml +++ b/dockge/jellyfin_10_10_7/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_9_11/envs/default.env b/dockge/jellyfin_10_10_7/envs/default.env similarity index 100% rename from dockge/jellyfin_10_9_11/envs/default.env rename to dockge/jellyfin_10_10_7/envs/default.env diff --git a/dockge/jellyfin_10_9_11/envs/global.env b/dockge/jellyfin_10_10_7/envs/global.env similarity index 100% rename from dockge/jellyfin_10_9_11/envs/global.env rename to dockge/jellyfin_10_10_7/envs/global.env diff --git a/dockge/nacos/.env b/dockge/nacos/.env index 7efde0c9d..25c024938 100644 --- a/dockge/nacos/.env +++ b/dockge/nacos/.env @@ -2,19 +2,19 @@ PANEL_DB_TYPE=mysql # 网络模式 [必填] -NETWORK_MODE=1panel-network +NETWORK_MODE=host # 数据持久化路径 [必填] NACOS_ROOT_PATH=/home/nacos # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8080 +PANEL_APP_PORT_HTTP=8848 -# WebUI API 端口 [必填] -PANEL_APP_PORT_API=8848 +# Nacos gRPC 客户端端口 [必填] +PANEL_APP_PORT_GRPC_CLIENT=9848 -# Nacos gRPC 端口 [必填] -PANEL_APP_PORT_GRPC=9848 +# Nacos gRPC 服务端端口 [必填] +PANEL_APP_PORT_GRPC_SERVER=9849 # IP模式/域名模式 [必填] PREFER_HOST_MODE=ip diff --git a/dockge/nacos/docker-compose.yml b/dockge/nacos/docker-compose.yml index 699e4162b..7e925e038 100644 --- a/dockge/nacos/docker-compose.yml +++ b/dockge/nacos/docker-compose.yml @@ -9,18 +9,17 @@ services: - .env environment: - MODE=standalone - - NACOS_CONSOLE_PORT=${PANEL_APP_PORT_HTTP:-8080} - - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} + - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v3.0.0 + image: nacos/nacos-server:v2.5.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} ports: - - ${PANEL_APP_PORT_HTTP:-8080}:${PANEL_APP_PORT_HTTP:-8080} - - ${PANEL_APP_PORT_API:-8848}:${PANEL_APP_PORT_API:-8080} - - ${PANEL_APP_PORT_GRPC}:9848 + - ${PANEL_APP_PORT_HTTP:-8848}:${PANEL_APP_PORT_HTTP:-8848} + - ${PANEL_APP_PORT_GRPC_CLIENT}:9848 + - ${PANEL_APP_PORT_GRPC_SERVER}:9849 restart: always volumes: - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs diff --git a/dockge/nacos/init/mysql-schema.sql b/dockge/nacos/init/mysql-schema.sql index d45ac956b..067d67a12 100644 --- a/dockge/nacos/init/mysql-schema.sql +++ b/dockge/nacos/init/mysql-schema.sql @@ -20,50 +20,86 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info since 2.5.0 */ +/* 表名称 = config_info_aggr */ /******************************************/ -CREATE TABLE `config_info_gray` +CREATE TABLE `config_info_aggr` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', + `content` longtext NOT NULL COMMENT '内容', + `gmt_modified` datetime NOT NULL COMMENT '修改时间', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; + + +/******************************************/ +/* 表名称 = config_info_beta */ +/******************************************/ +CREATE TABLE `config_info_beta` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `data_id` varchar(255) NOT NULL COMMENT 'data_id', `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `src_user` text COMMENT 'src_user', - `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', - `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', - `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', - `gray_rule` text NOT NULL COMMENT 'gray_rule', - `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), - KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), - KEY `idx_gmt_modified` (`gmt_modified`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; + UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; + +/******************************************/ +/* 表名称 = config_info_tag */ +/******************************************/ +CREATE TABLE `config_info_tag` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; /******************************************/ /* 表名称 = config_tags_relation */ @@ -108,21 +144,18 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', - `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', - `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', - `ext_info` longtext DEFAULT NULL COMMENT 'ext info', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -186,3 +219,9 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); + +INSERT INTO users (username, password, enabled) +VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) +VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/dockge/nacos_2_5_1/.env b/dockge/nacos_3_0_0/.env similarity index 88% rename from dockge/nacos_2_5_1/.env rename to dockge/nacos_3_0_0/.env index 25c024938..7efde0c9d 100644 --- a/dockge/nacos_2_5_1/.env +++ b/dockge/nacos_3_0_0/.env @@ -2,19 +2,19 @@ PANEL_DB_TYPE=mysql # 网络模式 [必填] -NETWORK_MODE=host +NETWORK_MODE=1panel-network # 数据持久化路径 [必填] NACOS_ROOT_PATH=/home/nacos # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8848 +PANEL_APP_PORT_HTTP=8080 -# Nacos gRPC 客户端端口 [必填] -PANEL_APP_PORT_GRPC_CLIENT=9848 +# WebUI API 端口 [必填] +PANEL_APP_PORT_API=8848 -# Nacos gRPC 服务端端口 [必填] -PANEL_APP_PORT_GRPC_SERVER=9849 +# Nacos gRPC 端口 [必填] +PANEL_APP_PORT_GRPC=9848 # IP模式/域名模式 [必填] PREFER_HOST_MODE=ip diff --git a/dockge/nacos_2_5_1/docker-compose.yml b/dockge/nacos_3_0_0/docker-compose.yml similarity index 59% rename from dockge/nacos_2_5_1/docker-compose.yml rename to dockge/nacos_3_0_0/docker-compose.yml index 7e925e038..699e4162b 100644 --- a/dockge/nacos_2_5_1/docker-compose.yml +++ b/dockge/nacos_3_0_0/docker-compose.yml @@ -9,17 +9,18 @@ services: - .env environment: - MODE=standalone - - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} + - NACOS_CONSOLE_PORT=${PANEL_APP_PORT_HTTP:-8080} + - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.5.1 + image: nacos/nacos-server:v3.0.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} ports: - - ${PANEL_APP_PORT_HTTP:-8848}:${PANEL_APP_PORT_HTTP:-8848} - - ${PANEL_APP_PORT_GRPC_CLIENT}:9848 - - ${PANEL_APP_PORT_GRPC_SERVER}:9849 + - ${PANEL_APP_PORT_HTTP:-8080}:${PANEL_APP_PORT_HTTP:-8080} + - ${PANEL_APP_PORT_API:-8848}:${PANEL_APP_PORT_API:-8080} + - ${PANEL_APP_PORT_GRPC}:9848 restart: always volumes: - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs diff --git a/dockge/nacos_2_5_1/envs/default.env b/dockge/nacos_3_0_0/envs/default.env similarity index 100% rename from dockge/nacos_2_5_1/envs/default.env rename to dockge/nacos_3_0_0/envs/default.env diff --git a/dockge/nacos_2_5_1/envs/global.env b/dockge/nacos_3_0_0/envs/global.env similarity index 100% rename from dockge/nacos_2_5_1/envs/global.env rename to dockge/nacos_3_0_0/envs/global.env diff --git a/dockge/nacos_2_5_1/init/mysql-schema.sql b/dockge/nacos_3_0_0/init/mysql-schema.sql similarity index 59% rename from dockge/nacos_2_5_1/init/mysql-schema.sql rename to dockge/nacos_3_0_0/init/mysql-schema.sql index 067d67a12..d45ac956b 100644 --- a/dockge/nacos_2_5_1/init/mysql-schema.sql +++ b/dockge/nacos_3_0_0/init/mysql-schema.sql @@ -20,86 +20,50 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info_aggr */ +/* 表名称 = config_info since 2.5.0 */ /******************************************/ -CREATE TABLE `config_info_aggr` +CREATE TABLE `config_info_gray` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', - `content` longtext NOT NULL COMMENT '内容', - `gmt_modified` datetime NOT NULL COMMENT '修改时间', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; - - -/******************************************/ -/* 表名称 = config_info_beta */ -/******************************************/ -CREATE TABLE `config_info_beta` -( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', `data_id` varchar(255) NOT NULL COMMENT 'data_id', `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_user` text COMMENT 'src_user', + `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', + `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', + `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', + `gray_rule` text NOT NULL COMMENT 'gray_rule', + `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; - -/******************************************/ -/* 表名称 = config_info_tag */ -/******************************************/ -CREATE TABLE `config_info_tag` -( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; + UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), + KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), + KEY `idx_gmt_modified` (`gmt_modified`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; /******************************************/ /* 表名称 = config_tags_relation */ @@ -144,18 +108,21 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', + `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', + `ext_info` longtext DEFAULT NULL COMMENT 'ext info', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -219,9 +186,3 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); - -INSERT INTO users (username, password, enabled) -VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); - -INSERT INTO roles (username, role) -VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/dockge/postgresql/docker-compose.yml b/dockge/postgresql/docker-compose.yml index 644e2fa7e..6826af067 100644 --- a/dockge/postgresql/docker-compose.yml +++ b/dockge/postgresql/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg15-vectors-postgresql + container_name: pg16-alpine-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: tensorchord/pgvecto-rs:pg15-v0.2.1 + image: postgres:16-alpine labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg16-alpine/.env b/dockge/postgresql_pg15-vectors/.env similarity index 100% rename from dockge/postgresql_pg16-alpine/.env rename to dockge/postgresql_pg15-vectors/.env diff --git a/dockge/postgresql_pg16-alpine/docker-compose.yml b/dockge/postgresql_pg15-vectors/docker-compose.yml similarity index 85% rename from dockge/postgresql_pg16-alpine/docker-compose.yml rename to dockge/postgresql_pg15-vectors/docker-compose.yml index 6826af067..644e2fa7e 100644 --- a/dockge/postgresql_pg16-alpine/docker-compose.yml +++ b/dockge/postgresql_pg15-vectors/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: postgresql: - container_name: pg16-alpine-postgresql + container_name: pg15-vectors-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-alpine + image: tensorchord/pgvecto-rs:pg15-v0.2.1 labels: createdBy: Apps networks: diff --git a/dockge/postgresql_pg16-alpine/envs/default.env b/dockge/postgresql_pg15-vectors/envs/default.env similarity index 100% rename from dockge/postgresql_pg16-alpine/envs/default.env rename to dockge/postgresql_pg15-vectors/envs/default.env diff --git a/dockge/postgresql_pg16-alpine/envs/global.env b/dockge/postgresql_pg15-vectors/envs/global.env similarity index 100% rename from dockge/postgresql_pg16-alpine/envs/global.env rename to dockge/postgresql_pg15-vectors/envs/global.env diff --git a/dockge/qbittorrent/docker-compose.yml b/dockge/qbittorrent/docker-compose.yml index e4c5107a3..5ec4b458b 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:5.1.0 + image: linuxserver/qbittorrent:4.6.7 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/qbittorrent_4_6_7/.env b/dockge/qbittorrent_5_1_0/.env similarity index 100% rename from dockge/qbittorrent_4_6_7/.env rename to dockge/qbittorrent_5_1_0/.env diff --git a/dockge/qbittorrent_4_6_7/docker-compose.yml b/dockge/qbittorrent_5_1_0/docker-compose.yml similarity index 95% rename from dockge/qbittorrent_4_6_7/docker-compose.yml rename to dockge/qbittorrent_5_1_0/docker-compose.yml index 5ec4b458b..e4c5107a3 100644 --- a/dockge/qbittorrent_4_6_7/docker-compose.yml +++ b/dockge/qbittorrent_5_1_0/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_4_6_7/envs/default.env b/dockge/qbittorrent_5_1_0/envs/default.env similarity index 100% rename from dockge/qbittorrent_4_6_7/envs/default.env rename to dockge/qbittorrent_5_1_0/envs/default.env diff --git a/dockge/qbittorrent_4_6_7/envs/global.env b/dockge/qbittorrent_5_1_0/envs/global.env similarity index 100% rename from dockge/qbittorrent_4_6_7/envs/global.env rename to dockge/qbittorrent_5_1_0/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/stream-rec/docker-compose.yml b/dockge/stream-rec/docker-compose.yml index 37ce2ab40..453e6ea75 100644 --- a/dockge/stream-rec/docker-compose.yml +++ b/dockge/stream-rec/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:v0.7.2 + image: streamrec/stream-rec:main labels: createdBy: Apps networks: @@ -36,7 +36,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:v0.7.2 + image: streamrec/stream-rec-front:main labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_main/.env b/dockge/stream-rec_0_7_2/.env similarity index 100% rename from dockge/stream-rec_main/.env rename to dockge/stream-rec_0_7_2/.env diff --git a/dockge/stream-rec_main/docker-compose.yml b/dockge/stream-rec_0_7_2/docker-compose.yml similarity index 91% rename from dockge/stream-rec_main/docker-compose.yml rename to dockge/stream-rec_0_7_2/docker-compose.yml index 453e6ea75..37ce2ab40 100644 --- a/dockge/stream-rec_main/docker-compose.yml +++ b/dockge/stream-rec_0_7_2/docker-compose.yml @@ -15,7 +15,7 @@ services: - DOWNLOAD_PATH=/download - PGID=1000 - PUID=1000 - image: streamrec/stream-rec:main + image: streamrec/stream-rec:v0.7.2 labels: createdBy: Apps networks: @@ -36,7 +36,7 @@ services: environment: - TZ=Asia/Shanghai - API_URL=http://stream-rec-backend:12555/api - image: streamrec/stream-rec-front:main + image: streamrec/stream-rec-front:v0.7.2 labels: createdBy: Apps networks: diff --git a/dockge/stream-rec_main/envs/default.env b/dockge/stream-rec_0_7_2/envs/default.env similarity index 100% rename from dockge/stream-rec_main/envs/default.env rename to dockge/stream-rec_0_7_2/envs/default.env diff --git a/dockge/stream-rec_main/envs/global.env b/dockge/stream-rec_0_7_2/envs/global.env similarity index 100% rename from dockge/stream-rec_main/envs/global.env rename to dockge/stream-rec_0_7_2/envs/global.env diff --git a/dockge/umami-mysql/docker-compose.yml b/dockge/umami-mysql/docker-compose.yml index 2bc7a13bc..7fecaba90 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.17.0 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_17_0/.env b/dockge/umami-mysql_2_16_0/.env similarity index 100% rename from dockge/umami-mysql_2_17_0/.env rename to dockge/umami-mysql_2_16_0/.env diff --git a/dockge/umami-mysql_2_17_0/docker-compose.yml b/dockge/umami-mysql_2_16_0/docker-compose.yml similarity index 91% rename from dockge/umami-mysql_2_17_0/docker-compose.yml rename to dockge/umami-mysql_2_16_0/docker-compose.yml index 7fecaba90..2bc7a13bc 100644 --- a/dockge/umami-mysql_2_17_0/docker-compose.yml +++ b/dockge/umami-mysql_2_16_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=mysql - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:mysql-v2.17.0 + image: umamisoftware/umami:mysql-v2.16.0 labels: createdBy: Apps networks: diff --git a/dockge/umami-mysql_2_17_0/envs/default.env b/dockge/umami-mysql_2_16_0/envs/default.env similarity index 100% rename from dockge/umami-mysql_2_17_0/envs/default.env rename to dockge/umami-mysql_2_16_0/envs/default.env diff --git a/dockge/umami-mysql_2_17_0/envs/global.env b/dockge/umami-mysql_2_16_0/envs/global.env similarity index 100% rename from dockge/umami-mysql_2_17_0/envs/global.env rename to dockge/umami-mysql_2_16_0/envs/global.env diff --git a/dockge/umami/docker-compose.yml b/dockge/umami/docker-compose.yml index 7f7a58660..ed46eb6b2 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.17.0 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_17_0/.env b/dockge/umami_2_16_0/.env similarity index 100% rename from dockge/umami_2_17_0/.env rename to dockge/umami_2_16_0/.env diff --git a/dockge/umami_2_17_0/docker-compose.yml b/dockge/umami_2_16_0/docker-compose.yml similarity index 90% rename from dockge/umami_2_17_0/docker-compose.yml rename to dockge/umami_2_16_0/docker-compose.yml index ed46eb6b2..7f7a58660 100644 --- a/dockge/umami_2_17_0/docker-compose.yml +++ b/dockge/umami_2_16_0/docker-compose.yml @@ -12,7 +12,7 @@ services: - REMOVE_TRAILING_SLASH = 1 - DATABASE_TYPE=postgresql - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} - image: umamisoftware/umami:postgresql-v2.17.0 + image: umamisoftware/umami:postgresql-v2.16.0 labels: createdBy: Apps networks: diff --git a/dockge/umami_2_17_0/envs/default.env b/dockge/umami_2_16_0/envs/default.env similarity index 100% rename from dockge/umami_2_17_0/envs/default.env rename to dockge/umami_2_16_0/envs/default.env diff --git a/dockge/umami_2_17_0/envs/global.env b/dockge/umami_2_16_0/envs/global.env similarity index 100% rename from dockge/umami_2_17_0/envs/global.env rename to dockge/umami_2_16_0/envs/global.env