Ⓜ️feat: openim docker fix (#1502)

* fix: fix auto gen config Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * feat: add openim openim compatibility Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * fix: fix ai fix git commit continue-on-error: true Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * fix: fix ai fix git commit continue-on-error: true Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * fix: fix ai fix git commit continue-on-error: true Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * fix: fix ai fix git commit continue-on-error: true Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * fix: fix ai fix git commit continue-on-error: true Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --------- Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
openimsdk · Nov 30, 2023 · 4b19202 · 4b19202
1 parent be5a3e5
commit 4b19202
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 885 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -20,7 +20,6 @@ CHANGELOG/
 
 # Ignore deployment-related files
 docker-compose.yaml
-deployments/
 
 # Ignore assets
 assets/

diff --git a/.env b/.env
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -22,6 +22,9 @@ on:
     # run e2e test every 4 hours
     - cron: 0 */4 * * *
 
+env:
+  CALLBACK_ENABLE: true
+
 jobs:
   build:
     name: Test
@@ -70,9 +73,9 @@ jobs:
 
     - name: Docker Operations
       run: |
-        curl -o docker-compose.yml https://raw.githubusercontent.com/OpenIMSDK/openim-docker/main/example/basic-openim-server-dependency.yml
+        sudo make init
         sudo docker compose up -d
-        sudo sleep 60
+        sudo sleep 20
 
     - name: Module Operations
       run: |

diff --git a/.github/workflows/opencommit.yml b/.github/workflows/opencommit.yml
@@ -51,4 +51,5 @@ jobs:
           OCO_EMOJI: false
           OCO_MODEL: gpt-3.5-turbo-16k
           OCO_LANGUAGE: en
-          OCO_PROMPT_MODULE: conventional-commit
+          OCO_PROMPT_MODULE: conventional-commit
+        continue-on-error: true
diff --git a/.github/workflows/openimci.yml b/.github/workflows/openimci.yml
@@ -127,6 +127,7 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Run OpenIM make install start
       run: |
+        sudo make init && \
         sudo make install
 
   execute-scripts:
@@ -156,9 +157,9 @@ jobs:
 
     - name: Docker Operations
       run: |
-        curl -o docker-compose.yml https://raw.githubusercontent.com/OpenIMSDK/openim-docker/main/example/basic-openim-server-dependency.yml
+        sudo make init
         sudo docker compose up -d
-        sudo sleep 60
+        sudo sleep 20
 
     - name: Module Operations
       run: |
@@ -195,4 +196,5 @@ jobs:
 
     - name: Test Docker Build
       run: |
+        sudo make init
         sudo make image
diff --git a/.gitignore b/.gitignore
@@ -391,3 +391,4 @@ Sessionx.vim
 dist/
 .env
 config/config.yaml
+config/alertmanager.yml
diff --git a/Dockerfile b/Dockerfile
@@ -25,7 +25,8 @@ WORKDIR ${SERVER_WORKDIR}
 
 # Copy scripts and binary files to the production image
 COPY --from=builder ${OPENIM_SERVER_BINDIR} /openim/openim-server/_output/bin
-# COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts
-# COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config
+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}/deployments /openim/openim-server/deployments
 
 CMD ["/openim/openim-server/scripts/docker-start-all.sh"]