Fix build fail.

ossrs · Jul 5, 2024 · 6827b34 · 6827b34
1 parent 134f151
commit 6827b34
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -162,9 +162,10 @@ jobs:
       # See https://github.com/moby/moby/issues/13742#issuecomment-725197223
       - name: Force docker to use vfs.
         run: |
-          sudo systemctl stop docker
-          echo '{"cgroup-parent":"/actions_job","storage-driver":"vfs"}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl start docker
+          echo "Disable vfs for docker."
+          #sudo systemctl stop docker
+          #echo '{"cgroup-parent":"/actions_job","storage-driver":"vfs"}' | sudo tee /etc/docker/daemon.json
+          #sudo systemctl start docker
       - name: Add hosts to /etc/hosts
         run: |
           sudo echo "127.0.0.1 srs.stack.local" | sudo tee -a /etc/hosts
@@ -190,23 +191,28 @@ jobs:
             -v $HOME/.bt/userInfo.json:/www/server/panel/data/userInfo.json \
             -v $HOME/.bt/api.json:/www/server/panel/config/api.json -e BT_KEY=$BT_KEY \
             --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro \
-            -d --rm -v $(pwd):/g -w /g --name=bt ossrs/bt-plugin-dev:1
+            -d -v $(pwd):/g -w /g --name=bt ossrs/bt-plugin-dev:1
           echo "BT docker started."
       - name: Wait for systemd service start
         run: |
           # We will handle the error by ourselves.
           set +e
           
-          for ((i=0; i<10; i++)); do
+          for ((i=0; i<30; i++)); do
             if [[ $(docker exec bt systemctl status docker >/dev/null 2>/dev/null && echo yes) == yes ]]; then
               echo "Docker service started."
               break
             else
-                echo "Wait for docker service start."
+                echo "$i: Wait for docker service start."
                 sleep 1
             fi
           done
           
+          docker images
+          docker ps -a
+          docker logs bt
+          systemctl status docker
+          journalctl -u docker.service -n 1000
           docker exec bt systemctl status docker
           echo "Docker service started."
       - name: Import platform image to BT
@@ -330,9 +336,10 @@ jobs:
       # See https://github.com/moby/moby/issues/13742#issuecomment-725197223
       - name: Force docker to use vfs.
         run: |
-          sudo systemctl stop docker
-          echo '{"cgroup-parent":"/actions_job","storage-driver":"vfs"}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl start docker
+          echo "Disable vfs for docker."
+          #sudo systemctl stop docker
+          #echo '{"cgroup-parent":"/actions_job","storage-driver":"vfs"}' | sudo tee /etc/docker/daemon.json
+          #sudo systemctl start docker
       - name: Add hosts to /etc/hosts
         run: |
           sudo echo "127.0.0.1 srs.stack.local" | sudo tee -a /etc/hosts
@@ -355,23 +362,28 @@ jobs:
             -v $(pwd)/build/oryx:/www/server/panel/plugin/oryx \
             -v $HOME/.aapanel/api.json:/www/server/panel/config/api.json -e BT_KEY=$AAPANEL_KEY \
             --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro \
-            -d --rm -v $(pwd):/g -w /g --name=aapanel ossrs/aapanel-plugin-dev:1
+            -d -v $(pwd):/g -w /g --name=aapanel ossrs/aapanel-plugin-dev:1
           echo "aaPanel docker started."
       - name: Wait for systemd service start
         run: |
           # We will handle the error by ourselves.
           set +e
           
-          for ((i=0; i<10; i++)); do
+          for ((i=0; i<30; i++)); do
             if [[ $(docker exec aapanel systemctl status docker >/dev/null 2>/dev/null && echo yes) == yes ]]; then
               echo "Docker service started."
               break
             else
-                echo "Wait for docker service start."
+                echo "$i: Wait for docker service start."
                 sleep 1
             fi
           done
           
+          docker images
+          docker ps -a
+          docker logs aapanel
+          systemctl status docker
+          journalctl -u docker.service -n 1000
           docker exec aapanel systemctl status docker
           echo "Docker service started."
       - name: Import platform image to aaPanel

diff --git a/ui/src/pages/Settings.js b/ui/src/pages/Settings.js
@@ -527,7 +527,7 @@ function SettingLLM() {
       alert(t('helper.setOk'));
       console.log(`Setting: Update open ai ok`);
     }).catch(handleError);
-  }, [handleError, aiSecretKey, aiBaseURL, aiOrganization]);
+  }, [t, handleError, aiSecretKey, aiBaseURL, aiOrganization]);
 
   return <>
     <Accordion defaultActiveKey={["1"]} alwaysOpen>