Merge remote-tracking branch 'origin/add_set_ex_friend' into add_set_ex_friend

2 years ago · 4305d50596
parent e09bc6541a 2be76542aa
commit 4305d50596
6 changed files with 56 additions and 28 deletions
--- 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 ==============
 # ======================================
--- 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}
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -94,7 +94,7 @@ services:
        ipv4_address: ${KAFKA_NETWORK_ADDRESS:-172.28.0.4}

  minio:
-    image: minio/minio:${MINIO_IMAGE_VERSION:-latest}
+    image: minio/minio:${MINIO_IMAGE_VERSION:-RELEASE.2024-01-11T07-46-16Z}
    ports:
      - "${MINIO_PORT:-10005}:9000"
      - "9090:9090"
@ -112,14 +112,12 @@ services:
        ipv4_address: ${MINIO_NETWORK_ADDRESS:-172.28.0.6}

  openim-web:
-    image: ${IMAGE_REGISTRY:-ghcr.io/openimsdk}/openim-web:${OPENIM_WEB_IMAGE_VERSION:-latest}
+    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}
+    platform: linux/amd64
    restart: always
    ports:
-      - "${OPENIM_WEB_PORT:-11001}:11001"
+      - "${OPENIM_WEB_PORT:-11001}:80"
    networks:
      server:
        ipv4_address: ${OPENIM_WEB_NETWORK_ADDRESS:-172.28.0.7}
@ -127,8 +125,55 @@ services:
 ### TODO: Uncomment, or deploy using openim docker: https://github.com/openimsdk/openim-docker
  # Uncomment and configure the following services as needed

+  # openim-server:
+  #   image: ${IMAGE_REGISTRY:-ghcr.io/openimsdk}/openim-server:${SERVER_IMAGE_VERSION:-main}
+  #   container_name: openim-server
+  #   ports:
+  #     - "${OPENIM_WS_PORT:-10001}:${OPENIM_WS_PORT:-10001}"
+  #     - "${API_OPENIM_PORT:-10002}:${API_OPENIM_PORT:-10002}"
+  #     - "${API_PROM_PORT:-20100}:${API_PROM_PORT:-20100}"
+  #     - "${USER_PROM_PORT:-20110}:${USER_PROM_PORT:-20110}"
+  #     - "${FRIEND_PROM_PORT:-20120}:${FRIEND_PROM_PORT:-20120}"
+  #     - "${MESSAGE_PROM_PORT:-20130}:${MESSAGE_PROM_PORT:-20130}"
+  #     - "${MSG_GATEWAY_PROM_PORT:-20140}:${MSG_GATEWAY_PROM_PORT:-20140}"
+  #     - "${GROUP_PROM_PORT:-20150}:${GROUP_PROM_PORT:-20150}"
+  #     - "${AUTH_PROM_PORT:-20160}:${AUTH_PROM_PORT:-20160}"
+  #     - "${PUSH_PROM_PORT:-20170}:${PUSH_PROM_PORT:-20170}"
+  #     - "${CONVERSATION_PROM_PORT:-20230}:${CONVERSATION_PROM_PORT:-20230}"
+  #     - "${RTC_PROM_PORT:-21300}:${RTC_PROM_PORT:-21300}"
+  #     - "${THIRD_PROM_PORT:-21301}:${THIRD_PROM_PORT:-21301}"
+  #     - "21400-21403:21400-21403"
+  #   healthcheck:
+  #     test: ["CMD", "/openim/openim-server/scripts/check-all.sh"]
+  #     interval: 120s
+  #     timeout: 30s
+  #     retries: 5
+  #   env_file:
+  #     - .env
+  #   environment:
+  #     - OPENIM_IP=${OPENIM_IP:-127.0.0.1}
+  #   volumes:
+  #     - "${DATA_DIR:-./}/openim-server/logs:/openim/openim-server/logs"
+  #     - "${DATA_DIR:-./}/openim-server/_output/logs:/openim/openim-server/_output/logs"
+  #     - "${DATA_DIR:-./}/openim-server/config:/openim/openim-server/config"
+  #   restart: always
+  #   depends_on:
+  #     - kafka
+  #     - mysql
+  #     - mongodb
+  #     - redis
+  #     - minio
+  #   logging:
+  #     driver: json-file
+  #     options:
+  #       max-size: "1g"
+  #       max-file: "2"
+  #   networks:
+  #     server:
+  #       ipv4_address: ${OPENIM_SERVER_NETWORK_ADDRESS:-172.28.0.8}
+
  # openim-chat:
-  #   image: ${IMAGE_REGISTRY:-ghcr.io/openimsdk}/openim-chat:${CHAT_IMAGE_VERSION:-latest}
+  #   image: ${IMAGE_REGISTRY:-ghcr.io/openimsdk}/openim-chat:${CHAT_IMAGE_VERSION:-main}
  #   container_name: openim-chat
  #   healthcheck:
  #     test: ["CMD", "/openim/openim-chat/scripts/check_all.sh"]
@ -154,9 +199,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:
@ -168,8 +210,9 @@ 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
+  #   platform: linux/amd64
  #   restart: always
  #   ports:
  #     - "${OPENIM_ADMIN_FRONT_PORT:-11002}:80"
--- 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的端口
--- a/scripts/lib/util.sh
+++ b/scripts/lib/util.sh
@ -311,7 +311,7 @@ openim::util::check_ports() {
            fi
        elif [[ "$OSTYPE" == "darwin"* ]]; then
            # For macOS, use lsof
-            info=$(lsof -i:"$port" | grep "\*:$port" || true)
+            info=$(lsof -P -i:"$port" | grep "LISTEN" || true)
        fi

        # Check if any process is using the port
--- 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"
 ```