Merge branch 'build_native_php' into php-fpm

Author: jingjingxyk

.github/workflows/windows-msys2.yml

@@ -1,4 +1,4 @@
-name: build-swoole-cli-windows-msys2
+name: build-php-cli-windows-msys2
 
 on:
   push:

docs/upgrade.md

@@ -1,12 +1,9 @@
 # 升级 PHP 版本 步骤
 
-> 1、修改 sapi/PHP-VERSION.conf 文件里版本号即可
-
-> 2、修改 sync-source-code.php 文件里 PHP 源码包的 sha256sum 配置
-
-> 3、执行同步源码脚本， 拉取 PHP 官方源码 到本项目
-
-> 4、sapi/cli/ 代码的升级，需要手动确认
+1. 修改 `sapi/PHP-VERSION.conf` 文件里版本号即可
+2. 修改 `sync-source-code.php` 文件里 PHP 源码包的 sha256sum 配置
+3. 执行同步源码脚本， 拉取 PHP 官方源码 到本项目
+4. sapi/cli 代码的升级，需要手动确认
 
 ```shell
 
@@ -17,8 +14,8 @@ php sync-source-code.php
 php sync-source-code.php --action run
 
 
-./bin/runtime/php -c ./bin/runtime/php.ini  sync-source-code.php
-./bin/runtime/php -c ./bin/runtime/php.ini  sync-source-code.php --action run
+./runtime/php/php -c ./runtime/php/php.ini  sync-source-code.php
+./runtime/php/php -c ./runtime/php/php.ini  sync-source-code.php --action run
 
 ```
 

sapi/docker/build-export-container.sh

