Skip to content

Commit f2f5aea

Browse files
authored
Merge pull request laradock#1580 from bestlong/aerospike-build-failed
fix aerospike build failed
2 parents 42a9603 + 0f4a417 commit f2f5aea

3 files changed

Lines changed: 4 additions & 0 deletions

File tree

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ services:
6464
- INSTALL_DRUSH=${WORKSPACE_INSTALL_DRUSH}
6565
- INSTALL_DRUPAL_CONSOLE=${WORKSPACE_INSTALL_DRUPAL_CONSOLE}
6666
- INSTALL_AEROSPIKE=${WORKSPACE_INSTALL_AEROSPIKE}
67+
- AEROSPIKE_PHP_REPOSITORY=${AEROSPIKE_PHP_REPOSITORY}
6768
- INSTALL_V8JS=${WORKSPACE_INSTALL_V8JS}
6869
- COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
6970
- COMPOSER_REPO_PACKAGIST=${WORKSPACE_COMPOSER_REPO_PACKAGIST}
@@ -125,6 +126,7 @@ services:
125126
- INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
126127
- INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
127128
- INSTALL_AEROSPIKE=${PHP_FPM_INSTALL_AEROSPIKE}
129+
- AEROSPIKE_PHP_REPOSITORY=${AEROSPIKE_PHP_REPOSITORY}
128130
- INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
129131
- INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
130132
- INSTALL_PG_CLIENT=${PHP_FPM_INSTALL_PG_CLIENT}

php-fpm/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \
257257
USER root
258258

259259
ARG INSTALL_AEROSPIKE=false
260+
ARG AEROSPIKE_PHP_REPOSITORY
260261

261262
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
262263
# Fix dependencies for PHPUnit within aerospike extension

workspace/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,7 @@ USER root
440440

441441
ARG INSTALL_AEROSPIKE=false
442442
ARG PHP_VERSION=${PHP_VERSION}
443+
ARG AEROSPIKE_PHP_REPOSITORY
443444

444445
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
445446
# Fix dependencies for PHPUnit within aerospike extension

0 commit comments

Comments
 (0)