feat: fix scripts and build speed (#790)

* feat: fix scripts and build speed Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add docker compose file Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * fix: fix image Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add chat scripts design Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --------- Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
1 year ago · 7a448b35d4
parent 594b16374b
commit 7a448b35d4
20 changed files with 21 additions and 29 deletions
--- a/.github/workflows/scripts-test.yml
+++ b/.github/workflows/scripts-test.yml
@ -40,10 +40,13 @@ jobs:
    - name: Checkout code
      uses: actions/checkout@v3

+    - name: Download Docker Compose
+      run: |
+        curl -o docker-compose.yaml https://gist.githubusercontent.com/cubxxw/b1d5cbd2edfa23fee911118aa3e8249e/raw/openim-server.sh
+      shell: bash
+
    - name: Start Docker Compose
      run: |
-        sudo docker compose stop
-        sudo sleep 30
        sudo docker compose up -d
        sudo sleep 60
      continue-on-error: true
--- a/6
+++ b/6
@ -16,8 +16,8 @@ RUN go mod download
 # Copy all files to the container
 ADD . .

-RUN /bin/sh -c "make clean"
-RUN /bin/sh -c "make build"
+RUN make clean
+RUN make build

 FROM ghcr.io/openim-sigs/openim-bash-image:latest

@ -28,6 +28,4 @@ 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/platforms /openim/openim-server/_output/bin/platforms

-VOLUME ["/openim/openim-server/logs","/openim/openim-server/config","/openim/openim-server/scripts"]
-
 CMD ["bash","-c","${OPENIM_SERVER_CMDDIR}/docker_start_all.sh"]
--- a/build/docker/openim-api/Dockerfile
+++ b/build/docker/openim-api/Dockerfile
@ -43,4 +43,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config

 EXPOSE ${10002}

-CMD ["sh","-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-api --port 10002 -c ${SERVER_WORKDIR}/config"]
+CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-api --port 10002 -c ${SERVER_WORKDIR}/config"]
--- a/build/docker/openim-cmdutils/Dockerfile
+++ b/build/docker/openim-cmdutils/Dockerfile
@ -42,4 +42,4 @@ WORKDIR /openim/openim-server
 COPY --from=builder ${SERVER_WORKDIR}/_output/bin/platforms /openim/openim-server/_output/bin/platforms
 COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config

-CMD ["sh","-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-cmdutils"]
+CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-cmdutils"]
--- a/build/docker/openim-crontask/Dockerfile
+++ b/build/docker/openim-crontask/Dockerfile
@ -41,4 +41,4 @@ WORKDIR /openim/openim-server
 COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
 COPY --from=builder /openim/openim-server/config /openim/openim-server/config

-CMD ["sh","-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-crontask"]
+CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-crontask"]
--- a/build/docker/openim-rpc-auth/Dockerfile
+++ b/build/docker/openim-rpc-auth/Dockerfile
@ -49,4 +49,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config

 EXPOSE 10160

-CMD ["sh","-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-auth --port 10160 -c ${SERVER_WORKDIR}/config"]
+CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-auth --port 10160 -c ${SERVER_WORKDIR}/config"]
--- a/build/docker/openim-rpc-conversation/Dockerfile
+++ b/build/docker/openim-rpc-conversation/Dockerfile
@ -56,4 +56,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 EXPOSE 10230
 EXPOSE 20230

-CMD ["sh","-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-conversation --port 10230 --prometheus_port 20230 -c ${SERVER_WORKDIR}/config"]
+CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-conversation --port 10230 --prometheus_port 20230 -c ${SERVER_WORKDIR}/config"]
--- a/build/docker/openim-rpc-friend/Dockerfile
+++ b/build/docker/openim-rpc-friend/Dockerfile
@ -56,4 +56,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 EXPOSE 10120
 EXPOSE 20120

-CMD ["sh","-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-friend --port 10120 --prometheus_port 20120 -c ${SERVER_WORKDIR}/config"]
+CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-friend --port 10120 --prometheus_port 20120 -c ${SERVER_WORKDIR}/config"]
--- a/build/docker/openim-rpc-group/Dockerfile
+++ b/build/docker/openim-rpc-group/Dockerfile
@ -56,4 +56,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 EXPOSE 10150
 EXPOSE 20150

-CMD ["sh","-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-group --port 10150 --prometheus_port 20150 -c ${SERVER_WORKDIR}/config"]
+CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-group --port 10150 --prometheus_port 20150 -c ${SERVER_WORKDIR}/config"]
--- a/build/docker/openim-rpc-msg/Dockerfile
+++ b/build/docker/openim-rpc-msg/Dockerfile
@ -56,4 +56,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config
 EXPOSE 10130
 EXPOSE 20130

-CMD ["sh","-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-msg --port 10130 --prometheus_port 20130 -c ${SERVER_WORKDIR}/config"]
+CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-msg --port 10130 --prometheus_port 20130 -c ${SERVER_WORKDIR}/config"]
--- a/build/docker/openim-rpc-third/Dockerfile
+++ b/build/docker/openim-rpc-third/Dockerfile
@ -55,4 +55,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config

 EXPOSE 10200

-CMD ["sh","-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-third --port 10200 -c ${SERVER_WORKDIR}/config"]
+CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-third --port 10200 -c ${SERVER_WORKDIR}/config"]
--- a/build/docker/openim-rpc-user/Dockerfile
+++ b/build/docker/openim-rpc-user/Dockerfile
@ -55,4 +55,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config

 EXPOSE 10110

-CMD ["sh","-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-user --port 10110 -c ${SERVER_WORKDIR}/config"]
+CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-user --port 10110 -c ${SERVER_WORKDIR}/config"]
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@ -52,7 +52,6 @@ services:
      net.core.somaxconn: 1024
    command: redis-server --requirepass ${PASSWORD} --appendonly yes

-
  zookeeper:
    image: wurstmeister/zookeeper
    ports:
@ -64,7 +63,6 @@ services:
      TZ: Asia/Shanghai
    restart: always

-
  kafka:
    image: wurstmeister/kafka
    container_name: kafka
@ -98,9 +96,8 @@ services:
    restart: always
    command: minio server /data --console-address ':9090'

-
  openim_server:
-    image: ghcr.io/openim-sigs/openim-server:v1.0.0-debug.11 #ghcr.io/openimsdk/openim-server:main
+    image: ghcr.io/openimsdk/openim-server:latest
    container_name: openim-server
    volumes:
      - ./logs:/openim/openim-server/logs
@ -122,7 +119,7 @@ services:
        max-file: "2"

  openim-chat:
-    image: ghcr.io/openim-sigs/openim-chat:v1.0.0-debug.11 # ghcr.io/openimsdk/openim-chat:main
+    image: ghcr.io/openimsdk/openim-chat:latest
    container_name: openim-chat
    volumes:
      - ./_output/openim/openim-chat/logs:/openim/openim-chat/logs
--- a/pkg/common/db/controller/user.go
+++ b/pkg/common/db/controller/user.go
@ -16,10 +16,10 @@ package controller

 import (
 	"context"
-	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
-	"github.com/OpenIMSDK/protocol/user"
+	"time"

 	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
+	"github.com/OpenIMSDK/protocol/user"

 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/tx"
--- a/scripts/msg_gateway_start.sh
+++ b/scripts/msg_gateway_start.sh
@ -30,7 +30,6 @@ echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"

 bin_dir="$BIN_DIR"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"

 ulimit -n 200000

--- a/scripts/msg_transfer_start.sh
+++ b/scripts/msg_transfer_start.sh
@ -28,7 +28,6 @@ echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"

 bin_dir="$BIN_DIR"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"

 cd $OPENIM_ROOT

--- a/scripts/push_start.sh
+++ b/scripts/push_start.sh
@ -32,7 +32,6 @@ echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"

 bin_dir="$BIN_DIR"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"

 cd "$OPENIM_ROOT/scripts/"

--- a/scripts/start_all.sh
+++ b/scripts/start_all.sh
@ -38,7 +38,6 @@ fi

 bin_dir="$OPENIM_ROOT/_output/bin"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"

 if [ ! -d "$bin_dir" ]; then
    mkdir -p "$bin_dir"
--- a/scripts/start_cron.sh
+++ b/scripts/start_cron.sh
@ -30,7 +30,6 @@ echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"

 bin_dir="$BIN_DIR"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"

 #Check if the service exists
 #If it is exists,kill this process
--- a/scripts/stop_all.sh
+++ b/scripts/stop_all.sh
@ -23,7 +23,6 @@ source $OPENIM_ROOT/scripts/path_info.sh

 bin_dir="$BIN_DIR"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"

 cd "$SCRIPTS_ROOT"