Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laradock
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kerwin
laradock
Commits
f2f5aeab
Unverified
Commit
f2f5aeab
authored
Jun 01, 2018
by
Shao Yu-Lung (Allen)
Committed by
GitHub
Jun 01, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1580 from bestlong/aerospike-build-failed
fix aerospike build failed
parents
42a96033
0f4a417f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
0 deletions
+4
-0
docker-compose.yml
docker-compose.yml
+2
-0
Dockerfile
php-fpm/Dockerfile
+1
-0
Dockerfile
workspace/Dockerfile
+1
-0
No files found.
docker-compose.yml
View file @
f2f5aeab
...
...
@@ -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}
...
...
php-fpm/Dockerfile
View file @
f2f5aeab
...
...
@@ -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
...
...
workspace/Dockerfile
View file @
f2f5aeab
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment