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/image.yml

@@ -1,95 +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:
-      - 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 }}

docker-compose.yaml

@@ -100,12 +100,12 @@ services:
 
 
   openim_server:
-    image: ghcr.io/openim-sigs/openim-server:v1.0.0-debug.0 #ghcr.io/openimsdk/openim-server:latels
+    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,13 +121,13 @@ services:
         max-size: "1g"
         max-file: "2"
 
-  openim_chat:
+  openim-chat:
-    image: ghcr.io/openim-sigs/openim-chat:v1.0.0-debug.0 #ghcr.io/openimsdk/openim-chat:latels
+    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:
+    volumes:
-    #   - ./_output/openim/openim-chat/logs:/openim/openim-chat/logs
+      - ./_output/openim/openim-chat/logs:/openim/openim-chat/logs
-    #   - ./_output/openim/openim-chat/config:/openim/openim-chat/config
+      - ./_output/openim/openim-chat/config:/openim/openim-chat/config
-    #   - ./_output/openim/openim-chat/scripts:/openim/openim-chat/scripts
+      - ./_output/openim/openim-chat/scripts:/openim/openim-chat/scripts
     restart: always
     depends_on:
       - mysql

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");

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/init_pwd.sh

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

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.
-