From 410bb19051ee0008fce52ee2cf2ed90cbe49bf76 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Sat, 10 May 2025 12:38:25 +0000 Subject: [PATCH] Processed apps directory via GitHub Actions --- appstore/ani-rss/{1.2.50 => 1.2.52}/.env | 0 appstore/ani-rss/{1.2.50 => 1.2.52}/data.yml | 0 .../{1.2.50 => 1.2.52}/docker-compose.yml | 2 +- .../{1.2.50 => 1.2.52}/envs/default.env | 0 .../{1.2.50 => 1.2.52}/envs/global.env | 0 .../{1.2.50 => 1.2.52}/scripts/init.sh | 0 .../{1.2.50 => 1.2.52}/scripts/uninstall.sh | 0 .../{1.2.50 => 1.2.52}/scripts/upgrade.sh | 0 appstore/elastic-elasticsearch/9.0.1/.env | 24 ++++++++ appstore/elastic-elasticsearch/9.0.1/data.yml | 60 +++++++++++++++++++ .../9.0.1/docker-compose.yml | 34 +++++++++++ .../9.0.1}/envs/default.env | 0 .../9.0.1}/envs/global.env | 0 .../9.0.1/scripts/init.sh | 23 +++++++ .../9.0.1}/scripts/uninstall.sh | 0 .../9.0.1}/scripts/upgrade.sh | 0 .../elastic-kibana/{8.18.1 => 9.0.1}/.env | 0 .../elastic-kibana/{8.18.1 => 9.0.1}/data.yml | 0 .../{8.18.1 => 9.0.1}/docker-compose.yml | 2 +- .../elastic-kibana/9.0.1/envs/default.env | 2 + appstore/elastic-kibana/9.0.1/envs/global.env | 2 + .../{8.18.1 => 9.0.1}/scripts/init.sh | 0 .../elastic-kibana/9.0.1/scripts/uninstall.sh | 10 ++++ .../elastic-kibana/9.0.1/scripts/upgrade.sh | 17 ++++++ dockge/ani-rss/docker-compose.yml | 2 +- dockge/elastic-elasticsearch_9_0_1/.env | 24 ++++++++ .../docker-compose.yml | 34 +++++++++++ .../envs/default.env | 2 + .../envs/global.env | 2 + dockge/elastic-kibana/docker-compose.yml | 2 +- 30 files changed, 238 insertions(+), 4 deletions(-) rename appstore/ani-rss/{1.2.50 => 1.2.52}/.env (100%) rename appstore/ani-rss/{1.2.50 => 1.2.52}/data.yml (100%) rename appstore/ani-rss/{1.2.50 => 1.2.52}/docker-compose.yml (95%) rename appstore/ani-rss/{1.2.50 => 1.2.52}/envs/default.env (100%) rename appstore/ani-rss/{1.2.50 => 1.2.52}/envs/global.env (100%) rename appstore/ani-rss/{1.2.50 => 1.2.52}/scripts/init.sh (100%) rename appstore/ani-rss/{1.2.50 => 1.2.52}/scripts/uninstall.sh (100%) rename appstore/ani-rss/{1.2.50 => 1.2.52}/scripts/upgrade.sh (100%) create mode 100644 appstore/elastic-elasticsearch/9.0.1/.env create mode 100644 appstore/elastic-elasticsearch/9.0.1/data.yml create mode 100644 appstore/elastic-elasticsearch/9.0.1/docker-compose.yml rename appstore/{elastic-kibana/8.18.1 => elastic-elasticsearch/9.0.1}/envs/default.env (100%) rename appstore/{elastic-kibana/8.18.1 => elastic-elasticsearch/9.0.1}/envs/global.env (100%) create mode 100644 appstore/elastic-elasticsearch/9.0.1/scripts/init.sh rename appstore/{elastic-kibana/8.18.1 => elastic-elasticsearch/9.0.1}/scripts/uninstall.sh (100%) rename appstore/{elastic-kibana/8.18.1 => elastic-elasticsearch/9.0.1}/scripts/upgrade.sh (100%) rename appstore/elastic-kibana/{8.18.1 => 9.0.1}/.env (100%) rename appstore/elastic-kibana/{8.18.1 => 9.0.1}/data.yml (100%) rename appstore/elastic-kibana/{8.18.1 => 9.0.1}/docker-compose.yml (95%) create mode 100644 appstore/elastic-kibana/9.0.1/envs/default.env create mode 100644 appstore/elastic-kibana/9.0.1/envs/global.env rename appstore/elastic-kibana/{8.18.1 => 9.0.1}/scripts/init.sh (100%) create mode 100644 appstore/elastic-kibana/9.0.1/scripts/uninstall.sh create mode 100644 appstore/elastic-kibana/9.0.1/scripts/upgrade.sh create mode 100644 dockge/elastic-elasticsearch_9_0_1/.env create mode 100644 dockge/elastic-elasticsearch_9_0_1/docker-compose.yml create mode 100644 dockge/elastic-elasticsearch_9_0_1/envs/default.env create mode 100644 dockge/elastic-elasticsearch_9_0_1/envs/global.env diff --git a/appstore/ani-rss/1.2.50/.env b/appstore/ani-rss/1.2.52/.env similarity index 100% rename from appstore/ani-rss/1.2.50/.env rename to appstore/ani-rss/1.2.52/.env diff --git a/appstore/ani-rss/1.2.50/data.yml b/appstore/ani-rss/1.2.52/data.yml similarity index 100% rename from appstore/ani-rss/1.2.50/data.yml rename to appstore/ani-rss/1.2.52/data.yml diff --git a/appstore/ani-rss/1.2.50/docker-compose.yml b/appstore/ani-rss/1.2.52/docker-compose.yml similarity index 95% rename from appstore/ani-rss/1.2.50/docker-compose.yml rename to appstore/ani-rss/1.2.52/docker-compose.yml index 136b73c6f..76e5a7815 100644 --- a/appstore/ani-rss/1.2.50/docker-compose.yml +++ b/appstore/ani-rss/1.2.52/docker-compose.yml @@ -11,7 +11,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v1.2.50 + image: wushuo894/ani-rss:v1.2.52 labels: createdBy: Apps networks: diff --git a/appstore/ani-rss/1.2.50/envs/default.env b/appstore/ani-rss/1.2.52/envs/default.env similarity index 100% rename from appstore/ani-rss/1.2.50/envs/default.env rename to appstore/ani-rss/1.2.52/envs/default.env diff --git a/appstore/ani-rss/1.2.50/envs/global.env b/appstore/ani-rss/1.2.52/envs/global.env similarity index 100% rename from appstore/ani-rss/1.2.50/envs/global.env rename to appstore/ani-rss/1.2.52/envs/global.env diff --git a/appstore/ani-rss/1.2.50/scripts/init.sh b/appstore/ani-rss/1.2.52/scripts/init.sh similarity index 100% rename from appstore/ani-rss/1.2.50/scripts/init.sh rename to appstore/ani-rss/1.2.52/scripts/init.sh diff --git a/appstore/ani-rss/1.2.50/scripts/uninstall.sh b/appstore/ani-rss/1.2.52/scripts/uninstall.sh similarity index 100% rename from appstore/ani-rss/1.2.50/scripts/uninstall.sh rename to appstore/ani-rss/1.2.52/scripts/uninstall.sh diff --git a/appstore/ani-rss/1.2.50/scripts/upgrade.sh b/appstore/ani-rss/1.2.52/scripts/upgrade.sh similarity index 100% rename from appstore/ani-rss/1.2.50/scripts/upgrade.sh rename to appstore/ani-rss/1.2.52/scripts/upgrade.sh diff --git a/appstore/elastic-elasticsearch/9.0.1/.env b/appstore/elastic-elasticsearch/9.0.1/.env new file mode 100644 index 000000000..f7e98d7e7 --- /dev/null +++ b/appstore/elastic-elasticsearch/9.0.1/.env @@ -0,0 +1,24 @@ +# 数据持久化路径 [必填] +ELASTICSEARCH_ROOT_PATH=/home/elasticsearch + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTPS=9200 + +# 集群端口 [必填] +PANEL_APP_PORT_CLUSTER=9300 + +# Elasticsearch 密码 (elastic) [必填] +ELASTIC_PASSWORD= + +# Kibana 密码 (kibana_system) +KIBANA_PASSWORD= + +# 集群名称 [必填] +ES_SETTING_CLUSTER_NAME=elasticsearch + +# 节点名称 [必填] +ES_SETTING_NODE_NAME=es-node + +# Java 启动参数 (可选) +ES_JAVA_OPTS=-Xms1g -Xmx1g + diff --git a/appstore/elastic-elasticsearch/9.0.1/data.yml b/appstore/elastic-elasticsearch/9.0.1/data.yml new file mode 100644 index 000000000..b627b241e --- /dev/null +++ b/appstore/elastic-elasticsearch/9.0.1/data.yml @@ -0,0 +1,60 @@ +additionalProperties: + formFields: + - default: "/home/elasticsearch" + edit: true + envKey: ELASTICSEARCH_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 9200 + edit: true + envKey: PANEL_APP_PORT_HTTPS + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: 9300 + edit: true + envKey: PANEL_APP_PORT_CLUSTER + labelZh: 集群端口 + labelEn: Cluster port + required: true + rule: paramPort + type: number + - default: "" + edit: true + envKey: ELASTIC_PASSWORD + labelZh: Elasticsearch 密码 (elastic) + labelEn: Elasticsearch password (elastic) + required: true + type: password + - default: "" + edit: true + envKey: KIBANA_PASSWORD + labelZh: Kibana 密码 (kibana_system) + labelEn: Kibana password (kibana_system) + required: false + type: password + - default: "elasticsearch" + edit: true + envKey: ES_SETTING_CLUSTER_NAME + labelZh: 集群名称 + labelEn: Cluster name + required: true + type: text + - default: "es-node" + edit: true + envKey: ES_SETTING_NODE_NAME + labelZh: 节点名称 + labelEn: Node name + required: true + type: text + - default: "-Xms1g -Xmx1g" + edit: true + envKey: ES_JAVA_OPTS + labelZh: Java 启动参数 (可选) + labelEn: Java startup parameters (optional) + required: false + type: text diff --git a/appstore/elastic-elasticsearch/9.0.1/docker-compose.yml b/appstore/elastic-elasticsearch/9.0.1/docker-compose.yml new file mode 100644 index 000000000..317c00fe1 --- /dev/null +++ b/appstore/elastic-elasticsearch/9.0.1/docker-compose.yml @@ -0,0 +1,34 @@ +networks: + 1panel-network: + external: true +services: + elasticsearch: + container_name: elastic-elasticsearch + env_file: + - ./envs/global.env + - .env + environment: + - LICENSE=basic + - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true + - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup + image: elasticsearch:9.0.1 + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTPS}:9200 + - ${PANEL_APP_PORT_CLUSTER}:9300 + restart: always + tty: true + ulimits: + memlock: + hard: -1 + soft: -1 + nofile: + hard: 65536 + soft: 65536 + volumes: + - ${ELASTICSEARCH_ROOT_PATH}/data:/usr/share/elasticsearch/data + - ${ELASTICSEARCH_ROOT_PATH}/backup:/usr/share/elasticsearch/backup + - ${ELASTICSEARCH_ROOT_PATH}/plugins:/usr/share/elasticsearch/plugins diff --git a/appstore/elastic-kibana/8.18.1/envs/default.env b/appstore/elastic-elasticsearch/9.0.1/envs/default.env similarity index 100% rename from appstore/elastic-kibana/8.18.1/envs/default.env rename to appstore/elastic-elasticsearch/9.0.1/envs/default.env diff --git a/appstore/elastic-kibana/8.18.1/envs/global.env b/appstore/elastic-elasticsearch/9.0.1/envs/global.env similarity index 100% rename from appstore/elastic-kibana/8.18.1/envs/global.env rename to appstore/elastic-elasticsearch/9.0.1/envs/global.env diff --git a/appstore/elastic-elasticsearch/9.0.1/scripts/init.sh b/appstore/elastic-elasticsearch/9.0.1/scripts/init.sh new file mode 100644 index 000000000..33a7b7f49 --- /dev/null +++ b/appstore/elastic-elasticsearch/9.0.1/scripts/init.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + mkdir -p $ELASTICSEARCH_ROOT_PATH + mkdir -p "$ELASTICSEARCH_ROOT_PATH/data" + mkdir -p "$ELASTICSEARCH_ROOT_PATH/backup" + mkdir -p "$ELASTICSEARCH_ROOT_PATH/plugins" + + chown -R 1000:1000 $ELASTICSEARCH_ROOT_PATH + + echo "Check Finish." +else + echo "Error: .env file not found." +fi diff --git a/appstore/elastic-kibana/8.18.1/scripts/uninstall.sh b/appstore/elastic-elasticsearch/9.0.1/scripts/uninstall.sh similarity index 100% rename from appstore/elastic-kibana/8.18.1/scripts/uninstall.sh rename to appstore/elastic-elasticsearch/9.0.1/scripts/uninstall.sh diff --git a/appstore/elastic-kibana/8.18.1/scripts/upgrade.sh b/appstore/elastic-elasticsearch/9.0.1/scripts/upgrade.sh similarity index 100% rename from appstore/elastic-kibana/8.18.1/scripts/upgrade.sh rename to appstore/elastic-elasticsearch/9.0.1/scripts/upgrade.sh diff --git a/appstore/elastic-kibana/8.18.1/.env b/appstore/elastic-kibana/9.0.1/.env similarity index 100% rename from appstore/elastic-kibana/8.18.1/.env rename to appstore/elastic-kibana/9.0.1/.env diff --git a/appstore/elastic-kibana/8.18.1/data.yml b/appstore/elastic-kibana/9.0.1/data.yml similarity index 100% rename from appstore/elastic-kibana/8.18.1/data.yml rename to appstore/elastic-kibana/9.0.1/data.yml diff --git a/appstore/elastic-kibana/8.18.1/docker-compose.yml b/appstore/elastic-kibana/9.0.1/docker-compose.yml similarity index 95% rename from appstore/elastic-kibana/8.18.1/docker-compose.yml rename to appstore/elastic-kibana/9.0.1/docker-compose.yml index 17e7f975b..e2d2e4c3a 100644 --- a/appstore/elastic-kibana/8.18.1/docker-compose.yml +++ b/appstore/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.1 + image: kibana:9.0.1 labels: createdBy: Apps networks: diff --git a/appstore/elastic-kibana/9.0.1/envs/default.env b/appstore/elastic-kibana/9.0.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/appstore/elastic-kibana/9.0.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/appstore/elastic-kibana/9.0.1/envs/global.env b/appstore/elastic-kibana/9.0.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/appstore/elastic-kibana/9.0.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/appstore/elastic-kibana/8.18.1/scripts/init.sh b/appstore/elastic-kibana/9.0.1/scripts/init.sh similarity index 100% rename from appstore/elastic-kibana/8.18.1/scripts/init.sh rename to appstore/elastic-kibana/9.0.1/scripts/init.sh diff --git a/appstore/elastic-kibana/9.0.1/scripts/uninstall.sh b/appstore/elastic-kibana/9.0.1/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/appstore/elastic-kibana/9.0.1/scripts/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/elastic-kibana/9.0.1/scripts/upgrade.sh b/appstore/elastic-kibana/9.0.1/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/elastic-kibana/9.0.1/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index 136b73c6f..76e5a7815 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/docker-compose.yml @@ -11,7 +11,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v1.2.50 + image: wushuo894/ani-rss:v1.2.52 labels: createdBy: Apps networks: diff --git a/dockge/elastic-elasticsearch_9_0_1/.env b/dockge/elastic-elasticsearch_9_0_1/.env new file mode 100644 index 000000000..f7e98d7e7 --- /dev/null +++ b/dockge/elastic-elasticsearch_9_0_1/.env @@ -0,0 +1,24 @@ +# 数据持久化路径 [必填] +ELASTICSEARCH_ROOT_PATH=/home/elasticsearch + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTPS=9200 + +# 集群端口 [必填] +PANEL_APP_PORT_CLUSTER=9300 + +# Elasticsearch 密码 (elastic) [必填] +ELASTIC_PASSWORD= + +# Kibana 密码 (kibana_system) +KIBANA_PASSWORD= + +# 集群名称 [必填] +ES_SETTING_CLUSTER_NAME=elasticsearch + +# 节点名称 [必填] +ES_SETTING_NODE_NAME=es-node + +# Java 启动参数 (可选) +ES_JAVA_OPTS=-Xms1g -Xmx1g + diff --git a/dockge/elastic-elasticsearch_9_0_1/docker-compose.yml b/dockge/elastic-elasticsearch_9_0_1/docker-compose.yml new file mode 100644 index 000000000..317c00fe1 --- /dev/null +++ b/dockge/elastic-elasticsearch_9_0_1/docker-compose.yml @@ -0,0 +1,34 @@ +networks: + 1panel-network: + external: true +services: + elasticsearch: + container_name: elastic-elasticsearch + env_file: + - ./envs/global.env + - .env + environment: + - LICENSE=basic + - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true + - ES_SETTING_PATH_REPO=/usr/share/elasticsearch/backup + image: elasticsearch:9.0.1 + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTPS}:9200 + - ${PANEL_APP_PORT_CLUSTER}:9300 + restart: always + tty: true + ulimits: + memlock: + hard: -1 + soft: -1 + nofile: + hard: 65536 + soft: 65536 + volumes: + - ${ELASTICSEARCH_ROOT_PATH}/data:/usr/share/elasticsearch/data + - ${ELASTICSEARCH_ROOT_PATH}/backup:/usr/share/elasticsearch/backup + - ${ELASTICSEARCH_ROOT_PATH}/plugins:/usr/share/elasticsearch/plugins diff --git a/dockge/elastic-elasticsearch_9_0_1/envs/default.env b/dockge/elastic-elasticsearch_9_0_1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/elastic-elasticsearch_9_0_1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/elastic-elasticsearch_9_0_1/envs/global.env b/dockge/elastic-elasticsearch_9_0_1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/elastic-elasticsearch_9_0_1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/elastic-kibana/docker-compose.yml b/dockge/elastic-kibana/docker-compose.yml index 17e7f975b..e2d2e4c3a 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:8.18.1 + image: kibana:9.0.1 labels: createdBy: Apps networks: