Update PHP to 8.2.8 and use ubuntu:22.04 to build manticore-executor-dev

Don Hardman · Don Hardman · commit 78f52a35899a · 2023-07-13T21:56:17.000+07:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 env:
   APP_NAME: 'manticore-executor'
   DOCKER_TAG: 'manticoresearch/manticore-executor'
-  PHP_VERSION: '8.2.4'
+  PHP_VERSION: '8.2.8'
   MAINTAINER: 'Manticore'
   DESC: 'Custom built PHP executor for Manticore.'
   EXTRA_NAME: 'manticore-extra'
@@ -74,6 +74,32 @@ jobs:
           path: |
             *${{ matrix.arch }}.tar.gz
 
+  build-artifact-dev:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - id: vars
+        run: |
+          echo "app_version=$(echo ${{ github.ref_name }} | cut -dv -f2)" >> $GITHUB_OUTPUT
+      - name: Build manticore-executor-dev
+        run: ./build-linux 8.2.8 0 1
+        shell: bash
+      - name: Create artifact
+        run: |
+          APP_ARCH=amd64 \
+            APP_VERSION=${{ steps.vars.outputs.app_version }} \
+            APP_NAME=${{ env.APP_NAME }} \
+            RUNNER_OS="${{ runner.os }}" \
+            ASSET_SUFFIX=-dev \
+            ./collect-assets
+        shell: bash
+      - uses: actions/upload-artifact@v3
+        with:
+          name: artifact-dev-ubuntu-22.04-amd64
+          path: |
+            *.tar.gz
+
   build-linux-packages:
     needs:
       - build-artifact
@@ -372,6 +398,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs:
       - build-artifact
+      - build-artifact-dev
       - build-linux-packages
       - build-linux-packages-arm64
       - build-extra-packages
@@ -411,22 +438,22 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-22.04
-            arch: amd64
+          - artifact_suffix: ubuntu-22.04-amd64
             asset_name_suffix: linux_amd64.tar.gz
             asset_content_type: application/gzip
-          - os: ubuntu-22.04
-            arch: arm64
+          - artifact_suffix: ubuntu-22.04-arm64
             asset_name_suffix: linux_arm64.tar.gz
             asset_content_type: application/gzip
-          - os: macos-12
-            arch: amd64
+          - artifact_suffix: macos-12-amd64
             asset_name_suffix: macos_amd64.tar.gz
             asset_content_type: application/gzip
+          - artifact_suffix: dev-ubuntu-22.04-amd64
+            asset_name_suffix: linux_amd64-dev.tar.gz
+            asset_content_type: application/gzip
     steps:
       - uses: actions/download-artifact@v3
         with:
-          name: artifact-${{ matrix.os }}-${{ matrix.arch }}
+          name: artifact-${{ matrix.artifact_suffix }}
 
       - uses: actions/download-artifact@v3
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ on:
 
 env:
   APP_NAME: 'manticore-executor'
-  PHP_VERSION: '8.2.4'
+  PHP_VERSION: '8.2.8'
   MAINTAINER: 'Manticore'
   DESC: 'Custom built PHP executor for Manticore.'
 
@@ -20,10 +20,16 @@ jobs:
           - ubuntu-22.04
           - macos-12
         include:
-          - os: ubuntu-22.04
+          - job_name: 'Build static in Alpine'
+            os: ubuntu-22.04
             use_docker: true
             script_name: ./build-alpine
-          - os: macos-12
+          - job_name: 'Build dev version in Jammy'
+            os: ubuntu-22.04
+            use_docker: false
+            script_name: ./build-linux
+          - job_name: 'Build static on OSX'
+            os: macos-12
             use_docker: false
             script_name: ./build-osx
     steps:
diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_DEV=0
 COPY . /src
 RUN apk add bash && \
   cd /src && \
