Merge branch 'build_native_php' into new_dev

jingjingxyk · Jan 3, 2025 · f7b8746 · f7b8746
2 parents aa46447 + 8ebc0aa
commit f7b8746
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/sapi/quickstart/linux/run-swoole-cli-builder-container.sh b/sapi/quickstart/linux/run-swoole-cli-builder-container.sh
@@ -21,6 +21,10 @@ while [ $# -gt 0 ]; do
     china)
       OPTIONS=" --mirror china "
       ;;
+    *)
+      echo "$0 parameter error"
+      exit 0
+      ;;
     esac
 
     ;;
@@ -33,6 +37,8 @@ exit 0
 export PATH=${__PROJECT__}/bin/runtime:$PATH
 alias php="php -d curl.cainfo=${__PROJECT__}/bin/runtime/cacert.pem -d openssl.cafile=${__PROJECT__}/bin/runtime/cacert.pem "
 
+export COMPOSER_ALLOW_SUPERUSER=1
+
 if [ "$MIRROR" = 'china' ]; then
   composer config -g repos.packagist composer https://mirrors.tencent.com/composer/
 fi
@@ -47,4 +53,11 @@ fi
 php ./prepare.php --skip-download=yes --without-docker=yes
 
 bash make.sh docker-build ${MIRROR}
+
+{
+  docker exec -it swoole-cli-builder which bash
+} || {
+  docker exec -it swoole-cli-builder sh /work/sapi/quickstart/linux/alpine-init.sh ${OPTIONS}
+}
+
 bash make.sh docker-bash