From 37ffbbea299be711859b984e3520d2fafc644ec9 Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sun, 14 Mar 2021 18:03:57 +0200 Subject: [PATCH 1/3] fix(aerospike extension): turn off build in Travis due to image version Base image (Ubuntu 18) is no supported by Aerospike. Closes #2881 --- travis-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/travis-build.sh b/travis-build.sh index e773b823..461306c7 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -18,6 +18,7 @@ if [ -n "${PHP_VERSION}" ]; then if [ "${PHP_VERSION}" == "5.6" ]; then # Aerospike C Client SDK 4.0.7, Debian 9.6 is not supported # https://github.com/aerospike/aerospike-client-php5/issues/145 + sed -i -- 's/WORKSPACE_INSTALL_AEROSPIKE=true/WORKSPACE_INSTALL_AEROSPIKE=false/g' .env sed -i -- 's/PHP_FPM_INSTALL_AEROSPIKE=true/PHP_FPM_INSTALL_AEROSPIKE=false/g' .env fi if [ "${PHP_VERSION}" == "7.3" ]; then From 793c1a085f87c26c3f165efed11ef3c737267958 Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sun, 14 Mar 2021 18:40:06 +0200 Subject: [PATCH 2/3] fix(aerospike extension): turn off build in Travis due to image version PHP 8.0 is not supported by Aerospike. See the issue's references. Closes #2881 --- workspace/Dockerfile | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 1225fc85..205436c4 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -872,18 +872,22 @@ RUN set -xe; \ && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ ( \ - cd /tmp/aerospike-client-php/src/aerospike \ - && phpize \ - && ./build.sh \ - && make install \ + cd /tmp/aerospike-client-php/src/aerospike \ + && phpize \ + && ./build.sh \ + && make install \ ) \ else \ - ( \ - cd /tmp/aerospike-client-php/src \ - && phpize \ - && ./build.sh \ - && make install \ - ) \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ + ( \ + cd /tmp/aerospike-client-php/src \ + && phpize \ + && ./build.sh \ + && make install \ + ) \ + else \ + echo "AEROSPIKE does not support PHP 8.0" + fi \ fi \ && rm /tmp/aerospike-client-php.tar.gz \ && echo 'extension=aerospike.so' >> /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \ From 7b396b7c39b510f545b9bb20bbcb210f45856964 Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sun, 14 Mar 2021 18:46:51 +0200 Subject: [PATCH 3/3] fix(aerospike extension): update syntax Fix typos in the build script. Closes #2881 --- workspace/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 205436c4..e97e4c51 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -886,9 +886,9 @@ RUN set -xe; \ && make install \ ) \ else \ - echo "AEROSPIKE does not support PHP 8.0" - fi \ - fi \ + echo "AEROSPIKE does not support PHP 8.0" \ + ;fi \ + ;fi \ && rm /tmp/aerospike-client-php.tar.gz \ && echo 'extension=aerospike.so' >> /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \ && echo 'aerospike.udf.lua_system_path=/usr/local/aerospike/lua' >> /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/aerospike.ini \