-  ./build-alpine 8.2.4 0 $BUILD_DEV && \
+  ./build-alpine 8.2.8 0 $BUILD_DEV && \
   mv build/dist/bin/php /usr/bin/manticore-executor && \
   ln -s /usr/bin/manticore-executor /usr/bin/php && \
   cd ../..
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Manticore Executor is a custom built PHP binary which:
 
 By default, we disable all extensions and enable only those required to run our scripts.
 
-We build executor from `PHP 8.2.4` with the following extensions enabled and compiled into the executable statically:
+We build executor from `PHP 8.2.8` with the following extensions enabled and compiled into the executable statically:
 
 * pcntl
 * posix
@@ -83,13 +83,13 @@ Several scripts used to build the final package:
 * `build-linux`
 * `build-osx`
 
-The scripts accept a version of PHP as a parameter. The current version is `8.2.4`. To build the binary, you should run the following example:
+The scripts accept a version of PHP as a parameter. The current version is `8.2.8`. To build the binary, you should run the following example:
 
 ```bash
-./build-linux "8.2.4"
+./build-linux "8.2.8"
 ```
 
-The command above will build the package on Linux with **PHP** `8.2.4`. Once it's done, you can find your binary in folder `dist/bin`.
+The command above will build the package on Linux with **PHP** `8.2.8`. Once it's done, you can find your binary in folder `dist/bin`.
 
 ### Build for MacOS arm64
 
diff --git a/build-alpine b/build-alpine
@@ -6,7 +6,9 @@
 # received a copy of the license along with this program; if you did not,
 # you can find it at https://www.php.net/license/3_01.txt
 
