From 1ecfbb656311659d4f1a4181fdb9d025b376dcb3 Mon Sep 17 00:00:00 2001
From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com>
Date: Fri, 8 Sep 2023 23:03:22 +0800
Subject: [PATCH] fix: fix openim web port

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
---
 Dockerfile                     | 4 ++--
 docker-compose.yml             | 4 ++--
 scripts/install/openim-push.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5bd3930e0..f738d4457 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ WORKDIR ${SERVER_WORKDIR}
 
 # Copy scripts and binary files to the production image
 COPY --from=builder ${OPENIM_SERVER_BINDIR} /openim/openim-server/_output/bin
-COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts
-COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config
+# COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts
+# COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config
 
 CMD ["/openim/openim-server/scripts/docker-start-all.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 126409d3d..b42bb0505 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -166,7 +166,7 @@ services:
 
 #   openim-server:
 #     # image: ghcr.io/openimsdk/openim-server:main
-#     image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:main
+#     image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:release-v3.3
 #     # image: openim/openim-server:main
 # #    build: .
 #     container_name: openim-server
@@ -180,7 +180,7 @@ services:
 #       retries: 5
 #     volumes:
 #       - ./logs:/openim/openim-server/logs
-#       - ./_output:/openim/openim-server/_output
+#       - ./_output/logs:/openim/openim-server/_output/logs
 #       - ./config:/openim/openim-server/config
 #       - ./scripts:/openim/openim-server/scripts
 #     restart: always
diff --git a/scripts/install/openim-push.sh b/scripts/install/openim-push.sh
index e57edfaf6..aa5ebe7d4 100755
--- a/scripts/install/openim-push.sh
+++ b/scripts/install/openim-push.sh
@@ -71,7 +71,7 @@ function openim::push::start()
 
     for (( i=0; i<${#OPENIM_PUSH_PORTS_ARRAY[@]}; i++ )); do
         openim::log::info "start push process, port: ${OPENIM_PUSH_PORTS_ARRAY[$i]}, prometheus port: ${PUSH_PROM_PORTS_ARRAY[$i]}"
-        nohup ${OPENIM_PUSH_BINARY} --port ${OPENIM_PUSH_PORTS_ARRAY[$i]} --prometheus_port ${PUSH_PROM_PORTS_ARRAY[$i]} >> ${LOG_FILE} 2>&1 &
+        nohup ${OPENIM_PUSH_BINARY} --port ${OPENIM_PUSH_PORTS_ARRAY[$i]} -c ${OPENIM_PUSH_CONFIG} --prometheus_port ${PUSH_PROM_PORTS_ARRAY[$i]} >> ${LOG_FILE} 2>&1 &
     done
 
     openim::util::check_process_names ${SERVER_NAME}