Merge branch 'feature-swoole-cli-builder' into experiment-feature

swoole · Dec 26, 2024 · 47eed65 · 47eed65
2 parents 6053f46 + aa7aa68
commit 47eed65
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/sapi/quickstart/linux/run-alpine-container-full.sh b/sapi/quickstart/linux/run-alpine-container-full.sh
@@ -13,6 +13,7 @@ cd ${__DIR__}
 
 {
   docker stop swoole-cli-alpine-dev
+  docker stop swoole-cli-builder
   sleep 5
 } || {
   echo $?
@@ -21,7 +22,7 @@ cd ${__DIR__}
 
 IMAGE=alpine:3.18
 
-:<<'EOF'
+: <<'EOF'
    启动此容器
 
    已经内置了 php 、composer 、 编译好的依赖库
@@ -51,31 +52,29 @@ case $ARCH in
 'x86_64')
   TAG=all-dependencies-alpine-3.18-php8-v1.0.0-x86_64-20240715T132512Z
   IMAGE=docker.io/jingjingxyk/build-swoole-cli:${TAG}
-  if [ "$MIRROR" = 'china' ] ; then
+  if [ "$MIRROR" = 'china' ]; then
     IMAGE=registry.cn-beijing.aliyuncs.com/jingjingxyk-public/app:${TAG}
   fi
   ;;
 'aarch64')
   TAG=all-dependencies-alpine-3.18-php8-v1.0.0-aarch64-20240618T091126Z
   IMAGE=docker.io/jingjingxyk/build-swoole-cli:${TAG}
-    if [ "$MIRROR" = 'china' ] ; then
-      IMAGE=registry.cn-hangzhou.aliyuncs.com/jingjingxyk-public/app:${TAG}
-    fi
+  if [ "$MIRROR" = 'china' ]; then
+    IMAGE=registry.cn-hangzhou.aliyuncs.com/jingjingxyk-public/app:${TAG}
+  fi
   ;;
 *)
   echo "此 ${ARCH} 架构的容器 容器未配置"
   exit 0
   ;;
 esac
 
-
 cd ${__DIR__}
 
-if [ $DEV_SHM -eq 1 ] ; then
+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-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
+  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
 else
-  docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
+  docker run --rm --name swoole-cli-builder -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
@@ -13,6 +13,7 @@ cd ${__DIR__}
 
 {
   docker stop swoole-cli-alpine-dev
+  docker stop swoole-cli-builder
   sleep 5
 } || {
   echo $?
@@ -37,4 +38,4 @@ while [ $# -gt 0 ]; do
 done
 
 cd ${__DIR__}
-docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
+docker run --rm --name swoole-cli-builder -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null