From ac8716889d02b4416c2e42670707852ecad17734 Mon Sep 17 00:00:00 2001 From: "lin.huang" Date: Mon, 13 Nov 2023 17:12:46 +0800 Subject: [PATCH] add openim_admin_front service --- deployments/templates/env_template.yaml | 11 +++++++++-- docker-compose.yml | 9 +++++++++ scripts/install/environment.sh | 5 +++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/deployments/templates/env_template.yaml b/deployments/templates/env_template.yaml index 3d52d3ee6..5c8e2628e 100644 --- a/deployments/templates/env_template.yaml +++ b/deployments/templates/env_template.yaml @@ -102,7 +102,10 @@ GRAFANA_NETWORK_ADDRESS=${GRAFANA_NETWORK_ADDRESS} # Address or hostname for the node_exporter network. # Default: NODE_EXPORTER_NETWORK_ADDRESS=172.28.0.13 NODE_EXPORTER_NETWORK_ADDRESS=${NODE_EXPORTER_NETWORK_ADDRESS} - + +# Address or hostname for the OpenIM admin network. +# Default: OPENIM_ADMIN_NETWORK_ADDRESS=172.28.0.14 +OPENIM_ADMIN_FRONT_NETWORK_ADDRESS=${OPENIM_ADMIN_FRONT_NETWORK_ADDRESS} # =============================================== # = Component Extension Configuration = @@ -298,4 +301,8 @@ PROMETHEUS_PORT=${PROMETHEUS_PORT} # Port for the grafana. # Default: GRAFANA_PORT=3000 -GRAFANA_PORT=${GRAFANA_PORT} \ No newline at end of file +GRAFANA_PORT=${GRAFANA_PORT} + +# Port for the admin front. +# Default: OPENIM_ADMIN_FRONT_PORT=11002 +OPENIM_ADMIN_FRONT_PORT=${OPENIM_ADMIN_FRONT_PORT} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 84df8f07b..10b094446 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -141,6 +141,15 @@ services: networks: server: ipv4_address: ${OPENIM_WEB_NETWORK_ADDRESS} + openim-admin: + image: ${IMAGE_REGISTRY}/openim-admin:latest + container_name: openim-admin + restart: always + ports: + - "${OPENIM_ADMIN_FRONT_PORT}:80" + networks: + server: + ipv4_address: ${OPENIM_ADMIN_FRONT_NETWORK_ADDRESS} prometheus: image: prom/prometheus diff --git a/scripts/install/environment.sh b/scripts/install/environment.sh index 169b45e54..abe47604a 100755 --- a/scripts/install/environment.sh +++ b/scripts/install/environment.sh @@ -118,6 +118,8 @@ LAST_OCTET=$((LAST_OCTET + 1)) GRAFANA_NETWORK_ADDRESS=$(generate_ip) LAST_OCTET=$((LAST_OCTET + 1)) NODE_EXPORTER_NETWORK_ADDRESS=$(generate_ip) +LAST_OCTET=$((LAST_OCTET + 1)) +OPENIM_ADMIN_FRONT_NETWORK_ADDRESS=$(generate_ip) ###################### openim 配置 ###################### # read: https://github.com/openimsdk/open-im-server/blob/main/deployment/README.md def "OPENIM_DATA_DIR" "/data/openim" @@ -243,6 +245,9 @@ def "OPENIM_WEB_PORT" "11001" # openim-web的端口 def "OPENIM_WEB_ADDRESS" "${DOCKER_BRIDGE_GATEWAY}" # openim-web的地址 def "OPENIM_WEB_DIST_PATH" "/app/dist" # openim-web的dist路径 +###################### openim-admin-front 配置信息 ###################### +def "OPENIM_ADMIN_FRONT_PORT" "11002" # openim-admin-front的端口 + ###################### RPC 配置信息 ###################### def "RPC_REGISTER_IP" # RPC的注册IP def "RPC_LISTEN_IP" "0.0.0.0" # RPC的监听IP