From 64d6b0432087551313a8ea01eab9b28f204b6dfa Mon Sep 17 00:00:00 2001 From: Xinwei Xiong <3293172751NSS@gmail.com> Date: Mon, 15 Jan 2024 16:39:44 +0800 Subject: [PATCH] feat: add openim docker compose deployment github comment (#1769) * feat: add openim v3.4 and v3.5 changelog Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com> * feat: add openim github comment Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com> * fix: fix openim docker compose images version form github comment Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com> * fix: fix openim docker compose images version form github comment Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com> --------- Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com> --- config/templates/env.template | 8 -------- deployments/templates/env-template.yaml | 4 ---- docker-compose.yml | 10 ++-------- scripts/install/environment.sh | 2 -- tools/openim-web/README.md | 1 - 5 files changed, 2 insertions(+), 23 deletions(-) diff --git a/config/templates/env.template b/config/templates/env.template index ffcec89e5..a606704c5 100644 --- a/config/templates/env.template +++ b/config/templates/env.template @@ -176,18 +176,10 @@ GRAFANA_PORT=13000 # ============ OpenIM Web =============== # ====================================== -# Path to the OpenIM web distribution. -# Default: OPENIM_WEB_DIST_PATH=/app/dist -OPENIM_WEB_DIST_PATH=/app/dist - # Port on which OpenIM web service is running. # Default: OPENIM_WEB_PORT=11001 OPENIM_WEB_PORT=11001 -# Address or hostname for the OpenIM web service. -# Default: OPENIM_WEB_ADDRESS=172.28.0.1 -OPENIM_WEB_ADDRESS=172.28.0.7 - # ====================================== # ========= OpenIM Server ============== # ====================================== diff --git a/deployments/templates/env-template.yaml b/deployments/templates/env-template.yaml index e7166ff2d..cbe900c19 100644 --- a/deployments/templates/env-template.yaml +++ b/deployments/templates/env-template.yaml @@ -171,10 +171,6 @@ GRAFANA_PORT=${GRAFANA_PORT} # ============ OpenIM Web =============== # ====================================== -# Path to the OpenIM web distribution. -# Default: OPENIM_WEB_DIST_PATH=/app/dist -OPENIM_WEB_DIST_PATH=${OPENIM_WEB_DIST_PATH} - # Port on which OpenIM web service is running. # Default: OPENIM_WEB_PORT=11001 OPENIM_WEB_PORT=${OPENIM_WEB_PORT} diff --git a/docker-compose.yml b/docker-compose.yml index 78632f163..e4449b5ad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -114,9 +114,6 @@ services: openim-web: image: ${IMAGE_REGISTRY:-ghcr.io/openimsdk}/openim-web:${OPENIM_WEB_IMAGE_VERSION:-v3.5.0-docker} container_name: openim-web - environment: - - OPENIM_WEB_DIST_PATH=${OPENIM_WEB_DIST_PATH:-/app/dist} - - OPENIM_WEB_PORT=${OPENIM_WEB_PORT:-11001} restart: always ports: - "${OPENIM_WEB_PORT:-11001}:80" @@ -201,9 +198,6 @@ services: # - "${DATA_DIR:-./}/components/openim-chat/config:/openim/openim-chat/config" # restart: always # # user: root:root - # depends_on: - # openim-server: - # condition: service_healthy # logging: # driver: json-file # options: @@ -215,8 +209,8 @@ services: # openim-admin: # # https://github.com/openimsdk/open-im-server/issues/1662 - # image: ${IMAGE_REGISTRY:-ghcr.io/openimsdk}/openim-admin:${ADMIN_FRONT_VERSION:-toc-base-open-docker.35} - # container_name: openim-admin + # image: ${IMAGE_REGISTRY:-ghcr.io/openimsdk}/openim-admin:${ADMIN_FRONT_VERSION:-toc-base-open-docker.35} + # container_name: openim-admin # restart: always # ports: # - "${OPENIM_ADMIN_FRONT_PORT:-11002}:80" diff --git a/scripts/install/environment.sh b/scripts/install/environment.sh index f84cb924a..41a70c64d 100755 --- a/scripts/install/environment.sh +++ b/scripts/install/environment.sh @@ -243,8 +243,6 @@ def "KAFKA_CONSUMERGROUPID_PUSH" "push" # `Kafka` 的消费 ###################### openim-web 配置信息 ###################### 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的端口 diff --git a/tools/openim-web/README.md b/tools/openim-web/README.md index afd5e9a96..5794a946d 100644 --- a/tools/openim-web/README.md +++ b/tools/openim-web/README.md @@ -37,7 +37,6 @@ Variables can be set as above, Environment variables can also be set example: ```bash -$ export OPENIM_WEB_DIST_PATH="/app/dist" $ export OPENIM_WEB_PPRT="11001" ```