-set -e
+set -xe
+. helper.sh
+
 install_deps() {
   arch=$(arch)
   # Do basic configuration of the system, and install build tools
@@ -22,59 +24,22 @@ install_deps() {
 
   apk add curl git autoconf bison re2c pkgconf zlib-dev zstd-dev openssl-libs-static openssl-dev zlib-static zlib-dev
 
-  # Build curl
-  test -d curl-8.0.0 && rm -f $_
-  curl -sSL https://github.com/curl/curl/releases/download/curl-8_0_0/curl-8.0.0.tar.gz | tar -xzf -
-  cd curl-8.0.0
-  ./configure --disable-shared --with-ssl --without-libidn2
-  make -j8
-  make install
-  cd ..
+  install_curl
 
-  test -d libzip-1.9.2 && rm -f $_
-  curl -sSL https://github.com/nih-at/libzip/releases/download/v1.9.2/libzip-1.9.2.tar.gz | tar -xzf -
-  cd libzip-1.9.2 && mkdir -p build && cd build
-  cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_LZMA=OFF -DENABLE_BZIP2=OFF ..
-  make -j4 && make install
-  cd ../..
-  rm -fr libzip-1.9.2
+  install_libzip
 }
 
 install_dev_deps() {
   apk add gmp-dev judy-dev bsd-compat-headers m4
 
-  test -d libxml2-2.10.3 && rm -f libxml2-2.10.3
-  curl -sSL https://github.com/GNOME/libxml2/archive/refs/tags/v2.10.3.tar.gz | tar -xzf -
-  cd libxml2-2.10.3 && mkdir -p build && cd build
-  cmake -DBUILD_SHARED_LIBS=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_ICONV=OFF -DCMAKE_BUILD_TYPE=Release ..
-  make -j4 && make install
-  cd ../..
-  rm -fr libxml2-2.10.3
+  install_libxml2
 }
 
 export -f install_deps install_dev_deps
 . build-bash-base.sh "$@"
 
 if [ "$BUILD_DEV" -eq 1 ]; then
-  cd ext
-
-  git clone https://github.com/donhardman/php-memory-profiler.git memprof && cd "$_"
-  git checkout 68eb143bd5700a6fe041826118aeb9a13a3fcef3
-  cd ..
-
-  git clone https://github.com/tideways/php-xhprof-extension.git tideways_xhprof && cd "$_"
-  git checkout 6ee298f910a3661960f454bd6a787686657c7570
-  cd ..
-
-  # Still not working due to zend 
-  # git clone https://github.com/donhardman/xdebug.git xdebug && cd "$_"
-  # git checkout xdebug_3_2
-  # cd ..
-
-  cd ..
-
-  # We need to rebuild because we modify extensions in PHP core code
-  ./buildconf --force
+  build_dev_conf
 fi
 
 MAKE_LDFLAGS=-ldl
@@ -94,9 +59,7 @@ ENABLE_STATIC=yes
   --enable-mbstring \
   "${BUILD_EXTRA[@]}"
 
-sed -ie 's/PHP_INI_ENTRY("openssl.cafile", NULL, PHP_INI_PERDIR, NULL)/PHP_INI_ENTRY("openssl.cafile", "\/etc\/ssl\/cert.pem", PHP_INI_PERDIR, NULL)/g' ext/openssl/openssl.c
-sed -ie 's/-export-dynamic//g' Makefile
-sed -ie 's/-o $(SAPI_CLI_PATH)/-all-static -o $(SAPI_CLI_PATH)/g' Makefile
+fix_static_linking
 
 make LDFLAGS=$MAKE_LDFLAGS -j8
 make install-cli
diff --git a/build-linux b/build-linux
@@ -6,42 +6,37 @@
 # received a copy of the license along with this program; if you did not,
 # you can find it at https://www.php.net/license/3_01.txt
 
-# ! This script is deprecated and we use muslc build on alpine.
-# See: build-alpine
-set -e
+# We use this script exclusively to build dev version, because static linking is hard
+# For static linking we keep using the alpine docker image and buildx
+
+# To make it work on fresh ubuntu jammy, run the following command:
+# apt-get install -y libxml2 libcurl4 libonig5 libzip4
+
+set -xe
+. helper.sh
+
 install_deps() {
   sudo apt-get update -y
-  sudo apt-get install -y curl build-essential autoconf automake bison re2c libzstd-dev pkg-config git libssl-dev zlib1g-dev libzip-dev libonig-dev cmake
-
-  # Build curl
-  curl -sSL https://github.com/curl/curl/releases/download/curl-8_0_0/curl-8.0.0.tar.gz | tar -xzf -
-  cd curl-8.0.0
-  ./configure --disable-shared --with-ssl --without-libidn2
-  make -j8
-  sudo make install
-  cd ..
+  sudo apt-get install -y curl build-essential autoconf automake bison re2c libzstd-dev pkg-config git libssl-dev zlib1g-dev libzip-dev libonig-dev cmake libcurl4-openssl-dev libzip-dev
 }
 
 install_dev_deps() {
-  sudo apt-get install -y libonig-dev libgmp-dev
+  sudo apt-get install -y libonig-dev libgmp-dev libxml2-dev
 }
 
 export -f install_deps install_dev_deps
 . build-bash-base.sh "$@"
 
-CONFIGURE_LDFLAGS=
-MAKE_LDFLAGS=
-ENABLE_SHARED=yes
-ENABLE_STATIC=no
-if [[ "$BUILD_STATIC" == 1 ]]; then
-  CONFIGURE_LDFLAGS=-static
-  MAKE_LDFLAGS=-ldl
-  ENABLE_SHARED=no
-  ENABLE_STATIC=yes
+
+if [ "$BUILD_DEV" -eq 1 ]; then
+  build_dev_conf
 fi
 
 
-./configure LDFLAGS=$CONFIGURE_LDFLAGS CFLAGS="-O3" --prefix="$BUILD_PREFIX" --disable-all \
+ENABLE_SHARED=yes
+ENABLE_STATIC=yes
+
+./configure CFLAGS="-O3" --prefix="$BUILD_PREFIX" --disable-all \
   --enable-shared=$ENABLE_SHARED --enable-static=$ENABLE_STATIC --with-layout=GNU \
   --with-pear=no --disable-cgi --disable-phpdbg \
   --with-pcre-jit --enable-zstd --with-libzstd  \
@@ -54,11 +49,5 @@ fi
   --enable-mbstring \
   "${BUILD_EXTRA[@]}"
 
-if [[ "$BUILD_STATIC" == 1 ]]; then
-  sed -ie 's/-export-dynamic//g' Makefile
-  sed -ie 's/-o $(SAPI_CLI_PATH)/-all-static -o $(SAPI_CLI_PATH)/g' Makefile
-fi
-
-make LDFLAGS=$MAKE_LDFLAGS -j8
+make -j8
 make install-cli
-strip --strip-all dist/bin/php
diff --git a/collect-assets b/collect-assets
@@ -8,7 +8,7 @@
 # ! Must be defined: APP_ARCH, APP_NAME, APP_VERSION, GITHUB_SHA, RUNNER_OS
 # This script is part of tools to use in GitHub workflow
 
-assets="${APP_NAME}_${APP_VERSION}-$( date +%y%m%d )-${GITHUB_SHA:0:7}_$(echo "${RUNNER_OS}" | tr '[:upper:]' '[:lower:]')_${APP_ARCH}"
+assets="${APP_NAME}_${APP_VERSION}-$( date +%y%m%d )-${GITHUB_SHA:0:7}_$(echo "${RUNNER_OS}" | tr '[:upper:]' '[:lower:]')_${APP_ARCH}${ASSET_SUFFIX}"
 
 pwd
 echo "$assets"
diff --git a/helper.sh b/helper.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+set -ex
+
+install_curl() {
+	test -d curl-8.0.0 && rm -fr "$_"
+	curl -sSL https://github.com/curl/curl/releases/download/curl-8_0_0/curl-8.0.0.tar.gz | tar -xzf -
+	cd curl-8.0.0
+	./configure --disable-shared --with-ssl --without-libidn2
+	make -j8
+	make install
+	cd ..
+}
+
+install_libzip() {
+	test -d libzip-1.9.2 && rm -fr "$_"
+	curl -sSL https://github.com/nih-at/libzip/releases/download/v1.9.2/libzip-1.9.2.tar.gz | tar -xzf -
+	cd libzip-1.9.2 && mkdir -p build && cd build
+	cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_LZMA=OFF -DENABLE_BZIP2=OFF ..
+	make -j4 && make install
+	cd ../..
+	rm -fr libzip-1.9.2
+}
+
+install_libxml2() {
+  test -d libxml2-2.10.3 && rm -fr libxml2-2.10.3
+  curl -sSL https://github.com/GNOME/libxml2/archive/refs/tags/v2.10.3.tar.gz | tar -xzf -
+  cd libxml2-2.10.3 && mkdir -p build && cd build
+  cmake -DBUILD_SHARED_LIBS=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_ICONV=OFF -DCMAKE_BUILD_TYPE=Release ..
+  make -j4 && make install
+  cd ../..
+  rm -fr libxml2-2.10.3
+}
+
+build_dev_conf() {
+	cd ext
+
+	git clone https://github.com/donhardman/php-memory-profiler.git memprof && cd "$_"
+	git checkout 68eb143bd5700a6fe041826118aeb9a13a3fcef3
+	cd ..
+
+	git clone https://github.com/tideways/php-xhprof-extension.git tideways_xhprof && cd "$_"
+	git checkout 6ee298f910a3661960f454bd6a787686657c7570
+	cd ..
+
+	# Still not working due to zend
+	# git clone https://github.com/donhardman/xdebug.git xdebug && cd "$_"
+	# git checkout xdebug_3_2
+	# cd ..
+
+	cd ..
+
+	# We need to rebuild because we modify extensions in PHP core code
+	./buildconf --force
+}
+
+fix_static_linking() {
+	sed -ie 's/PHP_INI_ENTRY("openssl.cafile", NULL, PHP_INI_PERDIR, NULL)/PHP_INI_ENTRY("openssl.cafile", "\/etc\/ssl\/cert.pem", PHP_INI_PERDIR, NULL)/g' ext/openssl/openssl.c
+	sed -ie 's/-export-dynamic//g' Makefile
+	sed -ie 's/-o $(SAPI_CLI_PATH)/-all-static -o $(SAPI_CLI_PATH)/g' Makefile
+}
