diff --git a/packages/php-wasm/compile/libedit/Dockerfile b/packages/php-wasm/compile/libedit/Dockerfile index 913569f31e..6ac0a660e4 100644 --- a/packages/php-wasm/compile/libedit/Dockerfile +++ b/packages/php-wasm/compile/libedit/Dockerfile @@ -1,8 +1,8 @@ FROM playground-php-wasm:base RUN mkdir -p /root/lib/include /root/lib/lib -COPY ../libncurses/dist/root/lib/include /root/lib/include -COPY ../libncurses/dist/root/lib/lib /root/lib/lib +COPY ./libncurses/dist/root/lib/include /root/lib/include +COPY ./libncurses/dist/root/lib/lib /root/lib/lib RUN /root/copy-lib.sh lib-ncurses RUN wget https://www.thrysoee.dk/editline/libedit-20221030-3.1.tar.gz && \ diff --git a/packages/php-wasm/compile/libiconv/Dockerfile b/packages/php-wasm/compile/libiconv/Dockerfile index b7fd062870..bd6dff1da6 100644 --- a/packages/php-wasm/compile/libiconv/Dockerfile +++ b/packages/php-wasm/compile/libiconv/Dockerfile @@ -1,8 +1,8 @@ FROM playground-php-wasm:base RUN mkdir -p /root/lib/include /root/lib/lib -COPY ../libz/dist/root/lib/include /root/lib/include -COPY ../libz/dist/root/lib/lib /root/lib/lib +COPY ./libz/dist/root/lib/include /root/lib/include +COPY ./libz/dist/root/lib/lib /root/lib/lib RUN set -euxo pipefail; \ wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz; \ diff --git a/packages/php-wasm/compile/libopenssl/Dockerfile b/packages/php-wasm/compile/libopenssl/Dockerfile index ac219daceb..09f24fad54 100644 --- a/packages/php-wasm/compile/libopenssl/Dockerfile +++ b/packages/php-wasm/compile/libopenssl/Dockerfile @@ -1,8 +1,8 @@ FROM playground-php-wasm:base RUN mkdir -p /root/lib/include /root/lib/lib -COPY ../libz/dist/root/lib/include /root/lib/include -COPY ../libz/dist/root/lib/lib /root/lib/lib +COPY ./libz/dist/root/lib/include /root/lib/include +COPY ./libz/dist/root/lib/lib /root/lib/lib RUN /root/copy-lib.sh lib-libz RUN set -euxo pipefail && \ diff --git a/packages/php-wasm/compile/libpng16/Dockerfile b/packages/php-wasm/compile/libpng16/Dockerfile index 78e0124a1b..706de88d1c 100644 --- a/packages/php-wasm/compile/libpng16/Dockerfile +++ b/packages/php-wasm/compile/libpng16/Dockerfile @@ -1,8 +1,8 @@ FROM playground-php-wasm:base RUN mkdir -p /root/lib/include /root/lib/lib -COPY ../libz/dist/root/lib/include /root/lib/include -COPY ../libz/dist/root/lib/lib /root/lib/lib +COPY ./libz/dist/root/lib/include /root/lib/include +COPY ./libz/dist/root/lib/lib /root/lib/lib RUN wget http://prdownloads.sourceforge.net/libpng/libpng-1.6.39.tar.gz?download -O libpng-1.6.39.tar.gz RUN tar -xzf libpng-1.6.39.tar.gz @@ -16,4 +16,4 @@ RUN source /root/emsdk/emsdk_env.sh && \ --target wasm32-unknown-emscripten \ --prefix=/root/install/ RUN source /root/emsdk/emsdk_env.sh && EMCC_SKIP="-lc -lz" EMCC_FLAGS="-sSIDE_MODULE" emmake make -RUN source /root/emsdk/emsdk_env.sh && emmake make install +RUN source /root/emsdk/emsdk_env.sh && emmake make install diff --git a/packages/php-wasm/compile/libsqlite3/Dockerfile b/packages/php-wasm/compile/libsqlite3/Dockerfile index 69f8129313..5aee6c6560 100644 --- a/packages/php-wasm/compile/libsqlite3/Dockerfile +++ b/packages/php-wasm/compile/libsqlite3/Dockerfile @@ -1,8 +1,8 @@ FROM playground-php-wasm:base RUN mkdir -p /root/lib/include /root/lib/lib -COPY ../libz/dist/root/lib/include /root/lib/include -COPY ../libz/dist/root/lib/lib /root/lib/lib +COPY ./libz/dist/root/lib/include /root/lib/include +COPY ./libz/dist/root/lib/lib /root/lib/lib RUN set -euxo pipefail &&\ wget --no-check-certificate https://www.sqlite.org/2022/sqlite-autoconf-3400100.tar.gz && \ diff --git a/packages/php-wasm/compile/libzip/Dockerfile b/packages/php-wasm/compile/libzip/Dockerfile index 28de163cfb..5ecc5e6d84 100644 --- a/packages/php-wasm/compile/libzip/Dockerfile +++ b/packages/php-wasm/compile/libzip/Dockerfile @@ -2,8 +2,8 @@ FROM playground-php-wasm:base ARG LIBZIP_VERSION RUN mkdir -p /root/lib/include /root/lib/lib -COPY ../libz/dist/root/lib/include /root/lib/include -COPY ../libz/dist/root/lib/lib /root/lib/lib +COPY ./libz/dist/root/lib/include /root/lib/include +COPY ./libz/dist/root/lib/lib /root/lib/lib RUN cd /root && \ curl -k https://libzip.org/download/libzip-$LIBZIP_VERSION.tar.gz -o libzip-$LIBZIP_VERSION.tar.gz && \ diff --git a/packages/php-wasm/compile/php/Dockerfile b/packages/php-wasm/compile/php/Dockerfile index dca027388b..30cba49744 100644 --- a/packages/php-wasm/compile/php/Dockerfile +++ b/packages/php-wasm/compile/php/Dockerfile @@ -18,18 +18,18 @@ RUN cd php-src && ./buildconf --force # Bring in the libraries RUN mkdir -p /root/lib/include /root/lib/lib /libs -COPY ../bison2.7/dist/ /libs/bison2.7 -COPY ../libedit/dist/root/lib /root/lib -COPY ../libiconv/dist/root/lib /root/lib -COPY ../libncurses/dist/root/lib /root/lib -COPY ../libopenssl/dist/root/lib /root/lib -COPY ../libpng16/dist/root/lib /root/lib -COPY ../libsqlite3/dist/root/lib /root/lib -COPY ../libxml2/dist/root/lib /root/lib -COPY ../libz/dist/root/lib /root/lib -COPY ../libzip/dist/1.2.0/root/lib /libs/libzip/1.2.0 -COPY ../libzip/dist/1.9.2/root/lib /libs/libzip/1.9.2 -COPY ../oniguruma/dist/root/lib /root/lib +COPY ./bison2.7/dist/ /libs/bison2.7 +COPY ./libedit/dist/root/lib /root/lib +COPY ./libiconv/dist/root/lib /root/lib +COPY ./libncurses/dist/root/lib /root/lib +COPY ./libopenssl/dist/root/lib /root/lib +COPY ./libpng16/dist/root/lib /root/lib +COPY ./libsqlite3/dist/root/lib /root/lib +COPY ./libxml2/dist/root/lib /root/lib +COPY ./libz/dist/root/lib /root/lib +COPY ./libzip/dist/1.2.0/root/lib /libs/libzip/1.2.0 +COPY ./libzip/dist/1.9.2/root/lib /libs/libzip/1.9.2 +COPY ./oniguruma/dist/root/lib /root/lib # Build PHP @@ -91,7 +91,7 @@ RUN if [ "$WITH_LIBZIP" = "yes" ]; then \ /root/replace.sh 's/pharcmd=pharcmd/pharcmd=/g' /root/php-src/configure && \ /root/replace.sh 's/pharcmd_install=install-pharcmd/pharcmd_install=/g' /root/php-src/configure; \ fi; - + # Add ncurses if needed and libedit if needed RUN if [ "$WITH_CLI_SAPI" = "yes" ]; \