Enable zip into manticore-executor to support composer packages

Author: donhardman

Dockerfile

@@ -20,5 +20,5 @@ RUN test "$BUILD_DEV" -eq 1 && php -r "copy('https://getcomposer.org/installer',
 WORKDIR /src
 
 # Build on silicon chip mac:
-# docker buildx build --build-arg BUILD_DEV=0 --platform linux/amd64,linux/arm64 -t manticoresearch/manticore-executor:0.6.7 --push .
-# docker buildx build --build-arg BUILD_DEV=1 --platform linux/amd64,linux/arm64 -t manticoresearch/manticore-executor:0.6.7-dev --push .
+# docker buildx build --build-arg BUILD_DEV=0 --platform linux/amd64,linux/arm64 -t manticoresearch/manticore-executor:0.6.9 --push .
+# docker buildx build --build-arg BUILD_DEV=1 --platform linux/amd64,linux/arm64 -t manticoresearch/manticore-executor:0.6.9-dev --push .

build-alpine

@@ -23,16 +23,13 @@ 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_dev_deps() {
-  apk add gmp-dev judy-dev bsd-compat-headers m4
 
   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 -
@@ -41,6 +38,10 @@ install_dev_deps() {
   make -j4 && make install
   cd ../..
   rm -fr libzip-1.9.2
+}
+
+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 -
@@ -87,7 +88,7 @@ ENABLE_STATIC=yes
   --enable-pcntl --enable-posix \
   --enable-sockets \
   --enable-zts --enable-parallel \
-  --with-openssl --with-zlib \
+  --with-openssl --with-zlib --with-zip \
   --enable-filter \
   --with-curl \
   --enable-mbstring \

build-bash-base.sh

@@ -61,7 +61,6 @@ if [[ "$BUILD_DEV" == "1" ]]; then
     "--enable-xmlreader"
     "--enable-simplexml"
     "--enable-phar"
-    "--with-zip"
     # Little extra exts in case we will need it
     "--enable-bcmath"
     "--with-gmp"

build-linux

@@ -11,7 +11,7 @@
 set -e
 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 libonig-dev cmake
+  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 -
@@ -23,7 +23,7 @@ install_deps() {
 }
 
 install_dev_deps() {
-  sudo apt-get install -y libonig-dev libgmp-dev libzip-dev
+  sudo apt-get install -y libonig-dev libgmp-dev
 }
 
 export -f install_deps install_dev_deps
@@ -48,7 +48,7 @@ fi
   --enable-pcntl --enable-posix \
   --enable-sockets \
   --enable-zts --enable-parallel \
-  --with-openssl --with-zlib \
+  --with-openssl --with-zlib --with-zip \
   --enable-filter \
   --with-curl \
   --enable-mbstring \

build-osx

@@ -9,7 +9,7 @@
 set -e
 install_deps() {
   brew upgrade
-  brew install curl autoconf automake bison re2c zstd git openssl zlib cmake
+  brew install curl autoconf automake bison re2c zstd git openssl zlib cmake libzip
 
   OPENSSL_PREFIX="$(brew --prefix openssl)"
   OPENSSL_CFLAGS="-I${OPENSSL_PREFIX}/include"
@@ -83,7 +83,7 @@ fi
   --enable-pcntl --enable-posix \
   --enable-sockets \
   --enable-zts --enable-parallel \
-  --with-openssl --with-zlib \
+  --with-openssl --with-zlib --with-zip \
   --enable-filter \
   --with-curl \
   --enable-opcache \