fix: docker release v3.1.1 images optimize

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

.env

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

.github/workflows/build-docker-image.yml

@@ -23,16 +23,20 @@ on:
       - v*
   workflow_dispatch:
 
+env:
+  # Common versions
+  GO_VERSION: "1.20"
+
 jobs:
-  build:
+  build-dockerhub:
     runs-on: ubuntu-latest
     steps:
-      - name: Check out the repo
+      - name: Checkout
         uses: actions/checkout@v3
-
+      - name: Set up QEMU
-      - name: Build OpenIM Server
+        uses: docker/setup-qemu-action@v2
-        run: |
+      - name: Set up Docker Buildx
-          sudo make build
+        uses: docker/setup-buildx-action@v2
 
 # docker.io/openim/openim-server:latest
       - name: Extract metadata (tags, labels) for Docker
@@ -40,6 +44,15 @@ jobs:
         uses: docker/metadata-action@v4.6.0
         with:
           images: openim/openim-server
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -51,10 +64,21 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
+          # linux/ppc64le,linux/s390x
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
+  build-aliyun:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 # registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:latest
       - name: Extract metadata (tags, labels) for Docker
         id: meta2
@@ -73,10 +97,21 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
+          # linux/ppc64le,linux/s390x
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta2.outputs.tags }}
           labels: ${{ steps.meta2.outputs.labels }}
 
+  build-ghcr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 # ghcr.io/openimsdk/openim-server:latest
       - name: Extract metadata (tags, labels) for Docker
         id: meta3
@@ -88,13 +123,15 @@ jobs:
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:
           context: .
+          # linux/ppc64le,linux/s390x
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta3.outputs.tags }}
           labels: ${{ steps.meta3.outputs.labels }}

.github/workflows/docker-buildx.yml

@@ -0,0 +1,320 @@
+# Copyright © 2023 OpenIM open source community. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Docker Buildx Images CI
+
+on:
+  schedule:
+  - cron: '30 1 * * *'
+  push:
+    branches:
+      - release-*
+    tags:
+      - v*
+  workflow_dispatch:
+
+jobs:
+  build-ghcr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
+
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+################################################
+# build/
+# └── docker
+#     ├── openim-api
+#     │   └── Dockerfile
+#     ├── openim-cmdutils
+#     │   └── Dockerfile
+#     ├── openim-crontask
+#     │   └── Dockerfile
+#     ├── openim-msggateway
+#     │   └── Dockerfile
+#     ├── openim-msgtransfer
+#     │   └── Dockerfile
+#     ├── openim-push
+#     │   └── Dockerfile
+#     ├── openim-rpc-auth
+#     │   └── Dockerfile
+#     ├── openim-rpc-conversation
+#     │   └── Dockerfile
+#     ├── openim-rpc-friend
+#     │   └── Dockerfile
+#     ├── openim-rpc-group
+#     │   └── Dockerfile
+#     ├── openim-rpc-msg
+#     │   └── Dockerfile
+#     ├── openim-rpc-third
+#     │   └── Dockerfile
+#     └── openim-rpc-user
+#         └── Dockerfile
+#############################################
+
+      - name: Extract metadata (tags, labels) for Docker openim-api
+        id: meta1
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-api
+
+      - name: Build and push Docker image for openim-api
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-api/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta1.outputs.tags }}
+          labels: ${{ steps.meta1.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Extract metadata (tags, labels) for Docker openim-cmdutils
+        id: meta2
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-cmdutils
+
+      - name: Build and push Docker image for openim-cmdutils
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-cmdutils/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta2.outputs.tags }}
+          labels: ${{ steps.meta2.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Extract metadata (tags, labels) for Docker openim-crontask
+        id: meta3
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-crontask
+
+      - name: Build and push Docker image for openim-crontask
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-crontask/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta3.outputs.tags }}
+          labels: ${{ steps.meta3.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Extract metadata (tags, labels) for Docker openim-msggateway
+        id: meta4
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-msggateway
+
+      - name: Build and push Docker image for openim-msggateway
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-msggateway/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta4.outputs.tags }}
+          labels: ${{ steps.meta4.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Extract metadata (tags, labels) for Docker openim-msgtransfer
+        id: meta5
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-msgtransfer
+
+      - name: Build and push Docker image for openim-msgtransfer
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-msgtransfer/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta5.outputs.tags }}
+          labels: ${{ steps.meta5.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          
+      - name: Extract metadata (tags, labels) for Docker openim-push
+        id: meta6
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-push
+
+      - name: Build and push Docker image for openim-push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-push/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta6.outputs.tags }}
+          labels: ${{ steps.meta6.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Extract metadata (tags, labels) for Docker openim-rpc-auth
+        id: meta7
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-rpc-auth
+
+      - name: Build and push Docker image for openim-rpc-auth
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-rpc-auth/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta7.outputs.tags }}
+          labels: ${{ steps.meta7.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Extract metadata (tags, labels) for Docker openim-rpc-conversation
+        id: meta8
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-rpc-conversation
+
+      - name: Build and push Docker image for openim-rpc-conversation
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-rpc-conversation/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta8.outputs.tags }}
+          labels: ${{ steps.meta8.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Extract metadata (tags, labels) for Docker openim-rpc-friend
+        id: meta9
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-rpc-friend
+
+      - name: Build and push Docker image for openim-rpc-friend
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-rpc-friend/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta9.outputs.tags }}
+          labels: ${{ steps.meta9.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Extract metadata (tags, labels) for Docker openim-rpc-group
+        id: meta10
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-rpc-group
+
+      - name: Build and push Docker image for openim-rpc-group
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-rpc-group/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta10.outputs.tags }}
+          labels: ${{ steps.meta10.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Extract metadata (tags, labels) for Docker openim-rpc-msg
+        id: meta11
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-rpc-msg
+
+      - name: Build and push Docker image for openim-rpc-msg
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-rpc-msg/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta11.outputs.tags }}
+          labels: ${{ steps.meta11.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Extract metadata (tags, labels) for Docker openim-rpc-third
+        id: meta12
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-rpc-third
+
+      - name: Build and push Docker image for openim-rpc-third
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-rpc-third/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta12.outputs.tags }}
+          labels: ${{ steps.meta12.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Extract metadata (tags, labels) for Docker openim-rpc-user
+        id: meta13
+        uses: docker/metadata-action@v4.6.0
+        with:
+          images: ghcr.io/openimsdk/openim-rpc-user
+
+      - name: Build and push Docker image for openim-rpc-user
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./build/docker/openim-rpc-user/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta13.outputs.tags }}
+          labels: ${{ steps.meta13.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/image.yml

@@ -1,96 +0,0 @@
-# Copyright © 2023 OpenIM open source community. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Build Image
-
-on:
-  push:
-    branches:
-      - main
-      - release-v*
-    paths:
-      - "**.go"
-      - "!**_test.go"
-      - "build/**"
-    tags:
-      - v*
-
-jobs:
-  release:
-    strategy:
-      matrix:
-        components: [core, swagger]
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 20
-      - uses: dorny/paths-filter@v2
-        if: ${{ !startsWith(github.ref_name, 'v') }}
-        id: changes
-        with:
-          filters: |
-            go:
-              - '**.go'
-              - 'build/core/Dockerfile'
-            api:
-              - 'openapi/**'
-              - 'build/swagger/build.sh'
-              - 'build/swagger/Dockerfile'
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          flavor: |
-            latest=false
-          images: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/openimsdk-${{ matrix.components }}
-            registry.cn-hangzhou.aliyuncs.com/${{ secrets.ALIREGISTRY_NAMESPACE }}/openimsdk-${{ matrix.components }}
-          tags: |
-            type=ref,event=branch
-            type=sha,prefix={{branch}}-,enable=${{ github.ref_type == 'branch' }}
-            type=ref,event=tag
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to Ali Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: registry.cn-hangzhou.aliyuncs.com
-          username: ${{ secrets.ALIREGISTRY_USERNAME }}
-          password: ${{ secrets.ALIREGISTRY_TOKEN }}
-
-      - name: Condition
-        id: condition
-        run: |
-          echo "run=${{ startsWith(github.ref_name, 'v') || ((steps.changes.outputs.go == 'true' && (matrix.components == 'core' || matrix.components == 'job')) || (steps.changes.outputs.api == 'true' && matrix.components == 'swagger')) }}" >> $GITHUB_OUTPUT
-
-      - name: Set up QEMU
-        if: ${{ steps.condition.outputs.run == 'true' }}
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        if: ${{ steps.condition.outputs.run == 'true' }}
-        uses: docker/setup-buildx-action@v2
-      - name: Build and push
-        if: ${{ steps.condition.outputs.run == 'true' }}
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./build/${{ matrix.components }}/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}

Dockerfile

@@ -23,8 +23,11 @@ FROM ghcr.io/openim-sigs/openim-bash-image:v1.3.0
 
 WORKDIR ${SERVER_WORKDIR}
 
+# 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/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"]

cmd/openim-api/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-api
-BIN_DIR=../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/openim-cmdutils/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-cmdutils
-BIN_DIR=../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/openim-crontask/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-crontask
-BIN_DIR=../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/openim-msggateway/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-rpc-msg_gateway
-BIN_DIR=../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/openim-msgtransfer/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-msgtransfer
-BIN_DIR=../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/openim-push/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-push
-BIN_DIR=../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/openim-rpc/openim-rpc-auth/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-rpc-auth
-BIN_DIR=../../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/openim-rpc/openim-rpc-conversation/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-rpc-conversation
-BIN_DIR=../../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/openim-rpc/openim-rpc-friend/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-rpc-friend
-BIN_DIR=../../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/openim-rpc/openim-rpc-group/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-rpc-group
-BIN_DIR=../../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/openim-rpc/openim-rpc-msg/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-rpc-msg
-BIN_DIR=../../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/openim-rpc/openim-rpc-third/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-rpc-third
-BIN_DIR=../../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/openim-rpc/openim-rpc-user/Makefile

@@ -1,34 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-NAME=openim-rpc-user
-BIN_DIR=../../../bin/
-
-OS:= $(or $(os),linux)
-ARCH:=$(or $(arch),amd64)
-all: gotool build
-
-ifeq ($(OS),windows)
-
-BINARY_NAME=${NAME}.exe
-
-else
-
-BINARY_NAME=${NAME}
-
-endif
-
-build:
-	CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH}; go build -ldflags="-w -s" -o ${BINARY_NAME}
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

