From 4cf5f3eabfced1f223373017cbf3dc666b80a972 Mon Sep 17 00:00:00 2001 From: Winfried Date: Sun, 7 May 2017 16:54:55 +0200 Subject: [PATCH 1/2] Removing suffix for Aerospike and V8JS --- DOCUMENTATION/content/documentation/index.md | 8 ++++---- docker-compose.yml | 6 +++--- env-example | 6 +++--- php-fpm/Dockerfile-56 | 6 +++--- php-fpm/Dockerfile-70 | 6 +++--- php-fpm/Dockerfile-71 | 6 +++--- workspace/Dockerfile-56 | 8 ++++---- workspace/Dockerfile-70 | 14 +++++++------- workspace/Dockerfile-71 | 14 +++++++------- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 8db3ee38..f1f5dcff 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -1239,11 +1239,11 @@ You are free to modify the `aliases.sh` as you see fit, adding your own aliases
a) open the `docker-compose.yml` file
-b) search for the `INSTALL_AEROSPIKE_EXTENSION` argument under the Workspace Container +b) search for the `INSTALL_AEROSPIKE` argument under the Workspace Container
c) set it to `true`
-d) search for the `INSTALL_AEROSPIKE_EXTENSION` argument under the PHP-FPM Container +d) search for the `INSTALL_AEROSPIKE` argument under the PHP-FPM Container
e) set it to `true` @@ -1254,13 +1254,13 @@ It should be like this: build: context: ./workspace args: - - INSTALL_AEROSPIKE_EXTENSION=true + - INSTALL_AEROSPIKE=true ... php-fpm: build: context: ./php-fpm args: - - INSTALL_AEROSPIKE_EXTENSION=true + - INSTALL_AEROSPIKE=true ... ``` diff --git a/docker-compose.yml b/docker-compose.yml index 3db26275..e7b82fe9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,8 +23,8 @@ services: - INSTALL_NODE=${WORKSPACE_INSTALL_NODE} - INSTALL_YARN=${WORKSPACE_INSTALL_YARN} - INSTALL_DRUSH=${WORKSPACE_INSTALL_DRUSH} - - INSTALL_AEROSPIKE_EXTENSION=${WORKSPACE_INSTALL_AEROSPIKE_EXTENSION} - - INSTALL_V8JS_EXTENSION=${WORKSPACE_INSTALL_V8JS_EXTENSION} + - INSTALL_AEROSPIKE=${WORKSPACE_INSTALL_AEROSPIKE} + - INSTALL_V8JS=${WORKSPACE_INSTALL_V8JS} - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL} - INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH} - INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY} @@ -67,7 +67,7 @@ services: - INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED} - INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE} - INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF} - - INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION} + - INSTALL_AEROSPIKE=${PHP_FPM_INSTALL_AEROSPIKE} - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI} - INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER} - INSTALL_INTL=${PHP_FPM_INSTALL_INTL} diff --git a/env-example b/env-example index 22dab27d..2a38efb5 100644 --- a/env-example +++ b/env-example @@ -36,8 +36,8 @@ WORKSPACE_INSTALL_MSSQL=false WORKSPACE_INSTALL_NODE=false WORKSPACE_INSTALL_YARN=false WORKSPACE_INSTALL_DRUSH=false -WORKSPACE_INSTALL_AEROSPIKE_EXTENSION=false -WORKSPACE_INSTALL_V8JS_EXTENSION=false +WORKSPACE_INSTALL_AEROSPIKE=false +WORKSPACE_INSTALL_V8JS=false WORKSPACE_COMPOSER_GLOBAL_INSTALL=false WORKSPACE_INSTALL_WORKSPACE_SSH=false WORKSPACE_INSTALL_LARAVEL_ENVOY=false @@ -63,7 +63,7 @@ PHP_FPM_INSTALL_PHPREDIS=false PHP_FPM_INSTALL_MEMCACHED=false PHP_FPM_INSTALL_OPCACHE=false PHP_FPM_INSTALL_EXIF=false -PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false +PHP_FPM_INSTALL_AEROSPIKE=false PHP_FPM_INSTALL_MYSQLI=false PHP_FPM_INSTALL_TOKENIZER=false PHP_FPM_INSTALL_INTL=false diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 124bd49b..3ad2ad86 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -148,11 +148,11 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ # PHP Aerospike: ##################################### -ARG INSTALL_AEROSPIKE_EXTENSION=false -ENV INSTALL_AEROSPIKE_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION} +ARG INSTALL_AEROSPIKE=false +ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} # Copy aerospike configration for remote debugging COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini -RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \ +RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \ && mkdir -p aerospike-client-php \ diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 4ee90e80..99fda381 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -156,11 +156,11 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ # PHP Aerospike: ##################################### -ARG INSTALL_AEROSPIKE_EXTENSION=false -ENV INSTALL_AEROSPIKE_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION} +ARG INSTALL_AEROSPIKE=false +ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} # Copy aerospike configration for remote debugging COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini -RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \ +RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \ && mkdir -p aerospike-client-php \ diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index a971c0e1..a635df08 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -156,11 +156,11 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ # PHP Aerospike: ##################################### -ARG INSTALL_AEROSPIKE_EXTENSION=false -ENV INSTALL_AEROSPIKE_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION} +ARG INSTALL_AEROSPIKE=false +ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} # Copy aerospike configration for remote debugging COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini -RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \ +RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \ && mkdir -p aerospike-client-php \ diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index a306ae03..73ffd034 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -278,13 +278,13 @@ RUN if [ ${INSTALL_YARN} = true ]; then \ ##################################### USER root -ARG INSTALL_AEROSPIKE_EXTENSION=true -ENV INSTALL_AEROSPIKE_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION} +ARG INSTALL_AEROSPIKE=true +ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} # Copy aerospike configration for remote debugging COPY ./aerospike.ini /etc/php/5.6/cli/conf.d/aerospike.ini -RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \ +RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \ && mkdir -p aerospike-client-php \ @@ -298,7 +298,7 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \ && rm /tmp/aerospike-client-php.tar.gz \ ;fi -RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = false ]; then \ +RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ rm /etc/php/5.6/cli/conf.d/aerospike.ini \ ;fi diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 82c76a55..ade5d0c4 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -278,13 +278,13 @@ RUN if [ ${INSTALL_YARN} = true ]; then \ ##################################### USER root -ARG INSTALL_AEROSPIKE_EXTENSION=true -ENV INSTALL_AEROSPIKE_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION} +ARG INSTALL_AEROSPIKE=true +ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} # Copy aerospike configration for remote debugging COPY ./aerospike.ini /etc/php/7.0/cli/conf.d/aerospike.ini -RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \ +RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \ && mkdir -p aerospike-client-php \ @@ -298,7 +298,7 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \ && rm /tmp/aerospike-client-php.tar.gz \ ;fi -RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = false ]; then \ +RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ rm /etc/php/7.0/cli/conf.d/aerospike.ini \ ;fi @@ -307,10 +307,10 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = false ]; then \ ##################################### USER root -ARG INSTALL_V8JS_EXTENSION=false -ENV INSTALL_V8JS_EXTENSION ${INSTALL_V8JS_EXTENSION} +ARG INSTALL_V8JS=false +ENV INSTALL_V8JS ${INSTALL_V8JS} -RUN if [ ${INSTALL_V8JS_EXTENSION} = true ]; then \ +RUN if [ ${INSTALL_V8JS} = true ]; then \ # Install the php V8JS extension add-apt-repository -y ppa:pinepain/libv8-5.4 \ && apt-get update -yqq \ diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index b01ce514..acc13354 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -274,13 +274,13 @@ RUN if [ ${INSTALL_YARN} = true ]; then \ ##################################### USER root -ARG INSTALL_AEROSPIKE_EXTENSION=true -ENV INSTALL_AEROSPIKE_EXTENSION ${INSTALL_AEROSPIKE_EXTENSION} +ARG INSTALL_AEROSPIKE=true +ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} # Copy aerospike configration for remote debugging COPY ./aerospike.ini /etc/php/7.1/cli/conf.d/aerospike.ini -RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \ +RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \ && mkdir -p aerospike-client-php \ @@ -294,7 +294,7 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \ && rm /tmp/aerospike-client-php.tar.gz \ ;fi -RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = false ]; then \ +RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ rm /etc/php/7.1/cli/conf.d/aerospike.ini \ ;fi @@ -303,10 +303,10 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = false ]; then \ ##################################### USER root -ARG INSTALL_V8JS_EXTENSION=false -ENV INSTALL_V8JS_EXTENSION ${INSTALL_V8JS_EXTENSION} +ARG INSTALL_V8JS=false +ENV INSTALL_V8JS ${INSTALL_V8JS} -RUN if [ ${INSTALL_V8JS_EXTENSION} = true ]; then \ +RUN if [ ${INSTALL_V8JS} = true ]; then \ # Install the php V8JS extension add-apt-repository -y ppa:pinepain/libv8-5.4 \ && apt-get update -yqq \ From 313422144582fa98808b17609de9fbe0ceb0a6ba Mon Sep 17 00:00:00 2001 From: Winfried Date: Sun, 7 May 2017 16:56:15 +0200 Subject: [PATCH 2/2] Fixing aerospike --- php-fpm/Dockerfile-71 | 11 ++++++++++- workspace/Dockerfile-71 | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index a635df08..ba8101fc 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -158,9 +158,15 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ ARG INSTALL_AEROSPIKE=false ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} + # Copy aerospike configration for remote debugging COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini + RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ + # Fix dependencies for PHPUnit within aerospike extension + apt-get update -yqq && \ + apt-get -y install sudo wget && \ + # Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \ && mkdir -p aerospike-client-php \ @@ -172,7 +178,10 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ && make install \ ) \ && rm /tmp/aerospike-client-php.tar.gz \ - && docker-php-ext-enable aerospike \ +;fi + +RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \ + rm /usr/local/etc/php/conf.d/aerospike.ini \ ;fi ##################################### diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index acc13354..e29e2217 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -274,13 +274,17 @@ RUN if [ ${INSTALL_YARN} = true ]; then \ ##################################### USER root -ARG INSTALL_AEROSPIKE=true +ARG INSTALL_AEROSPIKE=false ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE} # Copy aerospike configration for remote debugging COPY ./aerospike.ini /etc/php/7.1/cli/conf.d/aerospike.ini RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ + # Fix dependencies for PHPUnit within aerospike extension + apt-get update -yqq && \ + apt-get -y install sudo wget && \ + # Install the php aerospike extension curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \ && mkdir -p aerospike-client-php \