merge code

jingjingxyk · Jan 3, 2025 · c196202 · c196202
2 parents f8aa17c + 7c8725e
commit c196202
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/windows-cygwin.yml b/.github/workflows/windows-cygwin.yml
@@ -27,6 +27,7 @@ jobs:
           git config --global core.eol lf
           git config --global core.ignorecase false
           git config --global --add safe.directory ${{ github.workspace }}
+          ipconfig
 
       - uses: actions/checkout@v4
       - name: Prepare submodule

diff --git a/sapi/quickstart/linux/run-alpine-container-full.sh b/sapi/quickstart/linux/run-alpine-container-full.sh
@@ -12,7 +12,7 @@ __PROJECT__=$(
 cd ${__DIR__}
 
 {
-  docker stop swoole-cli-builder
+  docker stop swoole-cli-alpine-dev
   sleep 5
 } || {
   echo $?
@@ -73,7 +73,7 @@ cd ${__DIR__}
 if [ $DEV_SHM -eq 1 ]; then
   mkdir -p /dev/shm/swoole-cli/thirdparty/
   mkdir -p /dev/shm/swoole-cli/ext/
-  docker run --rm --name swoole-cli-builder -d -v ${__PROJECT__}:/work -v /dev/shm/swoole-cli/thirdparty/:/work/thirdparty/ -v /dev/shm/swoole-cli/ext/:/work/ext/ -w /work --init $IMAGE tail -f /dev/null
+  docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -v /dev/shm/swoole-cli/thirdparty/:/work/thirdparty/ -v /dev/shm/swoole-cli/ext/:/work/ext/ -w /work --init $IMAGE tail -f /dev/null
 else
-  docker run --rm --name swoole-cli-builder -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
+  docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
 fi
diff --git a/sapi/quickstart/linux/run-alpine-container.sh b/sapi/quickstart/linux/run-alpine-container.sh
@@ -12,7 +12,7 @@ __PROJECT__=$(
 cd ${__DIR__}
 
 {
-  docker stop swoole-cli-builder
+  docker stop swoole-cli-alpine-dev
   sleep 5
 } || {
   echo $?
@@ -37,4 +37,4 @@ while [ $# -gt 0 ]; do
 done
 
 cd ${__DIR__}
-docker run --rm --name swoole-cli-builder -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
+docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null