Merge branch 'main' into main

.dockerignore

@@ -5,9 +5,8 @@
 .git
 
 # Ignore build artifacts
-_output/
 logs/
-
+_output/
 # Ignore non-essential documentation
 README.md
 README-zh_CN.md
@@ -18,8 +17,6 @@ CHANGELOG/
 # Ignore testing and linting configuration
 .golangci.yml
 
-# Ignore deployment-related files
-docker-compose.yaml
 
 # Ignore assets
 assets/

.env

@@ -0,0 +1,13 @@
+
+MONGO_IMAGE=mongo:6.0.2
+REDIS_IMAGE=redis:7.0.0
+ZOOKEEPER_IMAGE=bitnami/zookeeper:3.8
+KAFKA_IMAGE=bitnami/kafka:3.5.1
+MINIO_IMAGE=minio/minio:RELEASE.2024-01-11T07-46-16Z
+
+
+OPENIM_WEB_FRONT_IMAGE=openim/openim-web-front:release-v3.5.1
+OPENIM_ADMIN_FRONT_IMAGE=openim/openim-admin-front:release-v1.7
+
+DATA_DIR=./
+

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

.github/workflows/e2e-test.yml → .github/workflows/e2e-test.bak

@@ -73,14 +73,20 @@ jobs:
 
     - name: Docker Operations
       run: |
-        sudo make init
         sudo docker compose up -d
+        sudo bash bootstrap.sh
+        sudo mage
         sudo sleep 20
 
     - name: Module Operations
       run: |
-        sudo make tidy
-        sudo make tools.verify.go-gitlint
+        echo "===========> Verifying go-gitlint is installed"
+        if [ ! -f ./_output/tools/go-gitlint ]; then
+          export GOBIN=$(pwd)/_output/tools
+          echo "===========> Installing The default installation path is /home/ubuntu/DF/open-im-server/_output/tools/go-gitlint"
+          sudo go install github.com/marmotedu/go-gitlint/cmd/go-gitlint@latest
+          echo "===========> go-gitlint is installed in /home/ubuntu/DF/open-im-server/_output/tools/go-gitlint"
+        fi
 
     - name: Build, Start(make build && make start)
       run: |
@@ -90,31 +96,36 @@ jobs:
       run: |
         sudo ./scripts/install/install.sh -s
 
-    - name: Exec OpenIM API test (make test-api)
+#    - name: Exec OpenIM API test (make test-api)
+    - name: Exec OpenIM test (make test)
       run: |
         mkdir -p ./tmp
         touch ./tmp/test.md
         echo "# OpenIM Test" >> ./tmp/test.md
         echo "## OpenIM API Test" >> ./tmp/test.md
         echo "<details><summary>Command Output for OpenIM API Test</summary>" >> ./tmp/test.md
         echo "<pre><code>" >> ./tmp/test.md
-        sudo make test-api | tee -a ./tmp/test.md
+        echo "===========> Run api test"
+        ./scripts/install/test.sh
+        echo "===========> Run api test" >> ./tmp/test.md
+        ./scripts/install/test.sh >> ./tmp/test.md
         echo "</code></pre>" >> ./tmp/test.md
         echo "</details>" >> ./tmp/test.md
 
-        sudo make test-api
+        echo "===========> Run api test"
+        ./scripts/install/test.sh
 
-    - name: Exec OpenIM E2E Test (make test-e2e)
-      run: |
-        echo "" >> ./tmp/test.md
-        echo "## OpenIM E2E Test" >> ./tmp/test.md
-        echo "<details><summary>Command Output for OpenIM E2E Test</summary>" >> ./tmp/test.md
-        echo "<pre><code>" >> ./tmp/test.md
-        sudo make test-e2e | tee -a ./tmp/test.md
-        echo "</code></pre>" >> ./tmp/test.md
-        echo "</details>" >> ./tmp/test.md
+ #   - name: Exec OpenIM E2E Test (make test-e2e)
+ #     run: |
+ #       echo "" >> ./tmp/test.md
+ #       echo "## OpenIM E2E Test" >> ./tmp/test.md
+ #       echo "<details><summary>Command Output for OpenIM E2E Test</summary>" >> ./tmp/test.md
+ #       echo "<pre><code>" >> ./tmp/test.md
+ #       sudo make test-e2e | tee -a ./tmp/test.md
+ #       echo "</code></pre>" >> ./tmp/test.md
+ #       echo "</details>" >> ./tmp/test.md
 
-        sudo make test-e2e
+ #       sudo make test-e2e
 
     - name: Comment PR with file
       uses: thollander/actions-comment-pull-request@v2

.github/workflows/golangci-lint.yml → .github/workflows/golangci-lint.bak

@@ -29,7 +29,13 @@ jobs:
             go-version: '1.21'
             cache: false
         - name: OpenIM Scripts Verification(make verify)
-          run: sudo make verify
+          run: |
+            cd scripts
+            for script in verify-*; do
+              if [ -x "$script" ]; then
+                ./"$script"
+              fi
+            done
         - name: golangci-lint
           uses: golangci/[email protected]
           with: