From 4f76ad9ac697e2a08cf1ab0123e914d37ff1dee5 Mon Sep 17 00:00:00 2001
From: "Xinwei Xiong (cubxxw)" <3293172751nss@gmail.com>
Date: Sat, 6 Jan 2024 13:22:19 +0800
Subject: [PATCH] update openim environment and status

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
---
 .github/workflows/openimci.yml | 19 ++++++++++++-------
 docker-compose.yml             |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/openimci.yml b/.github/workflows/openimci.yml
index f29545c7f..e42fd5bb5 100644
--- a/.github/workflows/openimci.yml
+++ b/.github/workflows/openimci.yml
@@ -281,12 +281,18 @@ jobs:
         sudo make init
         sudo make image
 
-    # https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
-    - name: Get Docker Images and Processes
-      id: docker_info
+    - name: Get Docker Images
+      id: docker_images
       run: |
-        echo "images=$(sudo docker images)" >> $GITHUB_ENV
-        echo "processes=$(sudo docker ps)" >> $GITHUB_ENV
+        echo "images<<EOF" >> $GITHUB_ENV
+        sudo docker images | awk '{print $1, $2, $3, $4, $5, $6, $7, $8}' >> $GITHUB_ENV
+        echo "EOF" >> $GITHUB_ENV
+    - name: Get Docker Processes
+      id: docker_processes
+      run: |
+        echo "processes<<EOF" >> $GITHUB_ENV
+        sudo docker ps | awk '{print $1, $2, $3, $4, $5, $6, $7, $8}' >> $GITHUB_ENV
+        echo "EOF" >> $GITHUB_ENV
     - name: Comment PR with Docker Info
       uses: ./ # Replace with the appropriate action to comment on PR
       with:
@@ -297,5 +303,4 @@ jobs:
           ${{ env.processes }}
         comment_tag: docker_info
         reactions: eyes, rocket
-        mode: recreate
-    # Include any other steps as needed
+        mode: recreate
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 7560fc0f5..48e7ccdf3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     ports:
       - "${MONGO_PORT:-37017}:27017"
     container_name: mongo
-    command: ["/bin/bash", "-c", "/docker-entrypoint-initdb.d/mongo-init.sh && docker-entrypoint.sh mongod --wiredTigerCacheSizeGB 1 --auth"]
+    command: ["/bin/bash", "-c", "/docker-entrypoint-initdb.d/mongo-init.sh; docker-entrypoint.sh mongod --wiredTigerCacheSizeGB 1 --auth"]
     volumes:
       - "${DATA_DIR:-./}/components/mongodb/data/db:/data/db"
       - "${DATA_DIR:-./}/components/mongodb/data/logs:/data/logs"