docker-compose.yaml

@@ -100,12 +100,12 @@ services:
 
 
   openim_server:
-    image: openim-server:v1 #ghcr.io/openimsdk/openim-server:main
+    image: ghcr.io/openim-sigs/openim-server:v1.0.0-debug.11 #ghcr.io/openimsdk/openim-server:main
     container_name: openim-server
     volumes:
-      - ./logs:/openim/openim-server/logs
+      - ./_output/openim/openim-server/logs:/openim/openim-server/logs
-      - ./config:/openim/openim-server/config
+      - ./_output/openim/openim-server/config:/openim/openim-server/config
-      - ./scripts:/openim/openim-server/scripts
+      - ./_output/openim/openim-server/scripts:/openim/openim-server/scripts
     restart: always
     depends_on:
       - zookeeper
@@ -121,9 +121,9 @@ services:
         max-size: "1g"
         max-file: "2"
 
-  openim_chat:
+  openim-chat:
-    image: openim-chat:v1 #ghcr.io/openimsdk/openim-chat:main
+    image: ghcr.io/openim-sigs/openim-chat:v1.0.0-debug.11 # ghcr.io/openimsdk/openim-chat:main
-    container_name: openim_chat
+    container_name: openim-chat
     volumes:
       - ./_output/openim/openim-chat/logs:/openim/openim-chat/logs
       - ./_output/openim/openim-chat/config:/openim/openim-chat/config

