From 0f4a417f4e949680aef80694e9262f3557250e61 Mon Sep 17 00:00:00 2001 From: bestlong Date: Fri, 1 Jun 2018 01:30:35 +0800 Subject: [PATCH] fix aerospike build failed php-fpm and workspace --- docker-compose.yml | 2 ++ php-fpm/Dockerfile | 1 + workspace/Dockerfile | 1 + 3 files changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index f5b3557..93e28dd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -64,6 +64,7 @@ services: - INSTALL_DRUSH=${WORKSPACE_INSTALL_DRUSH} - INSTALL_DRUPAL_CONSOLE=${WORKSPACE_INSTALL_DRUPAL_CONSOLE} - INSTALL_AEROSPIKE=${WORKSPACE_INSTALL_AEROSPIKE} + - AEROSPIKE_PHP_REPOSITORY=${AEROSPIKE_PHP_REPOSITORY} - INSTALL_V8JS=${WORKSPACE_INSTALL_V8JS} - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL} - COMPOSER_REPO_PACKAGIST=${WORKSPACE_COMPOSER_REPO_PACKAGIST} @@ -125,6 +126,7 @@ services: - INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE} - INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF} - INSTALL_AEROSPIKE=${PHP_FPM_INSTALL_AEROSPIKE} + - AEROSPIKE_PHP_REPOSITORY=${AEROSPIKE_PHP_REPOSITORY} - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI} - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL} - INSTALL_PG_CLIENT=${PHP_FPM_INSTALL_PG_CLIENT} diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 6d4a3b3..43cd203 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -257,6 +257,7 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \ USER root ARG INSTALL_AEROSPIKE=false +ARG AEROSPIKE_PHP_REPOSITORY RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Fix dependencies for PHPUnit within aerospike extension diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 9031412..43f9ab6 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -440,6 +440,7 @@ USER root ARG INSTALL_AEROSPIKE=false ARG PHP_VERSION=${PHP_VERSION} +ARG AEROSPIKE_PHP_REPOSITORY RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \ # Fix dependencies for PHPUnit within aerospike extension