@@ -49,12 +49,6 @@ while [ $# -gt 0 ]; do
   shift $(($# > 0 ? 1 : 0))
 done
 
-case "$MIRROR" in
-china | openatom)
-  CONTAINER_BASE_IMAGE="docker.io/library/alpine:3.18"
-  ;;
-esac
-
 mkdir -p var/build-export-container/
 cd ${__PROJECT__}/var/build-export-container/
 

sapi/download-box/Dockerfile-dowload-box

@@ -1,4 +1,4 @@
-FROM    nginx:1.23-alpine
+FROM    nginx:1.27-alpine
 
 RUN  rm -rf /usr/share/nginx/html/*
 ADD  ./default.conf /etc/nginx/conf.d/default.conf

sapi/quickstart/linux/run-alpine-container-dev-shm.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -exu
+__DIR__=$(
+  cd "$(dirname "$0")"
+  pwd
+)
+__PROJECT__=$(
+  cd ${__DIR__}/../../../
+  pwd
+)
+cd ${__DIR__}
+
+{
+  docker stop swoole-cli-alpine-dev
+  sleep 5
+} || {
+  echo $?
+}
+cd ${__DIR__}
+
+IMAGE=alpine:3.18
+
+cd ${__DIR__}
+
+mkdir -p /dev/shm/swoole-cli/thirdparty/
+mkdir -p /dev/shm/swoole-cli/ext/
+mkdir -p /dev/shm/swoole-cli/var/
+
+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/ \
+  -v /dev/shm/swoole-cli/var/:/work/var/ \
+  -w /work --init $IMAGE tail -f /dev/null

sapi/quickstart/linux/run-alpine-container.sh

@@ -21,20 +21,5 @@ cd ${__DIR__}
 
 IMAGE=alpine:3.18
 
-MIRROR=''
-while [ $# -gt 0 ]; do
-  case "$1" in
-  --mirror)
-    MIRROR="$2"
-    case "$MIRROR" in
-    china | openatom)
-      IMAGE="docker.io/library/alpine:3.18"
-      ;;
-    esac
-    ;;
-  esac
-  shift $(($# > 0 ? 1 : 0))
-done
-
 cd ${__DIR__}
 docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null

sapi/quickstart/linux/run-debian-container.sh

@@ -21,20 +21,5 @@ cd ${__DIR__}
 
 IMAGE=debian:12
 
-MIRROR=''
-while [ $# -gt 0 ]; do
-  case "$1" in
-  --mirror)
-    MIRROR="$2"
-    case "$MIRROR" in
-    china | openatom)
-      IMAGE="docker.io/library/debian:12"
-      ;;
-    esac
-    ;;
-  esac
-  shift $(($# > 0 ? 1 : 0))
-done
-
 cd ${__DIR__}
 docker run --rm --name swoole-cli-debian-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null

sapi/quickstart/linux/run-swoole-cli-builder-container.sh

@@ -33,15 +33,15 @@ while [ $# -gt 0 ]; do
   shift $(($# > 0 ? 1 : 0))
 done
 
-if [ ! -f ${__PROJECT__}/runtime/php ]; then
+if [ ! -f ${__PROJECT__}/runtime/php/php ]; then
   {
     bash setup-php-runtime.sh $OPTIONS
   } || {
     echo $?
   }
 fi
-export PATH=${__PROJECT__}/runtime:$PATH
-alias php="php -d curl.cainfo=${__PROJECT__}/runtime/cacert.pem -d openssl.cafile=${__PROJECT__}/runtime/cacert.pem "
+export PATH=${__PROJECT__}/runtime/php/:$PATH
+alias php="php -d curl.cainfo=${__PROJECT__}/runtime/php/cacert.pem -d openssl.cafile=${__PROJECT__}/runtime/php/cacert.pem "
 
 export COMPOSER_ALLOW_SUPERUSER=1
 

sapi/src/template/make.php

@@ -513,14 +513,6 @@
 if [ "$1" = "docker-build" ] ;then
     MIRROR=""
     CONTAINER_BASE_IMAGE='docker.io/library/alpine:3.18'
-    if [ -n "$2" ]; then
-        MIRROR=$2
-        case "$MIRROR" in
-        china | openatom)
-            CONTAINER_BASE_IMAGE="docker.io/library/alpine:3.18"
-        ;;
-        esac
-    fi
     PLATFORM=''
     ARCH=$(uname -m)
     case $ARCH in

setup-php-runtime.sh

@@ -71,10 +71,12 @@ if [ $OS = 'windows' ]; then
 fi
 
 MIRROR=''
+CURL_OPTIONS=""
 while [ $# -gt 0 ]; do
   case "$1" in
   --mirror)
     MIRROR="$2"
+    CURL_OPTIONS+="-H 'Referer: https://www.swoole.com/download' -H 'User-Agent: download swoole-cli runtime with setup-php-runtime.sh'  -H 'X-Auth-Token: 6F0A7F038A69'"
     ;;
   --proxy)
     export HTTP_PROXY="$2"
@@ -104,6 +106,13 @@ china)
 
 esac
 
+downloader() {
+  local file=$1
+  local url=$2
+  local cmd=$(echo "curl $CURL_OPTIONS -fSLo $file $url ")
+  eval $cmd
+}
+
 test -f composer.phar || curl -fSLo composer.phar ${COMPOSER_DOWNLOAD_URL}
 chmod a+x composer.phar
 
@@ -114,13 +123,13 @@ APP_RUNTIME="${APP_NAME}-${APP_VERSION}-${OS}-${ARCH}"
 if [ $OS = 'windows' ]; then
   {
     APP_RUNTIME="${APP_NAME}-${APP_VERSION}-cygwin-${ARCH}"
-    test -f ${APP_RUNTIME}.zip || curl -fSLo ${APP_RUNTIME}.zip ${APP_DOWNLOAD_URL}
+    test -f ${APP_RUNTIME}.zip || downloader ${APP_RUNTIME}.zip ${APP_DOWNLOAD_URL}
     test -d ${APP_RUNTIME} && rm -rf ${APP_RUNTIME}
     unzip "${APP_RUNTIME}.zip"
     exit 0
   }
 else
-  test -f ${APP_RUNTIME}.tar.xz || curl -fSLo ${APP_RUNTIME}.tar.xz ${APP_DOWNLOAD_URL}
+  test -f ${APP_RUNTIME}.tar.xz || downloader ${APP_RUNTIME}.tar.xz ${APP_DOWNLOAD_URL}
   test -f ${APP_RUNTIME}.tar || xz -d -k ${APP_RUNTIME}.tar.xz
   test -f swoole-cli && rm -f swoole-cli
   tar -xvf ${APP_RUNTIME}.tar