init_docker.sh

@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-mark=''
-for ((ratio=0;${ratio}<=100;ratio+=5))
-do
-        sleep 0.2
-        printf "progress:[%-40s]%d%%\r" "${mark}" "${ratio}"
-        mark="##${mark}"
-done
-echo
-
-set -e
-
-# Change directory to the 'scripts' folder
-cd scripts
-
-# Grant execute permissions to all shell scripts in the 'scripts' folder
-chmod +x *.sh
-
-# Run the 'env_check.sh' script for environment checks
-./env_check.sh
-
-# Move back to the parent directory
-cd ..
-
-# Check if Docker is installed
-if ! command -v docker >/dev/null 2>&1; then
-  echo "Error: Docker is not installed. Please install Docker before running this script."
-  exit 1
-fi
-
-# Start Docker services using docker-compose
-if command -v docker-compose &> /dev/null
-then
-    docker-compose up -d
-else
-    docker compose up -d
-fi
-
-# Move back to the 'scripts' folder
-cd scripts
-
-# Run the 'docker_check_service.sh' script for Docker service checks
-./docker_check_service.sh

install.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright © 2023 OpenIM. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@ set -e
 set -o pipefail
 
 
-############### OpenIM Github ###############
+############################## OpenIM Github ##############################
 # ... rest of the script ...
 
 # TODO
@@ -78,7 +78,7 @@ GITHUB_TOKEN=
 # Default data directory. If you want to specify a different directory, uncomment and replace "./".
 # DATA_DIR=./
 
-############### OpenIM Functions ###############
+############################## OpenIM Functions ##############################
 # Install horizon of the script
 #
 # Pre-requisites:
@@ -290,7 +290,7 @@ function install_openim() {
     success "OpenIM installation completed successfully. Happy chatting!"
 }
 
