From 157627c6a4560e4e22a0f0879fde54754d46a4f4 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Fri, 23 May 2025 03:42:08 +0000 Subject: [PATCH] Processed apps directory via GitHub Actions --- appstore/ammds/{1.6.2 => 1.6.3}/.env | 0 appstore/ammds/{1.6.2 => 1.6.3}/data.yml | 0 .../ammds/{1.6.2 => 1.6.3}/docker-compose.yml | 2 +- .../ammds/{1.6.2 => 1.6.3}/envs/default.env | 0 .../ammds/{1.6.2 => 1.6.3}/envs/global.env | 0 .../ammds/{1.6.2 => 1.6.3}/scripts/init.sh | 0 .../{1.6.2 => 1.6.3}/scripts/uninstall.sh | 0 .../ammds/{1.6.2 => 1.6.3}/scripts/upgrade.sh | 0 appstore/ani-rss/{1.2.67 => 1.2.70}/.env | 0 appstore/ani-rss/{1.2.67 => 1.2.70}/data.yml | 0 .../{1.2.67 => 1.2.70}/docker-compose.yml | 2 +- .../{1.2.67 => 1.2.70}/envs/default.env | 0 .../{1.2.67 => 1.2.70}/envs/global.env | 0 .../{1.2.67 => 1.2.70}/scripts/init.sh | 0 .../{1.2.67 => 1.2.70}/scripts/uninstall.sh | 0 .../{1.2.67 => 1.2.70}/scripts/upgrade.sh | 0 appstore/elastic-kibana/8.18.1/.env | 9 +++++++ appstore/elastic-kibana/8.18.1/data.yml | 24 +++++++++++++++++ .../elastic-kibana/8.18.1/docker-compose.yml | 26 +++++++++++++++++++ .../8.18.1}/envs/default.env | 0 .../8.18.1}/envs/global.env | 0 .../elastic-kibana/8.18.1/scripts/init.sh | 22 ++++++++++++++++ .../8.18.1}/scripts/uninstall.sh | 0 .../8.18.1}/scripts/upgrade.sh | 0 appstore/ghost/{5.120.0 => 5.120.1}/.env | 0 appstore/ghost/{5.120.0 => 5.120.1}/data.yml | 0 .../{5.120.0 => 5.120.1}/docker-compose.yml | 2 +- .../3.0.0 => ghost/5.120.1}/envs/default.env | 0 .../3.0.0 => ghost/5.120.1}/envs/global.env | 0 .../{5.120.0 => 5.120.1}/scripts/init.sh | 0 .../5.120.1}/scripts/uninstall.sh | 0 .../5.120.1}/scripts/upgrade.sh | 0 appstore/nacos-derby/{3.0.0 => 3.0.1}/.env | 0 .../nacos-derby/{3.0.0 => 3.0.1}/data.yml | 0 .../{3.0.0 => 3.0.1}/docker-compose.yml | 2 +- .../3.0.1}/envs/default.env | 0 .../3.0.1}/envs/global.env | 0 .../{3.0.0 => 3.0.1}/init/mysql-schema.sql | 0 .../{3.0.0 => 3.0.1}/scripts/init.sh | 0 .../3.0.1}/scripts/uninstall.sh | 0 .../3.0.1}/scripts/upgrade.sh | 0 appstore/nacos/{3.0.0 => 3.0.1}/.env | 0 appstore/nacos/{3.0.0 => 3.0.1}/data.yml | 0 .../nacos/{3.0.0 => 3.0.1}/docker-compose.yml | 2 +- .../nacos/3.0.1}/envs/default.env | 0 .../nacos/3.0.1}/envs/global.env | 0 .../{3.0.0 => 3.0.1}/init/mysql-schema.sql | 0 .../nacos/{3.0.0 => 3.0.1}/scripts/init.sh | 0 appstore/nacos/3.0.1/scripts/uninstall.sh | 10 +++++++ appstore/nacos/3.0.1/scripts/upgrade.sh | 17 ++++++++++++ dockge/ammds/docker-compose.yml | 2 +- dockge/ani-rss/docker-compose.yml | 2 +- dockge/elastic-kibana_8_18_1/.env | 9 +++++++ .../elastic-kibana_8_18_1/docker-compose.yml | 26 +++++++++++++++++++ dockge/elastic-kibana_8_18_1/envs/default.env | 2 ++ dockge/elastic-kibana_8_18_1/envs/global.env | 2 ++ dockge/ghost/docker-compose.yml | 2 +- dockge/nacos-derby/docker-compose.yml | 2 +- dockge/{nacos_3_0_0 => nacos_3_0_1}/.env | 0 .../docker-compose.yml | 2 +- dockge/nacos_3_0_1/envs/default.env | 2 ++ dockge/nacos_3_0_1/envs/global.env | 2 ++ .../init/mysql-schema.sql | 0 63 files changed, 161 insertions(+), 10 deletions(-) rename appstore/ammds/{1.6.2 => 1.6.3}/.env (100%) rename appstore/ammds/{1.6.2 => 1.6.3}/data.yml (100%) rename appstore/ammds/{1.6.2 => 1.6.3}/docker-compose.yml (96%) rename appstore/ammds/{1.6.2 => 1.6.3}/envs/default.env (100%) rename appstore/ammds/{1.6.2 => 1.6.3}/envs/global.env (100%) rename appstore/ammds/{1.6.2 => 1.6.3}/scripts/init.sh (100%) rename appstore/ammds/{1.6.2 => 1.6.3}/scripts/uninstall.sh (100%) rename appstore/ammds/{1.6.2 => 1.6.3}/scripts/upgrade.sh (100%) rename appstore/ani-rss/{1.2.67 => 1.2.70}/.env (100%) rename appstore/ani-rss/{1.2.67 => 1.2.70}/data.yml (100%) rename appstore/ani-rss/{1.2.67 => 1.2.70}/docker-compose.yml (95%) rename appstore/ani-rss/{1.2.67 => 1.2.70}/envs/default.env (100%) rename appstore/ani-rss/{1.2.67 => 1.2.70}/envs/global.env (100%) rename appstore/ani-rss/{1.2.67 => 1.2.70}/scripts/init.sh (100%) rename appstore/ani-rss/{1.2.67 => 1.2.70}/scripts/uninstall.sh (100%) rename appstore/ani-rss/{1.2.67 => 1.2.70}/scripts/upgrade.sh (100%) create mode 100644 appstore/elastic-kibana/8.18.1/.env create mode 100644 appstore/elastic-kibana/8.18.1/data.yml create mode 100644 appstore/elastic-kibana/8.18.1/docker-compose.yml rename appstore/{ghost/5.120.0 => elastic-kibana/8.18.1}/envs/default.env (100%) rename appstore/{ghost/5.120.0 => elastic-kibana/8.18.1}/envs/global.env (100%) create mode 100644 appstore/elastic-kibana/8.18.1/scripts/init.sh rename appstore/{ghost/5.120.0 => elastic-kibana/8.18.1}/scripts/uninstall.sh (100%) rename appstore/{ghost/5.120.0 => elastic-kibana/8.18.1}/scripts/upgrade.sh (100%) rename appstore/ghost/{5.120.0 => 5.120.1}/.env (100%) rename appstore/ghost/{5.120.0 => 5.120.1}/data.yml (100%) rename appstore/ghost/{5.120.0 => 5.120.1}/docker-compose.yml (95%) rename appstore/{nacos-derby/3.0.0 => ghost/5.120.1}/envs/default.env (100%) rename appstore/{nacos-derby/3.0.0 => ghost/5.120.1}/envs/global.env (100%) rename appstore/ghost/{5.120.0 => 5.120.1}/scripts/init.sh (100%) rename appstore/{nacos-derby/3.0.0 => ghost/5.120.1}/scripts/uninstall.sh (100%) rename appstore/{nacos-derby/3.0.0 => ghost/5.120.1}/scripts/upgrade.sh (100%) rename appstore/nacos-derby/{3.0.0 => 3.0.1}/.env (100%) rename appstore/nacos-derby/{3.0.0 => 3.0.1}/data.yml (100%) rename appstore/nacos-derby/{3.0.0 => 3.0.1}/docker-compose.yml (94%) rename appstore/{nacos/3.0.0 => nacos-derby/3.0.1}/envs/default.env (100%) rename appstore/{nacos/3.0.0 => nacos-derby/3.0.1}/envs/global.env (100%) rename appstore/nacos-derby/{3.0.0 => 3.0.1}/init/mysql-schema.sql (100%) rename appstore/nacos-derby/{3.0.0 => 3.0.1}/scripts/init.sh (100%) rename appstore/{nacos/3.0.0 => nacos-derby/3.0.1}/scripts/uninstall.sh (100%) rename appstore/{nacos/3.0.0 => nacos-derby/3.0.1}/scripts/upgrade.sh (100%) rename appstore/nacos/{3.0.0 => 3.0.1}/.env (100%) rename appstore/nacos/{3.0.0 => 3.0.1}/data.yml (100%) rename appstore/nacos/{3.0.0 => 3.0.1}/docker-compose.yml (95%) rename {dockge/nacos_3_0_0 => appstore/nacos/3.0.1}/envs/default.env (100%) rename {dockge/nacos_3_0_0 => appstore/nacos/3.0.1}/envs/global.env (100%) rename appstore/nacos/{3.0.0 => 3.0.1}/init/mysql-schema.sql (100%) rename appstore/nacos/{3.0.0 => 3.0.1}/scripts/init.sh (100%) create mode 100644 appstore/nacos/3.0.1/scripts/uninstall.sh create mode 100644 appstore/nacos/3.0.1/scripts/upgrade.sh create mode 100644 dockge/elastic-kibana_8_18_1/.env create mode 100644 dockge/elastic-kibana_8_18_1/docker-compose.yml create mode 100644 dockge/elastic-kibana_8_18_1/envs/default.env create mode 100644 dockge/elastic-kibana_8_18_1/envs/global.env rename dockge/{nacos_3_0_0 => nacos_3_0_1}/.env (100%) rename dockge/{nacos_3_0_0 => nacos_3_0_1}/docker-compose.yml (95%) create mode 100644 dockge/nacos_3_0_1/envs/default.env create mode 100644 dockge/nacos_3_0_1/envs/global.env rename dockge/{nacos_3_0_0 => nacos_3_0_1}/init/mysql-schema.sql (100%) diff --git a/appstore/ammds/1.6.2/.env b/appstore/ammds/1.6.3/.env similarity index 100% rename from appstore/ammds/1.6.2/.env rename to appstore/ammds/1.6.3/.env diff --git a/appstore/ammds/1.6.2/data.yml b/appstore/ammds/1.6.3/data.yml similarity index 100% rename from appstore/ammds/1.6.2/data.yml rename to appstore/ammds/1.6.3/data.yml diff --git a/appstore/ammds/1.6.2/docker-compose.yml b/appstore/ammds/1.6.3/docker-compose.yml similarity index 96% rename from appstore/ammds/1.6.2/docker-compose.yml rename to appstore/ammds/1.6.3/docker-compose.yml index 1ad4813e6..4764936bd 100644 --- a/appstore/ammds/1.6.2/docker-compose.yml +++ b/appstore/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/appstore/ammds/1.6.2/envs/default.env b/appstore/ammds/1.6.3/envs/default.env similarity index 100% rename from appstore/ammds/1.6.2/envs/default.env rename to appstore/ammds/1.6.3/envs/default.env diff --git a/appstore/ammds/1.6.2/envs/global.env b/appstore/ammds/1.6.3/envs/global.env similarity index 100% rename from appstore/ammds/1.6.2/envs/global.env rename to appstore/ammds/1.6.3/envs/global.env diff --git a/appstore/ammds/1.6.2/scripts/init.sh b/appstore/ammds/1.6.3/scripts/init.sh similarity index 100% rename from appstore/ammds/1.6.2/scripts/init.sh rename to appstore/ammds/1.6.3/scripts/init.sh diff --git a/appstore/ammds/1.6.2/scripts/uninstall.sh b/appstore/ammds/1.6.3/scripts/uninstall.sh similarity index 100% rename from appstore/ammds/1.6.2/scripts/uninstall.sh rename to appstore/ammds/1.6.3/scripts/uninstall.sh diff --git a/appstore/ammds/1.6.2/scripts/upgrade.sh b/appstore/ammds/1.6.3/scripts/upgrade.sh similarity index 100% rename from appstore/ammds/1.6.2/scripts/upgrade.sh rename to appstore/ammds/1.6.3/scripts/upgrade.sh diff --git a/appstore/ani-rss/1.2.67/.env b/appstore/ani-rss/1.2.70/.env similarity index 100% rename from appstore/ani-rss/1.2.67/.env rename to appstore/ani-rss/1.2.70/.env diff --git a/appstore/ani-rss/1.2.67/data.yml b/appstore/ani-rss/1.2.70/data.yml similarity index 100% rename from appstore/ani-rss/1.2.67/data.yml rename to appstore/ani-rss/1.2.70/data.yml diff --git a/appstore/ani-rss/1.2.67/docker-compose.yml b/appstore/ani-rss/1.2.70/docker-compose.yml similarity index 95% rename from appstore/ani-rss/1.2.67/docker-compose.yml rename to appstore/ani-rss/1.2.70/docker-compose.yml index f9d7dba94..f700582fa 100644 --- a/appstore/ani-rss/1.2.67/docker-compose.yml +++ b/appstore/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/appstore/ani-rss/1.2.67/envs/default.env b/appstore/ani-rss/1.2.70/envs/default.env similarity index 100% rename from appstore/ani-rss/1.2.67/envs/default.env rename to appstore/ani-rss/1.2.70/envs/default.env diff --git a/appstore/ani-rss/1.2.67/envs/global.env b/appstore/ani-rss/1.2.70/envs/global.env similarity index 100% rename from appstore/ani-rss/1.2.67/envs/global.env rename to appstore/ani-rss/1.2.70/envs/global.env diff --git a/appstore/ani-rss/1.2.67/scripts/init.sh b/appstore/ani-rss/1.2.70/scripts/init.sh similarity index 100% rename from appstore/ani-rss/1.2.67/scripts/init.sh rename to appstore/ani-rss/1.2.70/scripts/init.sh diff --git a/appstore/ani-rss/1.2.67/scripts/uninstall.sh b/appstore/ani-rss/1.2.70/scripts/uninstall.sh similarity index 100% rename from appstore/ani-rss/1.2.67/scripts/uninstall.sh rename to appstore/ani-rss/1.2.70/scripts/uninstall.sh diff --git a/appstore/ani-rss/1.2.67/scripts/upgrade.sh b/appstore/ani-rss/1.2.70/scripts/upgrade.sh similarity index 100% rename from appstore/ani-rss/1.2.67/scripts/upgrade.sh rename to appstore/ani-rss/1.2.70/scripts/upgrade.sh diff --git a/appstore/elastic-kibana/8.18.1/.env b/appstore/elastic-kibana/8.18.1/.env new file mode 100644 index 000000000..7436b5df1 --- /dev/null +++ b/appstore/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/appstore/elastic-kibana/8.18.1/data.yml b/appstore/elastic-kibana/8.18.1/data.yml new file mode 100644 index 000000000..4a6a5dd1f --- /dev/null +++ b/appstore/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/appstore/elastic-kibana/8.18.1/docker-compose.yml b/appstore/elastic-kibana/8.18.1/docker-compose.yml new file mode 100644 index 000000000..17e7f975b --- /dev/null +++ b/appstore/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/appstore/ghost/5.120.0/envs/default.env b/appstore/elastic-kibana/8.18.1/envs/default.env similarity index 100% rename from appstore/ghost/5.120.0/envs/default.env rename to appstore/elastic-kibana/8.18.1/envs/default.env diff --git a/appstore/ghost/5.120.0/envs/global.env b/appstore/elastic-kibana/8.18.1/envs/global.env similarity index 100% rename from appstore/ghost/5.120.0/envs/global.env rename to appstore/elastic-kibana/8.18.1/envs/global.env diff --git a/appstore/elastic-kibana/8.18.1/scripts/init.sh b/appstore/elastic-kibana/8.18.1/scripts/init.sh new file mode 100644 index 000000000..f68fbe6d5 --- /dev/null +++ b/appstore/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/appstore/ghost/5.120.0/scripts/uninstall.sh b/appstore/elastic-kibana/8.18.1/scripts/uninstall.sh similarity index 100% rename from appstore/ghost/5.120.0/scripts/uninstall.sh rename to appstore/elastic-kibana/8.18.1/scripts/uninstall.sh diff --git a/appstore/ghost/5.120.0/scripts/upgrade.sh b/appstore/elastic-kibana/8.18.1/scripts/upgrade.sh similarity index 100% rename from appstore/ghost/5.120.0/scripts/upgrade.sh rename to appstore/elastic-kibana/8.18.1/scripts/upgrade.sh diff --git a/appstore/ghost/5.120.0/.env b/appstore/ghost/5.120.1/.env similarity index 100% rename from appstore/ghost/5.120.0/.env rename to appstore/ghost/5.120.1/.env diff --git a/appstore/ghost/5.120.0/data.yml b/appstore/ghost/5.120.1/data.yml similarity index 100% rename from appstore/ghost/5.120.0/data.yml rename to appstore/ghost/5.120.1/data.yml diff --git a/appstore/ghost/5.120.0/docker-compose.yml b/appstore/ghost/5.120.1/docker-compose.yml similarity index 95% rename from appstore/ghost/5.120.0/docker-compose.yml rename to appstore/ghost/5.120.1/docker-compose.yml index 741dceb2e..6155d5ccb 100644 --- a/appstore/ghost/5.120.0/docker-compose.yml +++ b/appstore/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/appstore/nacos-derby/3.0.0/envs/default.env b/appstore/ghost/5.120.1/envs/default.env similarity index 100% rename from appstore/nacos-derby/3.0.0/envs/default.env rename to appstore/ghost/5.120.1/envs/default.env diff --git a/appstore/nacos-derby/3.0.0/envs/global.env b/appstore/ghost/5.120.1/envs/global.env similarity index 100% rename from appstore/nacos-derby/3.0.0/envs/global.env rename to appstore/ghost/5.120.1/envs/global.env diff --git a/appstore/ghost/5.120.0/scripts/init.sh b/appstore/ghost/5.120.1/scripts/init.sh similarity index 100% rename from appstore/ghost/5.120.0/scripts/init.sh rename to appstore/ghost/5.120.1/scripts/init.sh diff --git a/appstore/nacos-derby/3.0.0/scripts/uninstall.sh b/appstore/ghost/5.120.1/scripts/uninstall.sh similarity index 100% rename from appstore/nacos-derby/3.0.0/scripts/uninstall.sh rename to appstore/ghost/5.120.1/scripts/uninstall.sh diff --git a/appstore/nacos-derby/3.0.0/scripts/upgrade.sh b/appstore/ghost/5.120.1/scripts/upgrade.sh similarity index 100% rename from appstore/nacos-derby/3.0.0/scripts/upgrade.sh rename to appstore/ghost/5.120.1/scripts/upgrade.sh diff --git a/appstore/nacos-derby/3.0.0/.env b/appstore/nacos-derby/3.0.1/.env similarity index 100% rename from appstore/nacos-derby/3.0.0/.env rename to appstore/nacos-derby/3.0.1/.env diff --git a/appstore/nacos-derby/3.0.0/data.yml b/appstore/nacos-derby/3.0.1/data.yml similarity index 100% rename from appstore/nacos-derby/3.0.0/data.yml rename to appstore/nacos-derby/3.0.1/data.yml diff --git a/appstore/nacos-derby/3.0.0/docker-compose.yml b/appstore/nacos-derby/3.0.1/docker-compose.yml similarity index 94% rename from appstore/nacos-derby/3.0.0/docker-compose.yml rename to appstore/nacos-derby/3.0.1/docker-compose.yml index b177f205f..36baffdcf 100644 --- a/appstore/nacos-derby/3.0.0/docker-compose.yml +++ b/appstore/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/appstore/nacos/3.0.0/envs/default.env b/appstore/nacos-derby/3.0.1/envs/default.env similarity index 100% rename from appstore/nacos/3.0.0/envs/default.env rename to appstore/nacos-derby/3.0.1/envs/default.env diff --git a/appstore/nacos/3.0.0/envs/global.env b/appstore/nacos-derby/3.0.1/envs/global.env similarity index 100% rename from appstore/nacos/3.0.0/envs/global.env rename to appstore/nacos-derby/3.0.1/envs/global.env diff --git a/appstore/nacos-derby/3.0.0/init/mysql-schema.sql b/appstore/nacos-derby/3.0.1/init/mysql-schema.sql similarity index 100% rename from appstore/nacos-derby/3.0.0/init/mysql-schema.sql rename to appstore/nacos-derby/3.0.1/init/mysql-schema.sql diff --git a/appstore/nacos-derby/3.0.0/scripts/init.sh b/appstore/nacos-derby/3.0.1/scripts/init.sh similarity index 100% rename from appstore/nacos-derby/3.0.0/scripts/init.sh rename to appstore/nacos-derby/3.0.1/scripts/init.sh diff --git a/appstore/nacos/3.0.0/scripts/uninstall.sh b/appstore/nacos-derby/3.0.1/scripts/uninstall.sh similarity index 100% rename from appstore/nacos/3.0.0/scripts/uninstall.sh rename to appstore/nacos-derby/3.0.1/scripts/uninstall.sh diff --git a/appstore/nacos/3.0.0/scripts/upgrade.sh b/appstore/nacos-derby/3.0.1/scripts/upgrade.sh similarity index 100% rename from appstore/nacos/3.0.0/scripts/upgrade.sh rename to appstore/nacos-derby/3.0.1/scripts/upgrade.sh diff --git a/appstore/nacos/3.0.0/.env b/appstore/nacos/3.0.1/.env similarity index 100% rename from appstore/nacos/3.0.0/.env rename to appstore/nacos/3.0.1/.env diff --git a/appstore/nacos/3.0.0/data.yml b/appstore/nacos/3.0.1/data.yml similarity index 100% rename from appstore/nacos/3.0.0/data.yml rename to appstore/nacos/3.0.1/data.yml diff --git a/appstore/nacos/3.0.0/docker-compose.yml b/appstore/nacos/3.0.1/docker-compose.yml similarity index 95% rename from appstore/nacos/3.0.0/docker-compose.yml rename to appstore/nacos/3.0.1/docker-compose.yml index 699e4162b..c256c4cbb 100644 --- a/appstore/nacos/3.0.0/docker-compose.yml +++ b/appstore/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/dockge/nacos_3_0_0/envs/default.env b/appstore/nacos/3.0.1/envs/default.env similarity index 100% rename from dockge/nacos_3_0_0/envs/default.env rename to appstore/nacos/3.0.1/envs/default.env diff --git a/dockge/nacos_3_0_0/envs/global.env b/appstore/nacos/3.0.1/envs/global.env similarity index 100% rename from dockge/nacos_3_0_0/envs/global.env rename to appstore/nacos/3.0.1/envs/global.env diff --git a/appstore/nacos/3.0.0/init/mysql-schema.sql b/appstore/nacos/3.0.1/init/mysql-schema.sql similarity index 100% rename from appstore/nacos/3.0.0/init/mysql-schema.sql rename to appstore/nacos/3.0.1/init/mysql-schema.sql diff --git a/appstore/nacos/3.0.0/scripts/init.sh b/appstore/nacos/3.0.1/scripts/init.sh similarity index 100% rename from appstore/nacos/3.0.0/scripts/init.sh rename to appstore/nacos/3.0.1/scripts/init.sh diff --git a/appstore/nacos/3.0.1/scripts/uninstall.sh b/appstore/nacos/3.0.1/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/appstore/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/appstore/nacos/3.0.1/scripts/upgrade.sh b/appstore/nacos/3.0.1/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/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 diff --git a/dockge/ammds/docker-compose.yml b/dockge/ammds/docker-compose.yml index 1ad4813e6..4764936bd 100644 --- a/dockge/ammds/docker-compose.yml +++ b/dockge/ammds/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/dockge/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index f9d7dba94..f700582fa 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.67 + image: wushuo894/ani-rss:v1.2.70 labels: createdBy: Apps networks: diff --git a/dockge/elastic-kibana_8_18_1/.env b/dockge/elastic-kibana_8_18_1/.env new file mode 100644 index 000000000..7436b5df1 --- /dev/null +++ b/dockge/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/dockge/elastic-kibana_8_18_1/docker-compose.yml b/dockge/elastic-kibana_8_18_1/docker-compose.yml new file mode 100644 index 000000000..17e7f975b --- /dev/null +++ b/dockge/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/dockge/elastic-kibana_8_18_1/envs/default.env b/dockge/elastic-kibana_8_18_1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/elastic-kibana_8_18_1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/elastic-kibana_8_18_1/envs/global.env b/dockge/elastic-kibana_8_18_1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/elastic-kibana_8_18_1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/ghost/docker-compose.yml b/dockge/ghost/docker-compose.yml index 741dceb2e..6155d5ccb 100644 --- a/dockge/ghost/docker-compose.yml +++ b/dockge/ghost/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/dockge/nacos-derby/docker-compose.yml b/dockge/nacos-derby/docker-compose.yml index b177f205f..36baffdcf 100644 --- a/dockge/nacos-derby/docker-compose.yml +++ b/dockge/nacos-derby/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/dockge/nacos_3_0_0/.env b/dockge/nacos_3_0_1/.env similarity index 100% rename from dockge/nacos_3_0_0/.env rename to dockge/nacos_3_0_1/.env diff --git a/dockge/nacos_3_0_0/docker-compose.yml b/dockge/nacos_3_0_1/docker-compose.yml similarity index 95% rename from dockge/nacos_3_0_0/docker-compose.yml rename to dockge/nacos_3_0_1/docker-compose.yml index 699e4162b..c256c4cbb 100644 --- a/dockge/nacos_3_0_0/docker-compose.yml +++ b/dockge/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/dockge/nacos_3_0_1/envs/default.env b/dockge/nacos_3_0_1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/nacos_3_0_1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/nacos_3_0_1/envs/global.env b/dockge/nacos_3_0_1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/nacos_3_0_1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/nacos_3_0_0/init/mysql-schema.sql b/dockge/nacos_3_0_1/init/mysql-schema.sql similarity index 100% rename from dockge/nacos_3_0_0/init/mysql-schema.sql rename to dockge/nacos_3_0_1/init/mysql-schema.sql