diff --git a/apps/ammds/1.6.2/.env b/apps/ammds/1.6.3/.env similarity index 100% rename from apps/ammds/1.6.2/.env rename to apps/ammds/1.6.3/.env diff --git a/apps/ammds/1.6.2/data.yml b/apps/ammds/1.6.3/data.yml similarity index 100% rename from apps/ammds/1.6.2/data.yml rename to apps/ammds/1.6.3/data.yml diff --git a/apps/ammds/1.6.2/docker-compose.yml b/apps/ammds/1.6.3/docker-compose.yml similarity index 96% rename from apps/ammds/1.6.2/docker-compose.yml rename to apps/ammds/1.6.3/docker-compose.yml index 1ad4813..4764936 100644 --- a/apps/ammds/1.6.2/docker-compose.yml +++ b/apps/ammds/1.6.3/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - NGINX_PORT=${PANEL_APP_PORT_HTTP:-8080} - AMMDS_SERVER_PORT=${PANEL_APP_PORT_API:-9523} - image: qyg2297248353/ammds:v1.6.2 + image: qyg2297248353/ammds:v1.6.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE:-host} diff --git a/apps/ammds/1.6.2/envs/default.env b/apps/ammds/1.6.3/envs/default.env similarity index 100% rename from apps/ammds/1.6.2/envs/default.env rename to apps/ammds/1.6.3/envs/default.env diff --git a/apps/ammds/1.6.2/envs/global.env b/apps/ammds/1.6.3/envs/global.env similarity index 100% rename from apps/ammds/1.6.2/envs/global.env rename to apps/ammds/1.6.3/envs/global.env diff --git a/apps/ammds/1.6.2/scripts/init.sh b/apps/ammds/1.6.3/scripts/init.sh similarity index 100% rename from apps/ammds/1.6.2/scripts/init.sh rename to apps/ammds/1.6.3/scripts/init.sh diff --git a/apps/ammds/1.6.2/scripts/uninstall.sh b/apps/ammds/1.6.3/scripts/uninstall.sh similarity index 100% rename from apps/ammds/1.6.2/scripts/uninstall.sh rename to apps/ammds/1.6.3/scripts/uninstall.sh diff --git a/apps/ammds/1.6.2/scripts/upgrade.sh b/apps/ammds/1.6.3/scripts/upgrade.sh similarity index 100% rename from apps/ammds/1.6.2/scripts/upgrade.sh rename to apps/ammds/1.6.3/scripts/upgrade.sh diff --git a/apps/ani-rss/1.2.67/.env b/apps/ani-rss/1.2.70/.env similarity index 100% rename from apps/ani-rss/1.2.67/.env rename to apps/ani-rss/1.2.70/.env diff --git a/apps/ani-rss/1.2.67/data.yml b/apps/ani-rss/1.2.70/data.yml similarity index 100% rename from apps/ani-rss/1.2.67/data.yml rename to apps/ani-rss/1.2.70/data.yml diff --git a/apps/ani-rss/1.2.67/docker-compose.yml b/apps/ani-rss/1.2.70/docker-compose.yml similarity index 95% rename from apps/ani-rss/1.2.67/docker-compose.yml rename to apps/ani-rss/1.2.70/docker-compose.yml index f9d7dba..f700582 100644 --- a/apps/ani-rss/1.2.67/docker-compose.yml +++ b/apps/ani-rss/1.2.70/docker-compose.yml @@ -11,7 +11,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v1.2.67 + image: wushuo894/ani-rss:v1.2.70 labels: createdBy: Apps networks: diff --git a/apps/ani-rss/1.2.67/envs/default.env b/apps/ani-rss/1.2.70/envs/default.env similarity index 100% rename from apps/ani-rss/1.2.67/envs/default.env rename to apps/ani-rss/1.2.70/envs/default.env diff --git a/apps/ani-rss/1.2.67/envs/global.env b/apps/ani-rss/1.2.70/envs/global.env similarity index 100% rename from apps/ani-rss/1.2.67/envs/global.env rename to apps/ani-rss/1.2.70/envs/global.env diff --git a/apps/ani-rss/1.2.67/scripts/init.sh b/apps/ani-rss/1.2.70/scripts/init.sh similarity index 100% rename from apps/ani-rss/1.2.67/scripts/init.sh rename to apps/ani-rss/1.2.70/scripts/init.sh diff --git a/apps/ani-rss/1.2.67/scripts/uninstall.sh b/apps/ani-rss/1.2.70/scripts/uninstall.sh similarity index 100% rename from apps/ani-rss/1.2.67/scripts/uninstall.sh rename to apps/ani-rss/1.2.70/scripts/uninstall.sh diff --git a/apps/ani-rss/1.2.67/scripts/upgrade.sh b/apps/ani-rss/1.2.70/scripts/upgrade.sh similarity index 100% rename from apps/ani-rss/1.2.67/scripts/upgrade.sh rename to apps/ani-rss/1.2.70/scripts/upgrade.sh diff --git a/apps/elastic-kibana/8.18.1/.env b/apps/elastic-kibana/8.18.1/.env new file mode 100644 index 0000000..7436b5d --- /dev/null +++ b/apps/elastic-kibana/8.18.1/.env @@ -0,0 +1,9 @@ +# 数据持久化路径 [必填] +KIBANA_ROOT_PATH=/home/kibana + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=5601 + +# Elasticsearch 地址 [必填] +elasticsearch_hosts=https://127.0.0.1:9200 + diff --git a/apps/elastic-kibana/8.18.1/data.yml b/apps/elastic-kibana/8.18.1/data.yml new file mode 100644 index 0000000..4a6a5dd --- /dev/null +++ b/apps/elastic-kibana/8.18.1/data.yml @@ -0,0 +1,24 @@ +additionalProperties: + formFields: + - default: "/home/kibana" + edit: true + envKey: KIBANA_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 5601 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: "https://127.0.0.1:9200" + edit: true + envKey: elasticsearch_hosts + labelZh: Elasticsearch 地址 + labelEn: Elasticsearch address + required: true + type: text diff --git a/apps/elastic-kibana/8.18.1/docker-compose.yml b/apps/elastic-kibana/8.18.1/docker-compose.yml new file mode 100644 index 0000000..17e7f97 --- /dev/null +++ b/apps/elastic-kibana/8.18.1/docker-compose.yml @@ -0,0 +1,26 @@ +networks: + 1panel-network: + external: true +services: + kibana: + container_name: elastic-kibana + env_file: + - ./envs/global.env + - .env + environment: + - SERVER_NAME="kibana" + - SERVER_HOST="0.0.0.0" + - SERVER_PORT=5601 + - I18N_LOCALE="zh-CN" + - SERVER_SHUTDOWNTIMEOUT="5s" + - MONITORING_UI_CONTAINER_ELASTICSEARCH_ENABLED=true + image: kibana:8.18.1 + labels: + createdBy: Apps + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:5601 + restart: always + volumes: + - ${KIBANA_ROOT_PATH}/data:/usr/share/kibana/data diff --git a/apps/ghost/5.120.0/envs/default.env b/apps/elastic-kibana/8.18.1/envs/default.env similarity index 100% rename from apps/ghost/5.120.0/envs/default.env rename to apps/elastic-kibana/8.18.1/envs/default.env diff --git a/apps/ghost/5.120.0/envs/global.env b/apps/elastic-kibana/8.18.1/envs/global.env similarity index 100% rename from apps/ghost/5.120.0/envs/global.env rename to apps/elastic-kibana/8.18.1/envs/global.env diff --git a/apps/elastic-kibana/8.18.1/scripts/init.sh b/apps/elastic-kibana/8.18.1/scripts/init.sh new file mode 100644 index 0000000..f68fbe6 --- /dev/null +++ b/apps/elastic-kibana/8.18.1/scripts/init.sh @@ -0,0 +1,22 @@ +#!/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 $KIBANA_ROOT_PATH + mkdir -p "$KIBANA_ROOT_PATH/data" + + chown -R 1000:1000 $KIBANA_ROOT_PATH + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/ghost/5.120.0/scripts/uninstall.sh b/apps/elastic-kibana/8.18.1/scripts/uninstall.sh similarity index 100% rename from apps/ghost/5.120.0/scripts/uninstall.sh rename to apps/elastic-kibana/8.18.1/scripts/uninstall.sh diff --git a/apps/ghost/5.120.0/scripts/upgrade.sh b/apps/elastic-kibana/8.18.1/scripts/upgrade.sh similarity index 100% rename from apps/ghost/5.120.0/scripts/upgrade.sh rename to apps/elastic-kibana/8.18.1/scripts/upgrade.sh diff --git a/apps/ghost/5.120.0/.env b/apps/ghost/5.120.1/.env similarity index 100% rename from apps/ghost/5.120.0/.env rename to apps/ghost/5.120.1/.env diff --git a/apps/ghost/5.120.0/data.yml b/apps/ghost/5.120.1/data.yml similarity index 100% rename from apps/ghost/5.120.0/data.yml rename to apps/ghost/5.120.1/data.yml diff --git a/apps/ghost/5.120.0/docker-compose.yml b/apps/ghost/5.120.1/docker-compose.yml similarity index 95% rename from apps/ghost/5.120.0/docker-compose.yml rename to apps/ghost/5.120.1/docker-compose.yml index 741dceb..6155d5c 100644 --- a/apps/ghost/5.120.0/docker-compose.yml +++ b/apps/ghost/5.120.1/docker-compose.yml @@ -14,7 +14,7 @@ services: - database__client=mysql - mail__options__service=Email - mail__options__secure=true - image: ghost:5.120.0 + image: ghost:5.120.1 labels: createdBy: Apps networks: diff --git a/apps/nacos-derby/3.0.0/envs/default.env b/apps/ghost/5.120.1/envs/default.env similarity index 100% rename from apps/nacos-derby/3.0.0/envs/default.env rename to apps/ghost/5.120.1/envs/default.env diff --git a/apps/nacos-derby/3.0.0/envs/global.env b/apps/ghost/5.120.1/envs/global.env similarity index 100% rename from apps/nacos-derby/3.0.0/envs/global.env rename to apps/ghost/5.120.1/envs/global.env diff --git a/apps/ghost/5.120.0/scripts/init.sh b/apps/ghost/5.120.1/scripts/init.sh similarity index 100% rename from apps/ghost/5.120.0/scripts/init.sh rename to apps/ghost/5.120.1/scripts/init.sh diff --git a/apps/nacos-derby/3.0.0/scripts/uninstall.sh b/apps/ghost/5.120.1/scripts/uninstall.sh similarity index 100% rename from apps/nacos-derby/3.0.0/scripts/uninstall.sh rename to apps/ghost/5.120.1/scripts/uninstall.sh diff --git a/apps/nacos-derby/3.0.0/scripts/upgrade.sh b/apps/ghost/5.120.1/scripts/upgrade.sh similarity index 100% rename from apps/nacos-derby/3.0.0/scripts/upgrade.sh rename to apps/ghost/5.120.1/scripts/upgrade.sh diff --git a/apps/nacos-derby/3.0.0/.env b/apps/nacos-derby/3.0.1/.env similarity index 100% rename from apps/nacos-derby/3.0.0/.env rename to apps/nacos-derby/3.0.1/.env diff --git a/apps/nacos-derby/3.0.0/data.yml b/apps/nacos-derby/3.0.1/data.yml similarity index 100% rename from apps/nacos-derby/3.0.0/data.yml rename to apps/nacos-derby/3.0.1/data.yml diff --git a/apps/nacos-derby/3.0.0/docker-compose.yml b/apps/nacos-derby/3.0.1/docker-compose.yml similarity index 94% rename from apps/nacos-derby/3.0.0/docker-compose.yml rename to apps/nacos-derby/3.0.1/docker-compose.yml index b177f20..36baffd 100644 --- a/apps/nacos-derby/3.0.0/docker-compose.yml +++ b/apps/nacos-derby/3.0.1/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_CONSOLE_PORT=${PANEL_APP_PORT_HTTP:-8080} - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - image: nacos/nacos-server:v3.0.0 + image: nacos/nacos-server:v3.0.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/apps/nacos/3.0.0/envs/default.env b/apps/nacos-derby/3.0.1/envs/default.env similarity index 100% rename from apps/nacos/3.0.0/envs/default.env rename to apps/nacos-derby/3.0.1/envs/default.env diff --git a/apps/nacos/3.0.0/envs/global.env b/apps/nacos-derby/3.0.1/envs/global.env similarity index 100% rename from apps/nacos/3.0.0/envs/global.env rename to apps/nacos-derby/3.0.1/envs/global.env diff --git a/apps/nacos-derby/3.0.0/init/mysql-schema.sql b/apps/nacos-derby/3.0.1/init/mysql-schema.sql similarity index 100% rename from apps/nacos-derby/3.0.0/init/mysql-schema.sql rename to apps/nacos-derby/3.0.1/init/mysql-schema.sql diff --git a/apps/nacos-derby/3.0.0/scripts/init.sh b/apps/nacos-derby/3.0.1/scripts/init.sh similarity index 100% rename from apps/nacos-derby/3.0.0/scripts/init.sh rename to apps/nacos-derby/3.0.1/scripts/init.sh diff --git a/apps/nacos/3.0.0/scripts/uninstall.sh b/apps/nacos-derby/3.0.1/scripts/uninstall.sh similarity index 100% rename from apps/nacos/3.0.0/scripts/uninstall.sh rename to apps/nacos-derby/3.0.1/scripts/uninstall.sh diff --git a/apps/nacos/3.0.0/scripts/upgrade.sh b/apps/nacos-derby/3.0.1/scripts/upgrade.sh similarity index 100% rename from apps/nacos/3.0.0/scripts/upgrade.sh rename to apps/nacos-derby/3.0.1/scripts/upgrade.sh diff --git a/apps/nacos/3.0.0/.env b/apps/nacos/3.0.1/.env similarity index 100% rename from apps/nacos/3.0.0/.env rename to apps/nacos/3.0.1/.env diff --git a/apps/nacos/3.0.0/data.yml b/apps/nacos/3.0.1/data.yml similarity index 100% rename from apps/nacos/3.0.0/data.yml rename to apps/nacos/3.0.1/data.yml diff --git a/apps/nacos/3.0.0/docker-compose.yml b/apps/nacos/3.0.1/docker-compose.yml similarity index 95% rename from apps/nacos/3.0.0/docker-compose.yml rename to apps/nacos/3.0.1/docker-compose.yml index 699e416..c256c4c 100644 --- a/apps/nacos/3.0.0/docker-compose.yml +++ b/apps/nacos/3.0.1/docker-compose.yml @@ -13,7 +13,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v3.0.0 + image: nacos/nacos-server:v3.0.1 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/apps/nacos/3.0.1/envs/default.env b/apps/nacos/3.0.1/envs/default.env new file mode 100644 index 0000000..cd05f46 --- /dev/null +++ b/apps/nacos/3.0.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/nacos/3.0.1/envs/global.env b/apps/nacos/3.0.1/envs/global.env new file mode 100644 index 0000000..e10989f --- /dev/null +++ b/apps/nacos/3.0.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/nacos/3.0.0/init/mysql-schema.sql b/apps/nacos/3.0.1/init/mysql-schema.sql similarity index 100% rename from apps/nacos/3.0.0/init/mysql-schema.sql rename to apps/nacos/3.0.1/init/mysql-schema.sql diff --git a/apps/nacos/3.0.0/scripts/init.sh b/apps/nacos/3.0.1/scripts/init.sh similarity index 100% rename from apps/nacos/3.0.0/scripts/init.sh rename to apps/nacos/3.0.1/scripts/init.sh diff --git a/apps/nacos/3.0.1/scripts/uninstall.sh b/apps/nacos/3.0.1/scripts/uninstall.sh new file mode 100644 index 0000000..c86c4fb --- /dev/null +++ b/apps/nacos/3.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/apps/nacos/3.0.1/scripts/upgrade.sh b/apps/nacos/3.0.1/scripts/upgrade.sh new file mode 100644 index 0000000..07fb8c3 --- /dev/null +++ b/apps/nacos/3.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