-############### OpenIM Help ###############
+############################## OpenIM Help ##############################
 
 # Function to display help message
 function cmd_help() {
@@ -406,7 +406,7 @@ function parseinput() {
     done
 }
 
-############### OpenIM LOGO ###############
+############################## OpenIM LOG ##############################
 # Set text color to cyan for header and URL
 print_with_delay() {
   text="$1"

install_guide.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 echo "Welcome to the Open-IM-Server installation scripts."
 echo "Please select an deploy option:"

scripts/advertise.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 set -o pipefail

scripts/build.cmd

@@ -1,12 +1,13 @@
+@echo off
 set output_dir=%~dp0..\_output\bin\platforms\windows
-go build -o %output_dir%\api.exe ../cmd/openim-api/main.go
+
-go build -o %output_dir%\auth.exe ../cmd/openim-rpc/openim-rpc-auth/main.go
+set "rpc_apps=auth conversation friend group msg third user"
-go build -o %output_dir%\conversation.exe ../cmd/openim-rpc/openim-rpc-conversation/main.go
+set "other_apps=api push msgtransfer msggateway"
-go build -o %output_dir%\friend.exe ../cmd/openim-rpc/openim-rpc-friend/main.go
+
-go build -o %output_dir%\group.exe ../cmd/openim-rpc/openim-rpc-group/main.go
+for %%a in (%rpc_apps%) do (
-go build -o %output_dir%\msg.exe ../cmd/openim-rpc/openim-rpc-msg/main.go
+    go build -o %output_dir%\%%a.exe ../cmd/openim-rpc/openim-rpc-%%a/main.go
-go build -o %output_dir%\third.exe ../cmd/openim-rpc/openim-rpc-third/main.go
+)
-go build -o %output_dir%\user.exe ../cmd/openim-rpc/openim-rpc-user/main.go
+
-go build -o %output_dir%\push.exe ../cmd/openim-push/main.go
+for %%a in (%other_apps%) do (
-go build -o %output_dir%\msgtransfer.exe ../cmd/openim-msgtransfer/main.go
+    go build -o %output_dir%\%%a.exe ../cmd/openim-%%a/main.go
-go build -o %output_dir%\msggateway.exe ../cmd/openim-msggateway/main.go
+)

scripts/common.sh

@@ -104,9 +104,7 @@ openim::build::get_docker_wrapped_binaries() {
     "openim-rpc-msg,${OPENIM_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}"
     "openim-rpc-third,${OPENIM_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}"
     "openim-rpc-user,${OPENIM_BASE_IMAGE_REGISTRY}/debian-base-${arch}:${debian_base_version}"
-
   )
-
   echo "${targets[@]}"
 }
 

scripts/enterprise/function.sh

@@ -16,12 +16,12 @@
 #input:[10023,2323,3434]
 #output:10023 2323 3434
 list_to_string(){
-ports_list=$*
+    ports_list=$*
-sub_s1=`echo $ports_list | sed 's/ //g'`
+    sub_s1=`echo $ports_list | sed 's/ //g'`
-sub_s2=${sub_s1//,/ }
+    sub_s2=${sub_s1//,/ }
-sub_s3=${sub_s2#*[}
+    sub_s3=${sub_s2#*[}
-sub_s4=${sub_s3%]*}
+    sub_s4=${sub_s3%]*}
-ports_array=$sub_s4
+    ports_array=$sub_s4
 }
 remove_space(){
   value=$*

scripts/enterprise/path_info.cfg

@@ -1,7 +1,6 @@
 #Don't put the space between "="
 
-
+demo_server_name="chat-api"
-demo_server_name="openim_chat_api"
 demo_server_binary_root="$BIN_DIR/"
 
 #Global configuration file default dir
@@ -13,16 +12,14 @@ service_source_root=(
   ../cmd/api/chat/
   ../cmd/api/admin/
   #rpc service file
-  ../cmd/openim-rpc/admin/
+  ../cmd/rpc/admin/
-  ../cmd/openim-rpc/chat/
+  ../cmd/rpc/chat/
 )
 
 #service filename
 service_names=(
-  #api service filename
+    chat-api
-  openim_chat_api
+    admin-api
-   openim_admin_api
+    admin-rpc
-  #rpc service filename
+    chat-rpc
-  openim_admin
-  openim_chat
 )

scripts/init_pwd.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright © 2023 OpenIM. All rights reserved.
 #

scripts/msg_transfer_start.sh

@@ -38,10 +38,10 @@ prome_ports=($ports_array)
 
 #Check if the service exists
 #If it is exists,kill this process
-check=`ps aux | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l`
+check=`ps  | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l`
 if [ $check -ge 1 ]
 then
-oldPid=`ps aux | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'`
+oldPid=`ps  | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'`
  kill -9 $oldPid
 fi
 #Waiting port recycling
@@ -59,10 +59,10 @@ for ((i = 0; i < ${msg_transfer_service_num}; i++)); do
 done
 
 #Check launched service process
-check=`ps aux | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l`
+check=`ps  | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l`
 if [ $check -ge 1 ]
 then
-newPid=`ps aux | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'`
+newPid=`ps  | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'`
 allPorts=""
     echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS "${COLOR_SUFFIX}
     echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${openim_msgtransfer}${COLOR_SUFFIX}

scripts/push_start.sh

@@ -45,9 +45,9 @@ prome_ports=($ports_array)
 
 #Check if the service exists
 #If it is exists,kill this process
-check=$(ps aux | grep -w ./${push_name} | grep -v grep | wc -l)
+check=$(ps  | grep -w ./${push_name} | grep -v grep | wc -l)
 if [ $check -ge 1 ]; then
-  oldPid=$(ps aux | grep -w ./${push_name} | grep -v grep | awk '{print $2}')
+  oldPid=$(ps  | grep -w ./${push_name} | grep -v grep | awk '{print $2}')
   kill -9 $oldPid
 fi
 #Waiting port recycling
@@ -61,9 +61,9 @@ done
 
 sleep 3
 #Check launched service process
-check=$(ps aux | grep -w ./${push_name} | grep -v grep | wc -l)
+check=$(ps  | grep -w ./${push_name} | grep -v grep | wc -l)
 if [ $check -ge 1 ]; then
-  newPid=$(ps aux | grep -w ./${push_name} | grep -v grep | awk '{print $2}')
+  newPid=$(ps  | grep -w ./${push_name} | grep -v grep | awk '{print $2}')
   ports=$(netstat -netulp | grep -w ${newPid} | awk '{print $4}' | awk -F '[:]' '{print $NF}')
   allPorts=""
 

scripts/start_all.sh

@@ -27,15 +27,15 @@ source $SCRIPTS_ROOT/function.sh
 
 cd $SCRIPTS_ROOT
 
+echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}"
+echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}"
+echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
+
 if [ ! -d "${OPENIM_ROOT}/_output/bin/platforms" ]; then
   # exec build_all_service.sh
   "${SCRIPTS_ROOT}/build_all_service.sh"
 fi
 
-echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}"
-echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}"
-echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
-
 bin_dir="$OPENIM_ROOT/_output/bin"
 logs_dir="$OPENIM_ROOT/logs"
 sdk_db_dir="$OPENIM_ROOT/sdk/db/"

