diff --git a/apps/alist-aria2/3.36.0/scripts/init.sh b/apps/alist-aria2/3.36.0/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/alist-aria2/3.36.0/scripts/init.sh +++ b/apps/alist-aria2/3.36.0/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/alist-aria2/3.36.0/scripts/upgrade.sh b/apps/alist-aria2/3.36.0/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/alist-aria2/3.36.0/scripts/upgrade.sh +++ b/apps/alist-aria2/3.36.0/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/alist-ffmpeg/3.36.0/scripts/init.sh b/apps/alist-ffmpeg/3.36.0/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/alist-ffmpeg/3.36.0/scripts/init.sh +++ b/apps/alist-ffmpeg/3.36.0/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/alist-ffmpeg/3.36.0/scripts/upgrade.sh b/apps/alist-ffmpeg/3.36.0/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/alist-ffmpeg/3.36.0/scripts/upgrade.sh +++ b/apps/alist-ffmpeg/3.36.0/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/alist/3.36.0/scripts/init.sh b/apps/alist/3.36.0/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/alist/3.36.0/scripts/init.sh +++ b/apps/alist/3.36.0/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/alist/3.36.0/scripts/upgrade.sh b/apps/alist/3.36.0/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/alist/3.36.0/scripts/upgrade.sh +++ b/apps/alist/3.36.0/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/bark/2.1.5/scripts/init.sh b/apps/bark/2.1.5/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/bark/2.1.5/scripts/init.sh +++ b/apps/bark/2.1.5/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/bark/2.1.5/scripts/upgrade.sh b/apps/bark/2.1.5/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/bark/2.1.5/scripts/upgrade.sh +++ b/apps/bark/2.1.5/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/casdoor/1.649.0/scripts/init.sh b/apps/casdoor/1.649.0/scripts/init.sh index e19305975..dea3fb17b 100644 --- a/apps/casdoor/1.649.0/scripts/init.sh +++ b/apps/casdoor/1.649.0/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env if [ "$DB_TYPE" == "mysql" ]; then diff --git a/apps/casdoor/1.649.0/scripts/upgrade.sh b/apps/casdoor/1.649.0/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/casdoor/1.649.0/scripts/upgrade.sh +++ b/apps/casdoor/1.649.0/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/elastic/8.12.0-cluster/data.yml b/apps/elastic/8.12.0-cluster/data.yml deleted file mode 100644 index 9b7510e38..000000000 --- a/apps/elastic/8.12.0-cluster/data.yml +++ /dev/null @@ -1,94 +0,0 @@ -additionalProperties: - formFields: - - default: "docker-cluster" - edit: true - envKey: CLUSTER_NAME - labelEn: cluster name - labelZh: 集群名称 - required: true - type: text - - default: "elastic-net" - edit: true - envKey: CLUSTER_NETWORK - labelEn: cluster network - labelZh: 集群网络 - required: true - type: text - - default: "" - edit: true - envKey: ELASTIC_PASSWORD - labelEn: Password for the 'elastic' user, Numbers and letters - labelZh: elastic 用户的密码 数字与字母组合 - required: true - random: true - type: password - - default: "" - edit: true - envKey: KIBANA_PASSWORD - labelEn: Password for the 'kibana_system' user, Numbers and letters - labelZh: kibana_system 用户的密码 数字与字母组合 - required: true - random: true - type: password - - default: "/home/elastic/cluster" - edit: true - envKey: ES_ROOT_PATH - labelEn: data persistence root path - labelZh: 数据持久化根路径 - required: true - type: text - - default: 1073741824 - edit: true - envKey: MEM_LIMIT - labelEn: Increase or decrease based on the available host memory (in bytes) - labelZh: 根据可用主机内存增加或减少(以字节为单位) - required: true - type: number - - default: "9200" - edit: true - envKey: PANEL_APP_PORT_HTTPS - labelEn: Port to expose Elasticsearch HTTP API to the host - labelZh: 开放API的端口 - required: false - type: text - - default: 5601 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port to expose Kibana to the host - labelZh: Kibana面板端口 - required: true - rule: paramPort - type: number - - default: "9300" - edit: true - envKey: ES_COMMUNICATION_PORT - labelEn: Port to expose Elasticsearch communication to the host - labelZh: Elasticsearch通讯端口 9300 - required: false - type: text - - default: "512m" - edit: true - envKey: ES_JAVA_OPTS_XMS - labelEn: JVM memory allocation pool - labelZh: JVM内存分配池 初始化内存 - required: true - type: text - - default: "512m" - edit: true - envKey: ES_JAVA_OPTS_XMX - labelEn: JVM memory allocation pool - labelZh: JVM内存分配池 运行内存 - required: true - type: text - - default: "true" - edit: true - envKey: ES_XPACK_SECURITY_ENABLED - labelEn: Enable security verification (recommended) - labelZh: 证书安全验证(推荐开启) - required: true - type: select - values: - - label: "开启" - value: "true" - - label: "关闭" - value: "false" diff --git a/apps/elastic/8.12.0-cluster/docker-compose.yml b/apps/elastic/8.12.0-cluster/docker-compose.yml deleted file mode 100644 index 559c4ba4a..000000000 --- a/apps/elastic/8.12.0-cluster/docker-compose.yml +++ /dev/null @@ -1,289 +0,0 @@ -version: "3.8" - -networks: - ${DOCKER_NET}: - external: true - -services: - elastic-init: - container_name: elastic-init - image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0 - networks: - - ${CLUSTER_NETWORK} - volumes: - - ${ES_ROOT_PATH}/certs:/usr/share/elasticsearch/config/certs - user: "0" - command: > - bash -c ' - if [ x${ELASTIC_PASSWORD} == x ]; then - echo "Set the ELASTIC_PASSWORD environment variable in the .env file"; - exit 1; - elif [ x${KIBANA_PASSWORD} == x ]; then - echo "Set the KIBANA_PASSWORD environment variable in the .env file"; - exit 1; - fi; - if [ ! -f config/certs/ca.zip ]; then - echo "Creating CA"; - bin/elasticsearch-certutil ca --silent --pem -out config/certs/ca.zip; - unzip config/certs/ca.zip -d config/certs; - fi; - if [ ! -f config/certs/certs.zip ]; then - echo "Creating certs"; - echo -ne \ - "instances:\n"\ - " - name: es01\n"\ - " dns:\n"\ - " - es01\n"\ - " - localhost\n"\ - " ip:\n"\ - " - 127.0.0.1\n"\ - " - name: es02\n"\ - " dns:\n"\ - " - es02\n"\ - " - localhost\n"\ - " ip:\n"\ - " - 127.0.0.1\n"\ - " - name: es03\n"\ - " dns:\n"\ - " - es03\n"\ - " - localhost\n"\ - " ip:\n"\ - " - 127.0.0.1\n"\ - > config/certs/instances.yml; - bin/elasticsearch-certutil cert --silent --pem -out config/certs/certs.zip --in config/certs/instances.yml --ca-cert config/certs/ca/ca.crt --ca-key config/certs/ca/ca.key; - unzip config/certs/certs.zip -d config/certs; - fi; - echo "Setting file permissions" - chown -R root:root config/certs; - find . -type d -exec chmod 750 \{\} \;; - find . -type f -exec chmod 640 \{\} \;; - echo "Waiting for Elasticsearch availability"; - until curl -s --cacert config/certs/ca/ca.crt https://es01:9200 | grep -q "missing authentication credentials"; do sleep 30; done; - echo "Setting kibana_system password"; - until curl -s -X POST --cacert config/certs/ca/ca.crt -u "elastic:${ELASTIC_PASSWORD}" -H "Content-Type: application/json" https://es01:9200/_security/user/kibana_system/_password -d "{\"password\":\"${KIBANA_PASSWORD}\"}" | grep -q "^{}"; do sleep 10; done; - echo "All done!"; - ' - healthcheck: - test: [ "CMD-SHELL", "[ -f config/certs/es01/es01.crt ]" ] - interval: 1s - timeout: 5s - retries: 120 - logging: - driver: "json-file" - options: - max-size: "10m" - max-file: "3" - - - es01: - depends_on: - elastic-init: - condition: service_healthy - container_name: es01 - restart: always - image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0 - volumes: - - ${ES_ROOT_PATH}/certs:/usr/share/elasticsearch/config/certs - - ${ES_ROOT_PATH}/es01/data:/usr/share/elasticsearch/data - - ${ES_ROOT_PATH}/es01/logs:/usr/share/elasticsearch/logs - - ${ES_ROOT_PATH}/es01/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - - ${ES_ROOT_PATH}/es01/plugins:/usr/share/elasticsearch/plugins - ports: - - "${PANEL_APP_PORT_HTTPS}:9200" - - "${ES_COMMUNICATION_PORT}:9300" - networks: - - ${CLUSTER_NETWORK} - environment: - - node.name=es01 - - cluster.name=${CLUSTER_NAME} - - cluster.initial_master_nodes=es01,es02,es03 - - discovery.seed_hosts=es02,es03 - - ELASTIC_PASSWORD=${ELASTIC_PASSWORD} - - bootstrap.memory_lock=true - - xpack.security.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.http.ssl.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.http.ssl.key=certs/es01/es01.key - - xpack.security.http.ssl.certificate=certs/es01/es01.crt - - xpack.security.http.ssl.certificate_authorities=certs/ca/ca.crt - - xpack.security.transport.ssl.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.transport.ssl.key=certs/es01/es01.key - - xpack.security.transport.ssl.certificate=certs/es01/es01.crt - - xpack.security.transport.ssl.certificate_authorities=certs/ca/ca.crt - - xpack.security.transport.ssl.verification_mode=certificate - - xpack.license.self_generated.type=basic - - ES_JAVA_OPTS=-Xms${ES_JAVA_OPTS_XMS} -Xmx${ES_JAVA_OPTS_XMX} - mem_limit: ${MEM_LIMIT} - ulimits: - memlock: - soft: -1 - hard: -1 - nofile: - soft: 65536 - hard: 65536 - healthcheck: - test: - [ - "CMD-SHELL", - "curl -s --cacert config/certs/ca/ca.crt https://localhost:9200 | grep -q 'missing authentication credentials'", - ] - interval: 10s - timeout: 10s - retries: 120 - logging: - driver: "json-file" - options: - max-size: "10m" - max-file: "3" - - es02: - depends_on: - - es01 - container_name: es02 - restart: always - image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0 - volumes: - - ${ES_ROOT_PATH}/certs:/usr/share/elasticsearch/config/certs - - ${ES_ROOT_PATH}/es02/data:/usr/share/elasticsearch/data - - ${ES_ROOT_PATH}/es02/logs:/usr/share/elasticsearch/logs - - ${ES_ROOT_PATH}/es02/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - - ${ES_ROOT_PATH}/es02/plugins:/usr/share/elasticsearch/plugins - networks: - - ${CLUSTER_NETWORK} - environment: - - node.name=es02 - - cluster.name=${CLUSTER_NAME} - - cluster.initial_master_nodes=es01,es02,es03 - - discovery.seed_hosts=es01,es03 - - ELASTIC_PASSWORD=${ELASTIC_PASSWORD} - - bootstrap.memory_lock=true - - xpack.security.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.http.ssl.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.http.ssl.key=certs/es02/es02.key - - xpack.security.http.ssl.certificate=certs/es02/es02.crt - - xpack.security.http.ssl.certificate_authorities=certs/ca/ca.crt - - xpack.security.transport.ssl.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.transport.ssl.key=certs/es02/es02.key - - xpack.security.transport.ssl.certificate=certs/es02/es02.crt - - xpack.security.transport.ssl.certificate_authorities=certs/ca/ca.crt - - xpack.security.transport.ssl.verification_mode=certificate - - xpack.license.self_generated.type=basic - - ES_JAVA_OPTS=-Xms${ES_JAVA_OPTS_XMS} -Xmx${ES_JAVA_OPTS_XMX} - mem_limit: ${MEM_LIMIT} - ulimits: - memlock: - soft: -1 - hard: -1 - nofile: - soft: 65536 - hard: 65536 - healthcheck: - test: - [ - "CMD-SHELL", - "curl -s --cacert config/certs/ca/ca.crt https://localhost:9200 | grep -q 'missing authentication credentials'", - ] - interval: 10s - timeout: 10s - retries: 120 - logging: - driver: "json-file" - options: - max-size: "10m" - max-file: "3" - - es03: - depends_on: - - es02 - container_name: es03 - restart: always - image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0 - volumes: - - ${ES_ROOT_PATH}/certs:/usr/share/elasticsearch/config/certs - - ${ES_ROOT_PATH}/es03/data:/usr/share/elasticsearch/data - - ${ES_ROOT_PATH}/es03/logs:/usr/share/elasticsearch/logs - - ${ES_ROOT_PATH}/es03/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - - ${ES_ROOT_PATH}/es03/plugins:/usr/share/elasticsearch/plugins - networks: - - ${CLUSTER_NETWORK} - environment: - - node.name=es03 - - cluster.name=${CLUSTER_NAME} - - cluster.initial_master_nodes=es01,es02,es03 - - discovery.seed_hosts=es01,es02 - - ELASTIC_PASSWORD=${ELASTIC_PASSWORD} - - bootstrap.memory_lock=true - - xpack.security.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.http.ssl.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.http.ssl.key=certs/es03/es03.key - - xpack.security.http.ssl.certificate=certs/es03/es03.crt - - xpack.security.http.ssl.certificate_authorities=certs/ca/ca.crt - - xpack.security.transport.ssl.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.transport.ssl.key=certs/es03/es03.key - - xpack.security.transport.ssl.certificate=certs/es03/es03.crt - - xpack.security.transport.ssl.certificate_authorities=certs/ca/ca.crt - - xpack.security.transport.ssl.verification_mode=certificate - - xpack.license.self_generated.type=basic - - ES_JAVA_OPTS=-Xms${ES_JAVA_OPTS_XMS} -Xmx${ES_JAVA_OPTS_XMX} - mem_limit: ${MEM_LIMIT} - ulimits: - memlock: - soft: -1 - hard: -1 - nofile: - soft: 65536 - hard: 65536 - healthcheck: - test: - [ - "CMD-SHELL", - "curl -s --cacert config/certs/ca/ca.crt https://localhost:9200 | grep -q 'missing authentication credentials'", - ] - interval: 10s - timeout: 10s - retries: 120 - logging: - driver: "json-file" - options: - max-size: "10m" - max-file: "3" - - kibana: - depends_on: - es01: - condition: service_healthy - es02: - condition: service_healthy - es03: - condition: service_healthy - container_name: kibana-${CONTAINER_NAME} - restart: always - image: docker.elastic.co/kibana/kibana:8.12.0 - volumes: - - ${ES_ROOT_PATH}/certs:/usr/share/kibana/config/certs - - ${ES_ROOT_PATH}/kibana/data:/usr/share/kibana/data - - ${ES_ROOT_PATH}/kibana/config/kibana.yml:/usr/share/kibana/config/kibana.yml - ports: - - "${PANEL_APP_PORT_HTTP}:5601" - networks: - - ${CLUSTER_NETWORK} - environment: - - SERVERNAME=kibana - - ELASTICSEARCH_HOSTS=https://es01:9200 - - ELASTICSEARCH_USERNAME=kibana_system - - ELASTICSEARCH_PASSWORD=${KIBANA_PASSWORD} - - ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES=config/certs/ca/ca.crt - mem_limit: ${MEM_LIMIT} - healthcheck: - test: - [ - "CMD-SHELL", - "curl -s -I http://localhost:5601 | grep -q 'HTTP/1.1 302 Found'", - ] - interval: 10s - timeout: 10s - retries: 120 - logging: - driver: "json-file" - options: - max-size: "10m" - max-file: "3" diff --git a/apps/elastic/8.12.0-cluster/scripts/elasticsearch.yml b/apps/elastic/8.12.0-cluster/scripts/elasticsearch.yml deleted file mode 100644 index 7b3ac5ed3..000000000 --- a/apps/elastic/8.12.0-cluster/scripts/elasticsearch.yml +++ /dev/null @@ -1,2 +0,0 @@ -cluster.name: "docker-cluster" -network.host: 0.0.0.0 diff --git a/apps/elastic/8.12.0-cluster/scripts/init.sh b/apps/elastic/8.12.0-cluster/scripts/init.sh deleted file mode 100644 index d33d402f7..000000000 --- a/apps/elastic/8.12.0-cluster/scripts/init.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# 检查 .env 文件是否存在 -if [ -f .env ]; then - # 导入 .env 文件中的变量 - source .env - - # 检查模板是否启用 - if [ "$MS_TEMPLATE_ENABLED" = "true" ]; then - # 检查模板文件是否存在 - if [ -e "docker-compose-template.yml" ]; then - # 读取模板文件的内容 - template_content=$( docker-compose.yml - # 将模板内容写入目标文件 - echo "$template_content" > docker-compose.yml - - echo "docker-compose.yml updated successfully." - else - echo "Error: docker-compose-template.yml not found." - exit 1 - fi - fi - - # 替换 docker-compose.yml 中的网络变量 - sed -i "s/\${DOCKER_NET}/$CLUSTER_NETWORK/" docker-compose.yml - - # 创建目录 - mkdir -p "$ES_ROOT_PATH" - - mkdir -p "$ES_ROOT_PATH/certs" - - mkdir -p "$ES_ROOT_PATH/es01/data" - mkdir -p "$ES_ROOT_PATH/es02/data" - mkdir -p "$ES_ROOT_PATH/es03/data" - - mkdir -p "$ES_ROOT_PATH/es01/logs" - mkdir -p "$ES_ROOT_PATH/es02/logs" - mkdir -p "$ES_ROOT_PATH/es03/logs" - - mkdir -p "$ES_ROOT_PATH/es01/config" - mkdir -p "$ES_ROOT_PATH/es02/config" - mkdir -p "$ES_ROOT_PATH/es03/config" - - mkdir -p "$ES_ROOT_PATH/es01/plugins" - mkdir -p "$ES_ROOT_PATH/es02/plugins" - mkdir -p "$ES_ROOT_PATH/es03/plugins" - - mkdir -p "$ES_ROOT_PATH/kibana/data" - mkdir -p "$ES_ROOT_PATH/kibana/config" - - # 生成 elasticsearch.yml 文件 - elasticsearch_config="cluster.name: \"$CLUSTER_NAME\"\nnetwork.host: 0.0.0.0" - echo -e "$elasticsearch_config" > elasticsearch.yml - cp elasticsearch.yml "$ES_ROOT_PATH/es01/config/elasticsearch.yml" - cp elasticsearch.yml "$ES_ROOT_PATH/es02/config/elasticsearch.yml" - cp elasticsearch.yml "$ES_ROOT_PATH/es03/config/elasticsearch.yml" - - # 生成 kibana.yml 文件 - kibana_config="server.host: \"0.0.0.0\"\nserver.shutdownTimeout: \"5s\"\nelasticsearch.hosts: [ \"https://es01:9200\", \"https://es02:9200\", \"https://es03:9200\" ]\nmonitoring.ui.container.elasticsearch.enabled: true" - echo -e "$kibana_config" > kibana.yml - cp kibana.yml "$ES_ROOT_PATH/kibana/config/kibana.yml" - - # 清理中间文件 - rm elasticsearch.yml kibana.yml - - # 设置权限 - chmod -R 777 "$ES_ROOT_PATH" - - # 创建网络 - docker network create "$CLUSTER_NETWORK" - # 检查创建是否成功 - if [ $? -eq 0 ]; then - echo "Network $CLUSTER_NETWORK created successfully." - else - echo "Failed to create network $CLUSTER_NETWORK." - fi - - echo "Directories and permissions set successfully." - -else - echo "Error: .env file not found." - exit 1 -fi diff --git a/apps/elastic/8.12.0-cluster/scripts/kibana.yml b/apps/elastic/8.12.0-cluster/scripts/kibana.yml deleted file mode 100644 index fd51e7c4a..000000000 --- a/apps/elastic/8.12.0-cluster/scripts/kibana.yml +++ /dev/null @@ -1,4 +0,0 @@ -server.host: "0.0.0.0" -server.shutdownTimeout: "5s" -elasticsearch.hosts: [ "http://localhost:9200" ] -monitoring.ui.container.elasticsearch.enabled: true diff --git a/apps/elastic/8.12.0-cluster/scripts/uninstall.sh b/apps/elastic/8.12.0-cluster/scripts/uninstall.sh deleted file mode 100644 index 04769b433..000000000 --- a/apps/elastic/8.12.0-cluster/scripts/uninstall.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# 检查 .env 文件是否存在 -if [ -f .env ]; then - # 导入 .env 文件中的变量 - source .env - - # 使用 docker network rm 命令删除网络 - docker network rm $CLUSTER_NETWORK - - # 检查删除是否成功 - if [ $? -eq 0 ]; then - echo "Network $CLUSTER_NETWORK deleted successfully." - else - echo "Failed to delete network $CLUSTER_NETWORK." - fi - -else - echo "Error: .env file not found." - exit 1 -fi diff --git a/apps/elastic/8.12.0-node/data.yml b/apps/elastic/8.12.0-node/data.yml deleted file mode 100644 index a8c3a8d6b..000000000 --- a/apps/elastic/8.12.0-node/data.yml +++ /dev/null @@ -1,99 +0,0 @@ -additionalProperties: - formFields: - - default: "docker-cluster" - edit: true - envKey: CLUSTER_NAME - labelEn: cluster name - labelZh: 集群名称 与现有集群名称一致 - required: true - type: text - - default: "elastic-net" - edit: true - envKey: CLUSTER_NETWORK - labelEn: cluster network - labelZh: 集群网络 与现有集群网络一致 - required: true - type: text - - default: "es04" - edit: true - envKey: ES_NODE_NAME - labelEn: node name - labelZh: 节点名称 与现有节点名称不一致 - required: true - type: text - - default: "" - edit: true - envKey: ELASTIC_PASSWORD - labelEn: Password for the 'elastic' user, Numbers and letters - labelZh: elastic 用户的密码 数字与字母组合 - required: true - random: true - type: password - - default: "es01,es02,es03" - edit: true - envKey: ES_SEED_HOSTS - labelEn: Seed hosts - labelZh: 其他节点的名称 节点发现 - required: true - type: text - - default: "es01,es02,es03,es04" - edit: true - envKey: ES_INITIAL_MASTER_NODES - labelEn: Initial master nodes - labelZh: 主节点选举 es04为当前节点 - required: true - type: text - - default: "/home/elastic/cluster" - edit: true - envKey: ES_ROOT_PATH - labelEn: data persistence root path - labelZh: 集群根路径 与现有集群根路径一致 - required: true - type: text - - default: 1073741824 - edit: true - envKey: MEM_LIMIT - labelEn: Increase or decrease based on the available host memory (in bytes) - labelZh: 根据可用主机内存增加或减少(以字节为单位) - required: true - type: number - - default: "9200" - edit: true - envKey: PANEL_APP_PORT_HTTPS - labelEn: Port to expose Elasticsearch HTTP API to the host - labelZh: 开放API的端口 - required: false - type: text - - default: "9300" - edit: true - envKey: ES_COMMUNICATION_PORT - labelEn: Port to expose Elasticsearch communication to the host - labelZh: Elasticsearch通讯端口 9300 - required: false - type: text - - default: "512m" - edit: true - envKey: ES_JAVA_OPTS_XMS - labelEn: JVM memory allocation pool - labelZh: JVM内存分配池 初始化内存 - required: true - type: text - - default: "512m" - edit: true - envKey: ES_JAVA_OPTS_XMX - labelEn: JVM memory allocation pool - labelZh: JVM内存分配池 运行内存 - required: true - type: text - - default: "true" - edit: true - envKey: ES_XPACK_SECURITY_ENABLED - labelEn: Enable security verification (recommended) - labelZh: 证书安全验证(推荐开启) - required: true - type: select - values: - - label: "开启" - value: "true" - - label: "关闭" - value: "false" diff --git a/apps/elastic/8.12.0-node/docker-compose.yml b/apps/elastic/8.12.0-node/docker-compose.yml deleted file mode 100644 index 6a03e1a21..000000000 --- a/apps/elastic/8.12.0-node/docker-compose.yml +++ /dev/null @@ -1,84 +0,0 @@ -version: "3.8" - -networks: - ${DOCKER_NET}: - external: true - -services: - es-node: - container_name: ${CONTAINER_NAME}-${ES_NODE_NAME} - restart: always - image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0 - volumes: - - ${ES_ROOT_PATH}/certs:/usr/share/elasticsearch/config/certs - - ${ES_ROOT_PATH}/${ES_NODE_NAME}/data:/usr/share/elasticsearch/data - - ${ES_ROOT_PATH}/${ES_NODE_NAME}/logs:/usr/share/elasticsearch/logs - - ${ES_ROOT_PATH}/${ES_NODE_NAME}/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - - ${ES_ROOT_PATH}/${ES_NODE_NAME}/plugins:/usr/share/elasticsearch/plugins - ports: - - "${PANEL_APP_PORT_HTTPS}:9200" - - "${ES_COMMUNICATION_PORT}:9300" - networks: - - ${CLUSTER_NETWORK} - command: > - bash -c ' - echo "start es-node"; - if [ ! -f config/certs/${ES_NODE_NAME}.zip ]; then - echo "Creating certs"; - echo -ne \ - "instances:\n"\ - " - name: ${ES_NODE_NAME}\n"\ - " dns:\n"\ - " - ${ES_NODE_NAME}\n"\ - " - localhost\n"\ - " ip:\n"\ - " - 127.0.0.1\n"\ - > config/certs/${ES_NODE_NAME}.yml; - bin/elasticsearch-certutil cert --silent --pem -out config/certs/${ES_NODE_NAME}.zip --in config/certs/${ES_NODE_NAME}.yml --ca-cert config/certs/ca/ca.crt --ca-key config/certs/ca/ca.key; - unzip config/certs/${ES_NODE_NAME}.zip -d config/certs; - fi; - echo "Setting file permissions" - chown -R root:root config/certs; - exec /usr/local/bin/docker-entrypoint.sh elasticsearch - ' - environment: - - node.name=${ES_NODE_NAME} - - cluster.name=${CLUSTER_NAME} - - cluster.initial_master_nodes=${ES_INITIAL_MASTER_NODES} - - discovery.seed_hosts=${ES_SEED_HOSTS} - - ELASTIC_PASSWORD=${ELASTIC_PASSWORD} - - bootstrap.memory_lock=true - - xpack.security.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.http.ssl.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.http.ssl.key=certs/${ES_NODE_NAME}/${ES_NODE_NAME}.key - - xpack.security.http.ssl.certificate=certs/${ES_NODE_NAME}/${ES_NODE_NAME}.crt - - xpack.security.http.ssl.certificate_authorities=certs/ca/ca.crt - - xpack.security.transport.ssl.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.transport.ssl.key=certs/${ES_NODE_NAME}/${ES_NODE_NAME}.key - - xpack.security.transport.ssl.certificate=certs/${ES_NODE_NAME}/${ES_NODE_NAME}.crt - - xpack.security.transport.ssl.certificate_authorities=certs/ca/ca.crt - - xpack.security.transport.ssl.verification_mode=certificate - - xpack.license.self_generated.type=basic - - ES_JAVA_OPTS=-Xms${ES_JAVA_OPTS_XMS} -Xmx${ES_JAVA_OPTS_XMX} - mem_limit: ${MEM_LIMIT} - ulimits: - memlock: - soft: -1 - hard: -1 - nofile: - soft: 65536 - hard: 65536 - healthcheck: - test: - [ - "CMD-SHELL", - "curl -s --cacert config/certs/ca/ca.crt https://localhost:9200 | grep -q 'missing authentication credentials'", - ] - interval: 10s - timeout: 10s - retries: 120 - logging: - driver: "json-file" - options: - max-size: "10m" - max-file: "3" diff --git a/apps/elastic/8.12.0-node/scripts/init.sh b/apps/elastic/8.12.0-node/scripts/init.sh deleted file mode 100644 index bd41991c9..000000000 --- a/apps/elastic/8.12.0-node/scripts/init.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -# 检查 .env 文件是否存在 -if [ -f .env ]; then - # 导入 .env 文件中的变量 - source .env - - # 替换 docker-compose.yml 中的网络变量 - sed -i "s/\${DOCKER_NET}/$CLUSTER_NETWORK/" docker-compose.yml - - # 创建并设置权限 - mkdir -p "$ES_ROOT_PATH" - - mkdir -p "$ES_ROOT_PATH/$ES_NODE_NAME/data" - mkdir -p "$ES_ROOT_PATH/$ES_NODE_NAME/logs" - mkdir -p "$ES_ROOT_PATH/$ES_NODE_NAME/config" - mkdir -p "$ES_ROOT_PATH/$ES_NODE_NAME/plugins" - - # 生成 elasticsearch.yml 文件 - elasticsearch_config="cluster.name: \"$CLUSTER_NAME\"\nnetwork.host: 0.0.0.0" - echo -e "$elasticsearch_config" > elasticsearch.yml - cp elasticsearch.yml "$ES_ROOT_PATH/$ES_NODE_NAME/config/elasticsearch.yml" - - chmod -R 777 "$ES_ROOT_PATH" - - echo "Directories and permissions set successfully." - -else - echo "Error: .env file not found." - exit 1 -fi diff --git a/apps/elastic/8.12.0-single/data.yml b/apps/elastic/8.12.0-single/data.yml deleted file mode 100644 index d1b267e56..000000000 --- a/apps/elastic/8.12.0-single/data.yml +++ /dev/null @@ -1,89 +0,0 @@ -additionalProperties: - formFields: - - default: "" - edit: true - envKey: ELASTIC_PASSWORD - labelEn: Password for the 'elastic' user, Numbers and letters - labelZh: elastic 用户的密码 数字与字母组合 - required: true - random: true - type: password - - default: "" - edit: true - envKey: KIBANA_PASSWORD - labelEn: Password for the 'kibana_system' user, Numbers and letters - labelZh: kibana_system 用户的密码 数字与字母组合 - required: true - random: true - type: password - - default: "/home/elastic/single" - edit: true - envKey: ES_ROOT_PATH - labelEn: data persistence root path - labelZh: 数据持久化根路径 - required: true - type: text - - default: 1073741824 - edit: true - envKey: MEM_LIMIT - labelEn: Increase or decrease based on the available host memory (in bytes) - labelZh: 根据可用主机内存增加或减少(以字节为单位) - required: true - type: number - - default: "9200" - edit: true - envKey: ES_HOST - labelEn: Access host restriction 127.0.0.1:9200 - labelZh: 主机限定 127.0.0.1:9200 - required: true - type: text - - default: 9200 - edit: true - envKey: PANEL_APP_PORT_HTTPS - labelEn: Port to expose Elasticsearch HTTP API to the host - labelZh: 开放API的端口 必须与主机限定端口一致 - required: true - rule: paramPort - type: number - - default: 5601 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port to expose Kibana to the host - labelZh: Kibana面板端口 - required: true - rule: paramPort - type: number - - default: 9300 - edit: true - envKey: ES_COMMUNICATION_PORT - labelEn: Port to expose Elasticsearch communication to the host - labelZh: Elasticsearch通讯端口 9300 - required: true - rule: paramPort - type: number - - default: "512m" - edit: true - envKey: ES_JAVA_OPTS_XMS - labelEn: JVM memory allocation pool - labelZh: JVM内存分配池 初始化内存 - required: true - type: text - - default: "512m" - edit: true - envKey: ES_JAVA_OPTS_XMX - labelEn: JVM memory allocation pool - labelZh: JVM内存分配池 运行内存 - required: true - type: text - - default: "true" - edit: true - envKey: ES_XPACK_SECURITY_ENABLED - labelEn: Enable security verification (recommended) - labelZh: 证书安全验证(推荐开启) - required: true - type: select - values: - - label: "开启" - value: "true" - - label: "关闭" - value: "false" diff --git a/apps/elastic/8.12.0-single/docker-compose.yml b/apps/elastic/8.12.0-single/docker-compose.yml deleted file mode 100644 index 780e9acd9..000000000 --- a/apps/elastic/8.12.0-single/docker-compose.yml +++ /dev/null @@ -1,159 +0,0 @@ -version: "3.8" - -networks: - 1panel-network: - external: true - -services: - es-single-init: - container_name: elastic-init - image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0 - networks: - - 1panel-network - volumes: - - ${ES_ROOT_PATH}/certs:/usr/share/elasticsearch/config/certs - user: "0" - command: > - bash -c ' - if [ x${ELASTIC_PASSWORD} == x ]; then - echo "Set the ELASTIC_PASSWORD environment variable in the .env file"; - exit 1; - elif [ x${KIBANA_PASSWORD} == x ]; then - echo "Set the KIBANA_PASSWORD environment variable in the .env file"; - exit 1; - fi; - if [ ! -f config/certs/ca.zip ]; then - echo "Creating CA"; - bin/elasticsearch-certutil ca --silent --pem -out config/certs/ca.zip; - unzip config/certs/ca.zip -d config/certs; - fi; - if [ ! -f config/certs/certs.zip ]; then - echo "Creating certs"; - echo -ne \ - "instances:\n"\ - " - name: es-single-es01\n"\ - " dns:\n"\ - " - es-single-es01\n"\ - " - localhost\n"\ - " ip:\n"\ - " - 127.0.0.1\n"\ - > config/certs/instances.yml; - bin/elasticsearch-certutil cert --silent --pem -out config/certs/certs.zip --in config/certs/instances.yml --ca-cert config/certs/ca/ca.crt --ca-key config/certs/ca/ca.key; - unzip config/certs/certs.zip -d config/certs; - fi; - echo "Setting file permissions" - chown -R root:root config/certs; - find . -type d -exec chmod 750 \{\} \;; - find . -type f -exec chmod 640 \{\} \;; - echo "Waiting for Elasticsearch availability"; - until curl -s --cacert config/certs/ca/ca.crt https://es-single-es01:9200 | grep -q "missing authentication credentials"; do sleep 30; done; - echo "Setting kibana_system password"; - until curl -s -X POST --cacert config/certs/ca/ca.crt -u "elastic:${ELASTIC_PASSWORD}" -H "Content-Type: application/json" https://es-single-es01:9200/_security/user/kibana_system/_password -d "{\"password\":\"${KIBANA_PASSWORD}\"}" | grep -q "^{}"; do sleep 10; done; - echo "All done!"; - ' - healthcheck: - test: [ "CMD-SHELL", "[ -f config/certs/es-single-es01/es-single-es01.crt ]" ] - interval: 1s - timeout: 5s - retries: 120 - logging: - driver: "json-file" - options: - max-size: "10m" - max-file: "3" - - - es-single-es01: - depends_on: - es-single-init: - condition: service_healthy - container_name: es-single-es01 - restart: always - image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0 - volumes: - - ${ES_ROOT_PATH}/certs:/usr/share/elasticsearch/config/certs - - ${ES_ROOT_PATH}/es01/data:/usr/share/elasticsearch/data - - ${ES_ROOT_PATH}/es01/logs:/usr/share/elasticsearch/logs - - ${ES_ROOT_PATH}/es01/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - - ${ES_ROOT_PATH}/es01/plugins:/usr/share/elasticsearch/plugins - ports: - - "${PANEL_APP_PORT_HTTPS}:9200" - - "${ES_COMMUNICATION_PORT}:9300" - networks: - - 1panel-network - environment: - - discovery.type=single-node - - node.name=es-single-es01 - - ELASTIC_PASSWORD=${ELASTIC_PASSWORD} - - bootstrap.memory_lock=true - - xpack.security.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.http.ssl.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.http.ssl.key=certs/es-single-es01/es-single-es01.key - - xpack.security.http.ssl.certificate=certs/es-single-es01/es-single-es01.crt - - xpack.security.http.ssl.certificate_authorities=certs/ca/ca.crt - - xpack.security.transport.ssl.enabled=${ES_XPACK_SECURITY_ENABLED} - - xpack.security.transport.ssl.key=certs/es-single-es01/es-single-es01.key - - xpack.security.transport.ssl.certificate=certs/es-single-es01/es-single-es01.crt - - xpack.security.transport.ssl.certificate_authorities=certs/ca/ca.crt - - xpack.security.transport.ssl.verification_mode=certificate - - xpack.license.self_generated.type=basic - - ES_JAVA_OPTS=-Xms${ES_JAVA_OPTS_XMS} -Xmx${ES_JAVA_OPTS_XMX} - mem_limit: ${MEM_LIMIT} - ulimits: - memlock: - soft: -1 - hard: -1 - nofile: - soft: 65536 - hard: 65536 - healthcheck: - test: - [ - "CMD-SHELL", - "curl -s --cacert config/certs/ca/ca.crt https://localhost:9200 | grep -q 'missing authentication credentials'", - ] - interval: 10s - timeout: 10s - retries: 120 - logging: - driver: "json-file" - options: - max-size: "10m" - max-file: "3" - - es-single-kibana: - depends_on: - es-single-es01: - condition: service_healthy - container_name: kibana-${CONTAINER_NAME} - restart: always - image: docker.elastic.co/kibana/kibana:8.12.0 - volumes: - - ${ES_ROOT_PATH}/certs:/usr/share/kibana/config/certs - - ${ES_ROOT_PATH}/kibana/data:/usr/share/kibana/data - - ${ES_ROOT_PATH}/kibana/config/kibana.yml:/usr/share/kibana/config/kibana.yml - ports: - - "${PANEL_APP_PORT_HTTP}:5601" - networks: - - 1panel-network - environment: - - SERVERNAME=kibana - - ELASTICSEARCH_HOSTS=https://es-single-es01:9200 - - ELASTICSEARCH_USERNAME=kibana_system - - ELASTICSEARCH_PASSWORD=${KIBANA_PASSWORD} - - ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES=config/certs/ca/ca.crt - mem_limit: ${MEM_LIMIT} - healthcheck: - test: - [ - "CMD-SHELL", - "curl -s -I http://localhost:5601 | grep -q 'HTTP/1.1 302 Found'", - ] - interval: 10s - timeout: 10s - retries: 120 - logging: - driver: "json-file" - options: - max-size: "10m" - max-file: "3" diff --git a/apps/elastic/8.12.0-single/scripts/elasticsearch.yml b/apps/elastic/8.12.0-single/scripts/elasticsearch.yml deleted file mode 100644 index 7b3ac5ed3..000000000 --- a/apps/elastic/8.12.0-single/scripts/elasticsearch.yml +++ /dev/null @@ -1,2 +0,0 @@ -cluster.name: "docker-cluster" -network.host: 0.0.0.0 diff --git a/apps/elastic/8.12.0-single/scripts/init.sh b/apps/elastic/8.12.0-single/scripts/init.sh deleted file mode 100644 index d2099f298..000000000 --- a/apps/elastic/8.12.0-single/scripts/init.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -# 检查 .env 文件是否存在 -if [ -f .env ]; then - # 导入 .env 文件中的变量 - source .env - - # 检查模板是否启用 - if [ "$MS_TEMPLATE_ENABLED" = "true" ]; then - # 检查模板文件是否存在 - if [ -e "docker-compose-template.yml" ]; then - # 读取模板文件的内容 - template_content=$( docker-compose.yml - # 将模板内容写入目标文件 - echo "$template_content" > docker-compose.yml - - echo "docker-compose.yml updated successfully." - else - echo "Error: docker-compose-template.yml not found." - exit 1 - fi - fi - - # 创建目录 - mkdir -p "$ES_ROOT_PATH" - - mkdir -p "$ES_ROOT_PATH/certs" - - mkdir -p "$ES_ROOT_PATH/es01/data" - - mkdir -p "$ES_ROOT_PATH/es01/logs" - - mkdir -p "$ES_ROOT_PATH/es01/config" - - mkdir -p "$ES_ROOT_PATH/es01/plugins" - - mkdir -p "$ES_ROOT_PATH/kibana/data" - mkdir -p "$ES_ROOT_PATH/kibana/config" - - # 生成 elasticsearch.yml 文件 - elasticsearch_config="cluster.name: \"$CLUSTER_NAME\"\nnetwork.host: 0.0.0.0" - echo -e "$elasticsearch_config" > elasticsearch.yml - cp elasticsearch.yml "$ES_ROOT_PATH/es01/config/elasticsearch.yml" - - # 生成 kibana.yml 文件 - kibana_config="server.host: \"0.0.0.0\"\nserver.shutdownTimeout: \"5s\"\nelasticsearch.hosts: [ \"https://es01:9200\" ]\nmonitoring.ui.container.elasticsearch.enabled: true" - echo -e "$kibana_config" > kibana.yml - cp kibana.yml "$ES_ROOT_PATH/kibana/config/kibana.yml" - - # 清理中间文件 - rm elasticsearch.yml kibana.yml - - # 设置权限 - chmod -R 777 "$ES_ROOT_PATH" - - echo "Directories and permissions set successfully." - -else - echo "Error: .env file not found." - exit 1 -fi diff --git a/apps/elastic/8.12.0-single/scripts/kibana.yml b/apps/elastic/8.12.0-single/scripts/kibana.yml deleted file mode 100644 index fd51e7c4a..000000000 --- a/apps/elastic/8.12.0-single/scripts/kibana.yml +++ /dev/null @@ -1,4 +0,0 @@ -server.host: "0.0.0.0" -server.shutdownTimeout: "5s" -elasticsearch.hosts: [ "http://localhost:9200" ] -monitoring.ui.container.elasticsearch.enabled: true diff --git a/apps/elastic/8.12.0-single/scripts/uninstall.sh b/apps/elastic/8.12.0-single/scripts/uninstall.sh deleted file mode 100644 index 04769b433..000000000 --- a/apps/elastic/8.12.0-single/scripts/uninstall.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# 检查 .env 文件是否存在 -if [ -f .env ]; then - # 导入 .env 文件中的变量 - source .env - - # 使用 docker network rm 命令删除网络 - docker network rm $CLUSTER_NETWORK - - # 检查删除是否成功 - if [ $? -eq 0 ]; then - echo "Network $CLUSTER_NETWORK deleted successfully." - else - echo "Failed to delete network $CLUSTER_NETWORK." - fi - -else - echo "Error: .env file not found." - exit 1 -fi diff --git a/apps/elastic/README.md b/apps/elastic/README.md deleted file mode 100644 index 2c86f6c93..000000000 --- a/apps/elastic/README.md +++ /dev/null @@ -1,151 +0,0 @@ -# Elastic - -Elastic NV是一家美籍荷兰公司,成立于2012年,位于荷兰阿姆斯特丹,以前称为Elasticsearch。这是一家搜索公司,它构建用于搜索,日志记录,安全性,可观察性和分析用例的自我管理和软件即服务产品。 - -Elastic NV is an American-Dutch company that was founded in 2012 in Amsterdam, the Netherlands, and was previously known -as Elasticsearch. - -## 参考资料 - -Docker@Elastic: [https://www.docker.elastic.co/](https://www.docker.elastic.co/) - -DockerFiles: [https://github.com/elastic/dockerfiles](https://github.com/elastic/dockerfiles) - -GitHub Elastic: [https://github.com/elastic](https://github.com/elastic) - -官方网站: [https://www.elastic.co/](https://www.elastic.co/) - -官方文档: [https://www.elastic.co/guide/index.html](https://www.elastic.co/guide/index.html) - -## Elastic Stack - -了解可帮助您构建搜索体验、解决问题并取得成功的搜索平台 - -核心产品包括 Elasticsearch、Kibana、Beats 和 Logstash(也称为 ELK Stack)等等。能够安全可靠地从任何来源获取任何格式的数据,然后对数据进行搜索、分析和可视化。 - -### ELASTICSEARCH + KIBANA + INTEGRATIONS - -集搜索驱动型产品和功能于一身 - -Elasticsearch 和 Kibana 都是在免费开放的基础上构建而成,适用于各种各样的用例,从日志开始,到您能想到的任何项目,无一不能胜任。Elastic -具备极有价值的功能组合,如 Machine Learning、安全和 Reporting,这些功能专为 Elastic 而生,让我们独树一帜。查看 Elastic Stack -功能的完整列表。 - -#### Elasticsearch - -GitHub: [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch) - -Elasticsearch 是一个基于 JSON 的分布式搜索和分析引擎。 -无论您正在查找来自特定 IP 地址的活动,还是正在分析交易请求数量为何突然飙升,或者正在方圆一公里内搜寻美食店,我们尝试解决的这些问题归根结底都是搜索问题。通过 -Elasticsearch,您可以快速存储、搜索和分析大量数据。 - -#### Kibana - -GitHub: [https://github.com/elastic/kibana](https://github.com/elastic/kibana) - -Kibana 是一个可扩展的用户界面,您可以借助它对数据进行可视化分析。 -在 Kibana 中通过炫酷的可视化来探索您的数据,从华夫饼图到热点图,再到时序数据分析,应有尽有。针对多样化数据源使用预配置仪表板,创建实时演示文稿以突出显示 -KPI,并使用单一 UI 来管理您的部署。 - -#### Integrations - -通过 Integrations,您可以使用 Elastic Stack 收集并关联数据。 -在收集、存储、搜索和分析数据时,发掘有价值的见解。使用 Elastic 代理、Beats -或网络爬虫等功能,从应用程序、基础架构和公共内容源中采集数据,在大量开箱即用型集成功能的加持下,分分钟即可开始工作。 - -## 版本介绍 - -### 集群模式 - -> 8.12.0-cluster - -+ Elasticsearch 8.12.0 x3 -+ Kibana 8.12.0 - -> 8.12.0-node - -新增节点,需要填写集群信息 - -+ Elasticsearch 8.12.0 - -### 单机模式 - -> 8.12.0-single - -+ Elasticsearch 8.12.0 -+ Kibana 8.12.0 - -> 8.12.0-elasticsearch - -+ Elasticsearch 8.12.0 - -> 8.12.0-kibana - -+ Kibana 8.12.0 - -## 安装事项 - -### 将 vm.max_map_count 设置为至少 262144 - -vm.max_map_count 内核设置必须至少设置为 262144 才能用于生产。 - -> Linux -> -> To view the current value for the vm.max_map_count setting, run: -> ```shell -> grep vm.max_map_count /etc/sysctl.conf -> ``` -> 显示值大于或等于 262144。即可,如果显示的值小于 262144,请执行以下步骤: - -临时设置 vm.max_map_count - -```shell -sudo sysctl -w vm.max_map_count=262144 -``` - -永久设置 vm.max_map_count - -```shell -sudo vi /etc/sysctl.conf -# 文件末尾添加 -vm.max_map_count=262144 -# 生效 -sudo sysctl -p -``` - -### 增加 nofile 和 nproc 的 ulimit 值 最小值 65535 - -> Linux -> -> root 用户 与 普通用户 请注意区别很大 -> -> To view the current value for the ulimit setting, run: -> ```shell -> ulimit -n -> ``` -> 显示值大于或等于 65535。即可,如果显示的值小于 65535,请执行以下步骤: - -临时设置 ulimit - -```shell -ulimit -n 65535 -``` - -永久设置 ulimit - -**涉及服务器重启** - -```shell -sudo vi /etc/security/limits.conf -# 文件末尾添加 -root soft nofile unlimited -root hard nofile unlimited -* soft nofile 65535 -* hard nofile 65535 -# 生效 重启(重启服务器后生效!!!) -sudo reboot -``` - -## 日志配置 - -当前采用 `JSON File logging driver` 记录日志 diff --git a/apps/elastic/data.yml b/apps/elastic/data.yml deleted file mode 100644 index dc828a4e8..000000000 --- a/apps/elastic/data.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Elastic -tags: - - 中间件 -title: Elastic -type: 中间件 -description: 分布式、RESTful 风格的搜索和数据分析引擎 -additionalProperties: - key: elastic - name: Elastic - tags: - - Middleware - shortDescZh: 分布式、RESTful 风格的搜索和数据分析引擎 - shortDescEn: Distributed, RESTful search and data analytics engine - type: runtime - crossVersionUpdate: true - limit: 0 - recommend: 0 - website: https://www.elastic.co/ - github: https://github.com/elastic - document: https://www.elastic.co/guide/index.html diff --git a/apps/elastic/logo.png b/apps/elastic/logo.png deleted file mode 100644 index ca3de1eba..000000000 Binary files a/apps/elastic/logo.png and /dev/null differ diff --git a/apps/emby-lovechen/4.8.0.21/scripts/init.sh b/apps/emby-lovechen/4.8.0.21/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/emby-lovechen/4.8.0.21/scripts/init.sh +++ b/apps/emby-lovechen/4.8.0.21/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh b/apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh +++ b/apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/emby/4.8.8.0/scripts/init.sh b/apps/emby/4.8.8.0/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/emby/4.8.8.0/scripts/init.sh +++ b/apps/emby/4.8.8.0/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/emby/4.8.8.0/scripts/upgrade.sh b/apps/emby/4.8.8.0/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/emby/4.8.8.0/scripts/upgrade.sh +++ b/apps/emby/4.8.8.0/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/gitea/1.22.1/scripts/init.sh b/apps/gitea/1.22.1/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/gitea/1.22.1/scripts/init.sh +++ b/apps/gitea/1.22.1/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/gitea/1.22.1/scripts/upgrade.sh b/apps/gitea/1.22.1/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/gitea/1.22.1/scripts/upgrade.sh +++ b/apps/gitea/1.22.1/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/halo/2.17.2/scripts/upgrade.sh b/apps/halo/2.17.2/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/halo/2.17.2/scripts/upgrade.sh +++ b/apps/halo/2.17.2/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/immich-machine-learning/1.109.2/scripts/init.sh b/apps/immich-machine-learning/1.109.2/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/immich-machine-learning/1.109.2/scripts/init.sh +++ b/apps/immich-machine-learning/1.109.2/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/immich-machine-learning/1.109.2/scripts/upgrade.sh b/apps/immich-machine-learning/1.109.2/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/immich-machine-learning/1.109.2/scripts/upgrade.sh +++ b/apps/immich-machine-learning/1.109.2/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/immich-server/1.109.2/scripts/init.sh b/apps/immich-server/1.109.2/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/immich-server/1.109.2/scripts/init.sh +++ b/apps/immich-server/1.109.2/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/immich-server/1.109.2/scripts/upgrade.sh b/apps/immich-server/1.109.2/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/immich-server/1.109.2/scripts/upgrade.sh +++ b/apps/immich-server/1.109.2/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/immich/1.109.2/scripts/init.sh b/apps/immich/1.109.2/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/immich/1.109.2/scripts/init.sh +++ b/apps/immich/1.109.2/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/immich/1.109.2/scripts/upgrade.sh b/apps/immich/1.109.2/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/immich/1.109.2/scripts/upgrade.sh +++ b/apps/immich/1.109.2/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/mariadb/11.4.2/scripts/init.sh b/apps/mariadb/11.4.2/scripts/init.sh index 0a969d7ff..fb017c6cd 100644 --- a/apps/mariadb/11.4.2/scripts/init.sh +++ b/apps/mariadb/11.4.2/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env mkdir -p "$MARIADB_ROOT_PATH" diff --git a/apps/mariadb/11.4.2/scripts/upgrade.sh b/apps/mariadb/11.4.2/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/mariadb/11.4.2/scripts/upgrade.sh +++ b/apps/mariadb/11.4.2/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/movie-pilot/1.9.12/scripts/init.sh b/apps/movie-pilot/1.9.12/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/movie-pilot/1.9.12/scripts/init.sh +++ b/apps/movie-pilot/1.9.12/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/movie-pilot/1.9.12/scripts/upgrade.sh b/apps/movie-pilot/1.9.12/scripts/upgrade.sh index 1ed2e78ee..2df25115d 100644 --- a/apps/movie-pilot/1.9.12/scripts/upgrade.sh +++ b/apps/movie-pilot/1.9.12/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/mysql/5.7.44/scripts/init.sh b/apps/mysql/5.7.44/scripts/init.sh index 5819bd698..5a20b970f 100644 --- a/apps/mysql/5.7.44/scripts/init.sh +++ b/apps/mysql/5.7.44/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env mkdir -p "$MYSQL_ROOT_PATH" diff --git a/apps/mysql/5.7.44/scripts/upgrade.sh b/apps/mysql/5.7.44/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/mysql/5.7.44/scripts/upgrade.sh +++ b/apps/mysql/5.7.44/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/mysql/8.4.1/scripts/init.sh b/apps/mysql/8.4.1/scripts/init.sh index 5819bd698..5a20b970f 100644 --- a/apps/mysql/8.4.1/scripts/init.sh +++ b/apps/mysql/8.4.1/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env mkdir -p "$MYSQL_ROOT_PATH" diff --git a/apps/mysql/8.4.1/scripts/upgrade.sh b/apps/mysql/8.4.1/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/mysql/8.4.1/scripts/upgrade.sh +++ b/apps/mysql/8.4.1/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/nacos/2.4.0/scripts/init.sh b/apps/nacos/2.4.0/scripts/init.sh index 110cebce9..e13cf8c72 100644 --- a/apps/nacos/2.4.0/scripts/init.sh +++ b/apps/nacos/2.4.0/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env if command -v mysql &> /dev/null; then diff --git a/apps/nacos/2.4.0/scripts/upgrade.sh b/apps/nacos/2.4.0/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/nacos/2.4.0/scripts/upgrade.sh +++ b/apps/nacos/2.4.0/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/onedev/10.9.8/scripts/init.sh b/apps/onedev/10.9.8/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/onedev/10.9.8/scripts/init.sh +++ b/apps/onedev/10.9.8/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/onedev/10.9.8/scripts/upgrade.sh b/apps/onedev/10.9.8/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/onedev/10.9.8/scripts/upgrade.sh +++ b/apps/onedev/10.9.8/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/outline/0.78.0/scripts/init.sh b/apps/outline/0.78.0/scripts/init.sh index 95adde720..0d2cbc332 100644 --- a/apps/outline/0.78.0/scripts/init.sh +++ b/apps/outline/0.78.0/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env # setup-2 remove empty values diff --git a/apps/outline/0.78.0/scripts/upgrade.sh b/apps/outline/0.78.0/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/outline/0.78.0/scripts/upgrade.sh +++ b/apps/outline/0.78.0/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/percona/8.0/scripts/init.sh b/apps/percona/8.0/scripts/init.sh index c52b0c790..5179ad729 100644 --- a/apps/percona/8.0/scripts/init.sh +++ b/apps/percona/8.0/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env mkdir -p "$PERCONA_ROOT_PATH" diff --git a/apps/percona/8.0/scripts/upgrade.sh b/apps/percona/8.0/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/percona/8.0/scripts/upgrade.sh +++ b/apps/percona/8.0/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg14-alpine/scripts/init.sh b/apps/postgresql/pg14-alpine/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg14-alpine/scripts/init.sh +++ b/apps/postgresql/pg14-alpine/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg14-alpine/scripts/upgrade.sh b/apps/postgresql/pg14-alpine/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg14-alpine/scripts/upgrade.sh +++ b/apps/postgresql/pg14-alpine/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg14-vectors/scripts/init.sh b/apps/postgresql/pg14-vectors/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg14-vectors/scripts/init.sh +++ b/apps/postgresql/pg14-vectors/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg14-vectors/scripts/upgrade.sh b/apps/postgresql/pg14-vectors/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg14-vectors/scripts/upgrade.sh +++ b/apps/postgresql/pg14-vectors/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg14/scripts/init.sh b/apps/postgresql/pg14/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg14/scripts/init.sh +++ b/apps/postgresql/pg14/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg14/scripts/upgrade.sh b/apps/postgresql/pg14/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg14/scripts/upgrade.sh +++ b/apps/postgresql/pg14/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg15-alpine/scripts/init.sh b/apps/postgresql/pg15-alpine/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg15-alpine/scripts/init.sh +++ b/apps/postgresql/pg15-alpine/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg15-alpine/scripts/upgrade.sh b/apps/postgresql/pg15-alpine/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg15-alpine/scripts/upgrade.sh +++ b/apps/postgresql/pg15-alpine/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg15-vectors/scripts/init.sh b/apps/postgresql/pg15-vectors/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg15-vectors/scripts/init.sh +++ b/apps/postgresql/pg15-vectors/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg15-vectors/scripts/upgrade.sh b/apps/postgresql/pg15-vectors/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg15-vectors/scripts/upgrade.sh +++ b/apps/postgresql/pg15-vectors/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg15/scripts/init.sh b/apps/postgresql/pg15/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg15/scripts/init.sh +++ b/apps/postgresql/pg15/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg15/scripts/upgrade.sh b/apps/postgresql/pg15/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg15/scripts/upgrade.sh +++ b/apps/postgresql/pg15/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg16-alpine/scripts/init.sh b/apps/postgresql/pg16-alpine/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg16-alpine/scripts/init.sh +++ b/apps/postgresql/pg16-alpine/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg16-alpine/scripts/upgrade.sh b/apps/postgresql/pg16-alpine/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg16-alpine/scripts/upgrade.sh +++ b/apps/postgresql/pg16-alpine/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg16-vectors/scripts/init.sh b/apps/postgresql/pg16-vectors/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg16-vectors/scripts/init.sh +++ b/apps/postgresql/pg16-vectors/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg16-vectors/scripts/upgrade.sh b/apps/postgresql/pg16-vectors/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg16-vectors/scripts/upgrade.sh +++ b/apps/postgresql/pg16-vectors/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg16/scripts/init.sh b/apps/postgresql/pg16/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg16/scripts/init.sh +++ b/apps/postgresql/pg16/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg16/scripts/upgrade.sh b/apps/postgresql/pg16/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/postgresql/pg16/scripts/upgrade.sh +++ b/apps/postgresql/pg16/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/transmission/4.0.6/scripts/init.sh b/apps/transmission/4.0.6/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/transmission/4.0.6/scripts/init.sh +++ b/apps/transmission/4.0.6/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/transmission/4.0.6/scripts/upgrade.sh b/apps/transmission/4.0.6/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/transmission/4.0.6/scripts/upgrade.sh +++ b/apps/transmission/4.0.6/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/umami/2.12.1/scripts/init.sh b/apps/umami/2.12.1/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/umami/2.12.1/scripts/init.sh +++ b/apps/umami/2.12.1/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/umami/2.12.1/scripts/upgrade.sh b/apps/umami/2.12.1/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/umami/2.12.1/scripts/upgrade.sh +++ b/apps/umami/2.12.1/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/uptime-kuma/1.23.13/scripts/init.sh b/apps/uptime-kuma/1.23.13/scripts/init.sh index c211154a7..77b849120 100644 --- a/apps/uptime-kuma/1.23.13/scripts/init.sh +++ b/apps/uptime-kuma/1.23.13/scripts/init.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish." diff --git a/apps/uptime-kuma/1.23.13/scripts/upgrade.sh b/apps/uptime-kuma/1.23.13/scripts/upgrade.sh index c211154a7..77b849120 100644 --- a/apps/uptime-kuma/1.23.13/scripts/upgrade.sh +++ b/apps/uptime-kuma/1.23.13/scripts/upgrade.sh @@ -5,6 +5,7 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "Check Finish."