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
b0edaf93
Unverified
Commit
b0edaf93
authored
Feb 22, 2019
by
Shao Yu-Lung (Allen)
Committed by
GitHub
Feb 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reorganizaion aerospike extension install (#2008)
parent
27af2bca
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
27 deletions
+18
-27
docker-compose.yml
docker-compose.yml
+0
-2
env-example
env-example
+0
-5
Dockerfile
php-fpm/Dockerfile
+7
-8
travis-build.sh
travis-build.sh
+0
-4
Dockerfile
workspace/Dockerfile
+11
-8
No files found.
docker-compose.yml
View file @
b0edaf93
...
...
@@ -75,7 +75,6 @@ services:
-
INSTALL_WP_CLI=${WORKSPACE_INSTALL_WP_CLI}
-
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}
...
...
@@ -146,7 +145,6 @@ 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}
...
...
env-example
View file @
b0edaf93
...
...
@@ -372,11 +372,6 @@ AEROSPIKE_FABRIC_PORT=3001
AEROSPIKE_HEARTBEAT_PORT=3002
AEROSPIKE_INFO_PORT=3003
# for all versions
AEROSPIKE_PHP_REPOSITORY=https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz
# for php 5.6
# AEROSPIKE_PHP_REPOSITORY=https://github.com/aerospike/aerospike-client-php5/archive/3.4.15.tar.gz
### RETHINKDB #############################################
RETHINKDB_PORT=8090
...
...
php-fpm/Dockerfile
View file @
b0edaf93
...
...
@@ -24,7 +24,7 @@ ARG LARADOCK_PHP_VERSION
ENV
DEBIAN_FRONTEND noninteractive
# always run apt update when start and after add new source list, then clean up at end.
RUN
apt-get update
-yqq
&&
\
RUN
set
-xe
&&
apt-get update
-yqq
&&
\
apt-get
install
-y
apt-utils
&&
\
pecl channel-update pecl.php.net
...
...
@@ -338,30 +338,29 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \
USER
root
ARG
INSTALL_AEROSPIKE=false
ARG
AEROSPIKE_PHP_REPOSITORY
RUN if
[
${
INSTALL_AEROSPIKE
}
=
true
]
;
then
\
RUN
set
-xe
&&
if
[
${
INSTALL_AEROSPIKE
}
=
true
]
;
then
\
# Fix dependencies for PHPUnit within aerospike extension
apt-get -y install sudo wget && \
# Install the php aerospike extension
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
curl -L -o /tmp/aerospike-client-php.tar.gz https://github.com/aerospike/aerospike-client-php5/archive/master.tar.gz; \
else \
curl -L -o /tmp/aerospike-client-php.tar.gz
${AEROSPIKE_PHP_REPOSITORY}
; \
curl -L -o /tmp/aerospike-client-php.tar.gz
https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz
; \
fi \
&& mkdir -p aerospike-client-php \
&& tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
&& mkdir -p
/tmp/
aerospike-client-php \
&& tar -C
/tmp/
aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
&& \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
( \
cd aerospike-client-php/src/aerospike \
cd
/tmp/
aerospike-client-php/src/aerospike \
&& phpize \
&& ./build.sh \
&& make install \
) \
else \
( \
cd aerospike-client-php/src \
cd
/tmp/
aerospike-client-php/src \
&& phpize \
&& ./build.sh \
&& make install \
...
...
travis-build.sh
View file @
b0edaf93
...
...
@@ -15,10 +15,6 @@ if [ -n "${PHP_VERSION}" ]; then
sed
-i
--
"s/PHP_VERSION=.*/PHP_VERSION=
${
PHP_VERSION
}
/g"
.env
sed
-i
--
's/=false/=true/g'
.env
sed
-i
--
's/PHPDBG=true/PHPDBG=false/g'
.env
if
[
"
${
PHP_VERSION
}
"
==
"5.6"
]
;
then
sed
-i
--
's/^AEROSPIKE_PHP_REPOSITORY=/##AEROSPIKE_PHP_REPOSITORY=/g'
.env
sed
-i
--
's/^# AEROSPIKE_PHP_REPOSITORY=/AEROSPIKE_PHP_REPOSITORY=/g'
.env
fi
cat
.env
docker-compose build
${
BUILD_SERVICE
}
docker images
...
...
workspace/Dockerfile
View file @
b0edaf93
...
...
@@ -37,7 +37,7 @@ ARG PGID=1000
ENV
PGID ${PGID}
# always run apt update when start and after add new source list, then clean up at end.
RUN
apt-get update
-yqq
&&
\
RUN
set
-xe
&&
apt-get update
-yqq
&&
\
pecl channel-update pecl.php.net
&&
\
groupadd
-g
${
PGID
}
laradock
&&
\
useradd
-u
${
PUID
}
-g
laradock
-m
laradock
-G
docker_env
&&
\
...
...
@@ -581,26 +581,29 @@ ENV PATH $PATH:/home/laradock/.yarn/bin
USER
root
ARG
INSTALL_AEROSPIKE=false
ARG
AEROSPIKE_PHP_REPOSITORY
RUN if
[
${
INSTALL_AEROSPIKE
}
=
true
]
;
then
\
RUN
set
-xe
&&
if
[
${
INSTALL_AEROSPIKE
}
=
true
]
;
then
\
# Fix dependencies for PHPUnit within aerospike extension
apt-get -y install sudo wget && \
# Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz ${AEROSPIKE_PHP_REPOSITORY} \
&& mkdir -p aerospike-client-php \
&& tar -C aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
curl -L -o /tmp/aerospike-client-php.tar.gz https://github.com/aerospike/aerospike-client-php5/archive/master.tar.gz; \
else \
curl -L -o /tmp/aerospike-client-php.tar.gz https://github.com/aerospike/aerospike-client-php/archive/master.tar.gz; \
fi \
&& mkdir -p /tmp/aerospike-client-php \
&& tar -C /tmp/aerospike-client-php -zxvf /tmp/aerospike-client-php.tar.gz --strip 1 \
&& \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
( \
cd aerospike-client-php/src/aerospike \
cd
/tmp/
aerospike-client-php/src/aerospike \
&& phpize \
&& ./build.sh \
&& make install \
) \
else \
( \
cd aerospike-client-php/src \
cd
/tmp/
aerospike-client-php/src \
&& phpize \
&& ./build.sh \
&& make install \
...
...
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