scripts/start_cron.sh

@@ -34,10 +34,10 @@ sdk_db_dir="$OPENIM_ROOT/sdk/db/"
 
 #Check if the service exists
 #If it is exists,kill this process
-check=`ps aux | grep -w ./${cron_task_name} | grep -v grep| wc -l`
+check=`ps  | grep -w ./${cron_task_name} | grep -v grep| wc -l`
 if [ $check -ge 1 ]
 then
-oldPid=`ps aux | grep -w ./${cron_task_name} | grep -v grep|awk '{print $2}'`
+oldPid=`ps | grep -w ./${cron_task_name} | grep -v grep|awk '{print $2}'`
  kill -9 $oldPid
 fi
 #Waiting port recycling
@@ -50,10 +50,10 @@ nohup ./${cron_task_name}  >>$OPENIM_ROOT/logs/openIM.log 2>&1 &
 #done
 
 #Check launched service process
-check=`ps aux | grep -w ./${cron_task_name} | grep -v grep| wc -l`
+check=`ps  | grep -w ./${cron_task_name} | grep -v grep| wc -l`
 if [ $check -ge 1 ]
 then
-newPid=`ps aux | grep -w ./${cron_task_name} | grep -v grep|awk '{print $2}'`
+newPid=`ps  | grep -w ./${cron_task_name} | grep -v grep|awk '{print $2}'`
 allPorts=""
     echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS "${COLOR_SUFFIX}
     echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${cron_task_name}${COLOR_SUFFIX}

scripts/start_rpc_service.sh

@@ -30,7 +30,6 @@ echo -e "${BACKGROUND_GREEN}${CYAN_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
 
 bin_dir="$BIN_DIR"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"
 
 #service filename
 service_filename=(
@@ -75,7 +74,7 @@ service_prometheus_port_name=(
 
 for ((i = 0; i < ${#service_filename[*]}; i++)); do
   #Check whether the service exists
-  service_name="ps -aux |grep -w ${service_filename[$i]} |grep -v grep"
+  service_name="ps |grep -w ${service_filename[$i]} |grep -v grep"
   count="${service_name}| wc -l"
 
   if [ $(eval ${count}) -gt 0 ]; then

scripts/stop_all.sh

@@ -29,7 +29,7 @@ cd "$SCRIPTS_ROOT"
 
 for i in ${service_names[*]}; do
   #Check whether the service exists
-  name="ps -aux |grep -w $i |grep -v grep"
+  name="ps |grep -w $i |grep -v grep"
   count="${name}| wc -l"
   if [ $(eval ${count}) -gt 0 ]; then
     pid="${name}| awk '{print \$2}'"

test/common.sh

@@ -12,4 +12,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-