fix: scripts path

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

.env

@@ -1,5 +1,5 @@
 USER=root
 PASSWORD=openIM123
-MINIO_ENDPOINT=http://127.0.0.1:10005
-API_URL=http://127.0.0.1:10002/object/
+MINIO_ENDPOINT=http://116.30.3.14:10005
+API_URL=http://116.30.3.14:10002/object/
 DATA_DIR=./

Dockerfile

@@ -8,19 +8,21 @@ ENV GO111MODULE=$GO111MODULE
 ENV GOPROXY=$GOPROXY
 
 # Set up the working directory
-WORKDIR /Open-IM-Server
+WORKDIR /openim/openim-server
 
 # Copy all files to the container
 ADD . .
 
+RUN /bin/sh -c "make clean"
 RUN /bin/sh -c "make build"
 
 FROM ghcr.io/openim-sigs/openim-bash-image:latest
 
-# Copy scripts and binary files to the production image
-COPY --from=builder /Open-IM-Server/scripts /Open-IM-Server/scripts
-COPY --from=builder /Open-IM-Server/_output/bin/platforms/linux/amd64 /Open-IM-Server/_output/bin/platforms/linux/amd64
+WORKDIR ${SERVER_WORKDIR}
 
-WORKDIR /Open-IM-Server/scripts
+# Copy scripts and binary files to the production image
+COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts
+COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config
+COPY --from=builder ${SERVER_WORKDIR}/_output/bin/ /openim/openim-server/_output/bin/
 
-CMD ["./docker_start_all.sh"]
+CMD ["sh","-c","${OPENIM_SERVER_CMDDIR}/docker_start_all.sh"]

config/config.yaml

@@ -126,10 +126,10 @@ api:
 # Configuration for Aliyun OSS
 object:
   enable: "minio"                         
-  apiURL: http://127.0.0.1:10002/object/
+  apiURL: http://116.30.3.14:10002/object/
   minio:
     bucket: "openim"                      
-    endpoint: http://127.0.0.1:10005
+    endpoint: http://116.30.3.14:10005
     accessKeyID: root
     secretAccessKey: openIM123
     sessionToken: ""                      

scripts/docker_start_all.sh

@@ -22,11 +22,11 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 #fixme Put the shell scripts name here
 need_to_start_server_shell=(
-  start_rpc_service.sh
-  msg_gateway_start.sh
-  push_start.sh
-  msg_transfer_start.sh
-  start_cron.sh
+  ${SCRIPTS_ROOT}/start_rpc_service.sh
+  ${SCRIPTS_ROOT}/msg_gateway_start.sh
+  ${SCRIPTS_ROOT}/push_start.sh
+  ${SCRIPTS_ROOT}/msg_transfer_start.sh
+  ${SCRIPTS_ROOT}/start_cron.sh
 )
 
 #fixme The 10 second delay to start the project is for the docker-compose one-click to start openIM when the infrastructure dependencies are not started
@@ -41,8 +41,7 @@ echo "==========================================================">>$OPENIM_ROOT/
 echo "==========================================================">>$OPENIM_ROOT/logs/openIM.log 2>&1 &
 echo "==========================================================">>$OPENIM_ROOT/logs/openIM.log 2>&1 &
 for i in ${need_to_start_server_shell[*]}; do
-  chmod +x $i
-  ./$i
+  $i
 done
 
 sleep 15

scripts/make-rules/golang.mk

@@ -26,7 +26,7 @@ GO_LDFLAGS += -X $(VERSION_PACKAGE).gitVersion=$(GIT_TAG) \
 	-s -w		# -s -w deletes debugging information and symbol tables
 ifeq ($(DEBUG), 1)
 	GO_BUILD_FLAGS += -gcflags "all=-N -l"
-	GO_LDFLAGS =
+	GO_LDFLAGS=
 endif
 
 GO_BUILD_FLAGS += -ldflags "$(GO_LDFLAGS)"