(refactor) Remove env files and scripts, update config files
This commit is contained in:
@@ -1,47 +1,49 @@
|
||||
additionalProperties:
|
||||
formFields:
|
||||
- default: "/home/wukongim"
|
||||
- default: ""
|
||||
edit: true
|
||||
envKey: WUKONGIM_ROOT_PATH
|
||||
labelZh: 数据持久化路径
|
||||
labelEn: Data persistence path
|
||||
envKey: EXTERNAL_IP
|
||||
labelEn: ipAddress
|
||||
labelZh: 外部访问 IP
|
||||
required: true
|
||||
type: text
|
||||
- default: 5300
|
||||
- default: "5001"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_HTTP
|
||||
labelZh: WebUI 端口
|
||||
labelEn: WebUI port
|
||||
envKey: PANEL_APP_PORT_WK_API
|
||||
labelEn: WuKongIM api port
|
||||
labelZh: 悟空 IM api 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: 5001
|
||||
envKey: PANEL_APP_PORT_WK_API
|
||||
labelZh: API 端口
|
||||
labelEn: API port
|
||||
required: true
|
||||
type: number
|
||||
- default: 5100
|
||||
- default: "5100"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_WK_TCP
|
||||
labelZh: TCP端口
|
||||
labelEn: Tcp port
|
||||
labelEn: WuKongIM tcp port
|
||||
labelZh: 悟空 IM TCP 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: 5200
|
||||
- default: "5200"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_WK_WS
|
||||
labelZh: WebSocket 端口
|
||||
labelEn: WebSocket port
|
||||
labelEn: WuKongIM ws port
|
||||
labelZh: 悟空 IM WS 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: 5172
|
||||
- default: "5300"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_HTTP
|
||||
labelEn: WuKongIM web port
|
||||
labelZh: 悟空 IM 监控端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "5172"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_WK_DEMO_SERVER
|
||||
labelZh: 悟空IM演示端口
|
||||
labelEn: WuKongIM demo port
|
||||
labelZh: 悟空 IM demo 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "127.0.0.1"
|
||||
envKey: WK_EXTERNAL_IP
|
||||
labelZh: 服务器IP
|
||||
labelEn: Server IP
|
||||
required: true
|
||||
type: text
|
||||
|
||||
@@ -1,26 +1,28 @@
|
||||
services:
|
||||
wukongim:
|
||||
container_name: ${CONTAINER_NAME}
|
||||
image: "wukongim/wukongim:v1.2.6"
|
||||
restart: always
|
||||
ports:
|
||||
- "${PANEL_APP_PORT_WK_API}:5001"
|
||||
- "${PANEL_APP_PORT_WK_TCP}:5100"
|
||||
- "${PANEL_APP_PORT_WK_WS}:5200"
|
||||
- "${PANEL_APP_PORT_HTTP}:5300"
|
||||
- "${PANEL_APP_PORT_WK_DEMO_SERVER}:5172"
|
||||
volumes:
|
||||
- ./wukongim:/root/wukongim
|
||||
environment:
|
||||
- WK_MODE=release
|
||||
- WK_EXTERNAL_IP=${EXTERNAL_IP}
|
||||
- WK_CONVERSATION_ON=true
|
||||
- WK_WEBHOOK_GRPCADDR=tangsengdaodaoserver:6979
|
||||
- WK_DATASOURCE_ADDR=http://tangsengdaodaoserver:8090/v1/datasource
|
||||
- WK_DATASOURCE_CHANNELINFOON=true
|
||||
- WK_TOKENAUTHON=true
|
||||
networks:
|
||||
- 1panel-network
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
networks:
|
||||
1panel-network:
|
||||
external: true
|
||||
|
||||
services:
|
||||
wukongim:
|
||||
image: wukongim/wukongim:v1.2.6
|
||||
container_name: ${CONTAINER_NAME}
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
restart: always
|
||||
networks:
|
||||
- 1panel-network
|
||||
ports:
|
||||
- ${PANEL_APP_PORT_HTTP}:5300
|
||||
- ${PANEL_APP_PORT_WK_API}:5001
|
||||
- ${PANEL_APP_PORT_WK_TCP}:5100
|
||||
- ${PANEL_APP_PORT_WK_WS}:5200
|
||||
- ${PANEL_APP_PORT_WK_DEMO_SERVER}:5172
|
||||
env_file:
|
||||
- ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
|
||||
- ${ENV_FILE:-/etc/1panel/envs/default.env}
|
||||
volumes:
|
||||
- ${WUKONGIM_ROOT_PATH}/wukongim:/root/wukongim
|
||||
environment:
|
||||
- WK_MODE=release
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
# copyright© 2024 XinJiang Ms Studio
|
||||
ENV_FILE=.env
|
||||
@@ -1,2 +0,0 @@
|
||||
# copyright© 2024 XinJiang Ms Studio
|
||||
TZ=Asia/Shanghai
|
||||
@@ -1,17 +0,0 @@
|
||||
#!/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
|
||||
@@ -1,10 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ -f .env ]; then
|
||||
source .env
|
||||
|
||||
echo "Check Finish."
|
||||
|
||||
else
|
||||
echo "Error: .env file not found."
|
||||
fi
|
||||
@@ -1,17 +0,0 @@
|
||||
#!/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
|
||||
@@ -1,49 +0,0 @@
|
||||
additionalProperties:
|
||||
formFields:
|
||||
- default: ""
|
||||
edit: true
|
||||
envKey: EXTERNAL_IP
|
||||
labelEn: ipAddress
|
||||
labelZh: 外部访问 IP
|
||||
required: true
|
||||
type: text
|
||||
- default: "5001"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_WK_API
|
||||
labelEn: WuKongIM api port
|
||||
labelZh: 悟空 IM api 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "5100"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_WK_TCP
|
||||
labelEn: WuKongIM tcp port
|
||||
labelZh: 悟空 IM TCP 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "5200"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_WK_WS
|
||||
labelEn: WuKongIM ws port
|
||||
labelZh: 悟空 IM WS 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "5300"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_HTTP
|
||||
labelEn: WuKongIM web port
|
||||
labelZh: 悟空 IM 监控端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "5172"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_WK_DEMO_SERVER
|
||||
labelEn: WuKongIM demo port
|
||||
labelZh: 悟空 IM demo 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
@@ -1,28 +0,0 @@
|
||||
services:
|
||||
wukongim:
|
||||
container_name: ${CONTAINER_NAME}
|
||||
image: "registry.cn-shanghai.aliyuncs.com/wukongim/wukongim:v1.2"
|
||||
restart: always
|
||||
ports:
|
||||
- "${PANEL_APP_PORT_WK_API}:5001"
|
||||
- "${PANEL_APP_PORT_WK_TCP}:5100"
|
||||
- "${PANEL_APP_PORT_WK_WS}:5200"
|
||||
- "${PANEL_APP_PORT_HTTP}:5300"
|
||||
- "${PANEL_APP_PORT_WK_DEMO_SERVER}:5172"
|
||||
volumes:
|
||||
- ./wukongim:/root/wukongim
|
||||
environment:
|
||||
- WK_MODE=release
|
||||
- WK_EXTERNAL_IP=${EXTERNAL_IP}
|
||||
- WK_CONVERSATION_ON=true
|
||||
- WK_WEBHOOK_GRPCADDR=tangsengdaodaoserver:6979
|
||||
- WK_DATASOURCE_ADDR=http://tangsengdaodaoserver:8090/v1/datasource
|
||||
- WK_DATASOURCE_CHANNELINFOON=true
|
||||
- WK_TOKENAUTHON=true
|
||||
networks:
|
||||
- 1panel-network
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
networks:
|
||||
1panel-network:
|
||||
external: true
|
||||
@@ -1,9 +0,0 @@
|
||||
CONTAINER_NAME="wukongim"
|
||||
EXTERNAL_IP="1.2.3.4"
|
||||
PANEL_APP_PORT_COMM=11110
|
||||
PANEL_APP_PORT_HTTP=5300
|
||||
PANEL_APP_PORT_STATS=9090
|
||||
PANEL_APP_PORT_WK_API=5001
|
||||
PANEL_APP_PORT_WK_DEMO_SERVER=5172
|
||||
PANEL_APP_PORT_WK_TCP=5100
|
||||
PANEL_APP_PORT_WK_WS=5200
|
||||
@@ -1,65 +0,0 @@
|
||||
additionalProperties:
|
||||
formFields:
|
||||
- default: ""
|
||||
edit: true
|
||||
envKey: EXTERNAL_IP
|
||||
labelEn: ipAddress
|
||||
labelZh: 外部访问 IP
|
||||
required: true
|
||||
type: text
|
||||
- default: "5001"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_WK_API
|
||||
labelEn: WuKongIM api port
|
||||
labelZh: 悟空 IM api 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "5100"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_WK_TCP
|
||||
labelEn: WuKongIM tcp port
|
||||
labelZh: 悟空 IM TCP 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "5200"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_WK_WS
|
||||
labelEn: WuKongIM ws port
|
||||
labelZh: 悟空 IM WS 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "5300"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_HTTP
|
||||
labelEn: WuKongIM web port
|
||||
labelZh: 悟空 IM 监控端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "5172"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_WK_DEMO_SERVER
|
||||
labelEn: WuKongIM demo port
|
||||
labelZh: 悟空 IM demo 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "11110"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_COMM
|
||||
labelEn: WuKongIM Node Communication Port
|
||||
labelZh: 悟空 IM 节点通讯端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: "9090"
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_STATS
|
||||
labelEn: Prometheus port
|
||||
labelZh: Prometheus 端口
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
@@ -1,43 +0,0 @@
|
||||
services:
|
||||
wukongim: # WuKongIM服务
|
||||
container_name: ${CONTAINER_NAME}-wukongim
|
||||
image: "registry.cn-shanghai.aliyuncs.com/wukongim/wukongim:v2.0.5-20240925"
|
||||
environment:
|
||||
- "WK_CLUSTER_NODEID=1001"
|
||||
- "WK_CLUSTER_SERVERADDR=${EXTERNAL_IP}:${PANEL_APP_PORT_COMM}" # 节点内部通信请求地址
|
||||
- "WK_TRACE_PROMETHEUSAPIURL=http://wukongim-prometheus:9090" # prometheus监控地址
|
||||
- "WK_MODE=release" # release模式
|
||||
- "WK_EXTERNAL_IP=${EXTERNAL_IP}" # 服务器外网ip
|
||||
healthcheck:
|
||||
test: "wget -q -Y off -O /dev/null http://localhost:5001/health > /dev/null 2>&1"
|
||||
interval: 10s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
restart: always
|
||||
volumes:
|
||||
- ./wukongim_data:/root/wukongim # 数据挂载到物理机的目录
|
||||
ports:
|
||||
- ${PANEL_APP_PORT_WK_API}:5001 # http api 端口
|
||||
- ${PANEL_APP_PORT_WK_TCP}:5100 # tcp端口
|
||||
- ${PANEL_APP_PORT_WK_WS}:5200 # websocket端口
|
||||
- ${PANEL_APP_PORT_HTTP}:5300 # 管理端端口
|
||||
- ${PANEL_APP_PORT_WK_DEMO_SERVER}:5172 # demo端口
|
||||
- ${PANEL_APP_PORT_COMM}:11110 # 分布式节点通讯端口
|
||||
networks:
|
||||
- 1panel-network
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
wukongim-prometheus: # 监控服务
|
||||
container_name: ${CONTAINER_NAME}-prometheus
|
||||
image: "registry.cn-shanghai.aliyuncs.com/wukongim/prometheus:v2.53.1"
|
||||
volumes:
|
||||
- "./prometheus.yml:/etc/prometheus/prometheus.yml"
|
||||
ports:
|
||||
- "${PANEL_APP_PORT_STATS}:9090"
|
||||
networks:
|
||||
- 1panel-network
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
networks:
|
||||
1panel-network:
|
||||
external: true
|
||||
@@ -1,9 +0,0 @@
|
||||
global:
|
||||
scrape_interval: 10s
|
||||
evaluation_interval: 10s
|
||||
scrape_configs:
|
||||
- job_name: wukongim1-trace-metrics
|
||||
static_configs:
|
||||
- targets: ['wukongim:5300']
|
||||
labels:
|
||||
id: "1001"
|
||||
@@ -1,7 +1,7 @@
|
||||
services:
|
||||
wukongim: # WuKongIM服务
|
||||
container_name: ${CONTAINER_NAME}-wukongim
|
||||
image: wukongim/wukongim:v2.2.0-20250426
|
||||
image: "wukongim/wukongim:v2.2.0-20250426"
|
||||
environment:
|
||||
- "WK_CLUSTER_NODEID=1001"
|
||||
- "WK_CLUSTER_SERVERADDR=${EXTERNAL_IP}:${PANEL_APP_PORT_COMM}" # 节点内部通信请求地址
|
||||
|
||||
Reference in New Issue
Block a user