From da58d2e9b9541695d1ffa6020a59b4e03b077b55 Mon Sep 17 00:00:00 2001 From: Winfried Date: Wed, 3 May 2017 23:32:39 +0200 Subject: [PATCH] Fixing V8JS Fixes #792 --- workspace/Dockerfile-56 | 17 ----------------- workspace/Dockerfile-70 | 2 +- workspace/Dockerfile-71 | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 1343ae91..2632ff75 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -299,23 +299,6 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = false ]; then \ rm /etc/php/5.6/cli/conf.d/aerospike.ini \ ;fi -##################################### -# PHP V8JS: -##################################### -USER root - -ARG INSTALL_V8JS_EXTENSION=false -ENV INSTALL_V8JS_EXTENSION ${INSTALL_V8JS_EXTENSION} - -RUN if [ ${INSTALL_V8JS_EXTENSION} = true ]; then \ - # Install the php V8JS extension - add-apt-repository -y ppa:pinepain/libv8-5.4 \ - && apt-get update \ - && apt-get install -y php-dev php-pear libv8-5.4 \ - && pecl install v8js \ - && echo "extension=v8js.so" >> /etc/php/5.6/cli/php.ini \ -;fi - ##################################### # Non-root user : PHPUnit path ##################################### diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 70c5439d..49d36922 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -311,7 +311,7 @@ RUN if [ ${INSTALL_V8JS_EXTENSION} = true ]; then \ # Install the php V8JS extension add-apt-repository -y ppa:pinepain/libv8-5.4 \ && apt-get update \ - && apt-get install -y php-dev php-pear libv8-5.4 \ + && apt-get install -y php7.0-xml php7.0-dev php-pear libv8-5.4 \ && pecl install v8js \ && echo "extension=v8js.so" >> /etc/php/7.0/cli/php.ini \ ;fi diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index b627085f..0ced70c9 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -307,7 +307,7 @@ RUN if [ ${INSTALL_V8JS_EXTENSION} = true ]; then \ # Install the php V8JS extension add-apt-repository -y ppa:pinepain/libv8-5.4 \ && apt-get update \ - && apt-get install -y php-dev php-pear libv8-5.4 \ + && apt-get install -y php-xml php-dev php-pear libv8-5.4 \ && pecl install v8js \ && echo "extension=v8js.so" >> /etc/php/7.1/cli/php.ini \ ;fi