Merge pull request #5 from raighnew/fix-compose-status

EkkoG · Sep 30, 2024 · 2f68b26 · 2f68b26
2 parents c054208 + 02b487d
commit 2f68b26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,7 +37,9 @@ jobs:
           echo "PPPOE_PASSWORD=123" >> modules/network/.env
           echo "LAN_IP=192.168.1.1" >> modules/network/.env
           echo "CLASH_CONFIG_URL=https://gist.github.com/EkkoG/20a52db0169c4a4769689521b1c5500e/raw/cf61a9397d0bdbd5b6bbad8fbb388ec851116470/clash_example.yaml" >> modules/openclash/.env
-          echo "MODULES=openclash openclash-as-default" > .env
-          ./run.sh --image=openwrt/imagebuilder:x86-64-23.05.0-rc3
+          echo "CONFIG_TARGET_KERNEL_PARTSIZE=16" > .env
+          echo "CONFIG_TARGET_ROOTFS_PARTSIZE=256" >> .env
+          echo "MODULES=openclash openclash-as-default" >> .env
+          ./run.sh --image=openwrt/imagebuilder:x86-64-23.05.5
           ./run.sh --image=openwrt/imagebuilder:x86-64-22.03.3  
-          ./run.sh --image=openwrt/imagebuilder:x86-64-21.02.7
+          ./run.sh --image=openwrt/imagebuilder:x86-64-21.02.7
diff --git a/run.sh b/run.sh
@@ -116,13 +116,13 @@ if [[ $(uname) =~ "Linux" ]]; then
     sudo chown -R 1000:1000 bin
 fi
 
-compose up --remove-orphans
+compose up --exit-code-from imagebuilder --remove-orphans
 build_status=$?
 compose rm -f
 rm docker-compose.yml
 
 if [ $build_status -ne 0 ]; then
-    echo "build failed"
+    echo "build failed with exit code $build_status"
     exit 1
 else
     ls -R bin