ykxiao/laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up aerospike and empty line

Browse Source
This commit is contained in:
Shao Yu Lung
2018-03-19 22:15:24 +08:00
parent c34d2d12b3
commit 5773d270ca
8 changed files with 38 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
php-fpm/Dockerfile-71
View File

@@ -213,13 +213,11 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \
#####################################
# PHP Aerospike:
#####################################
USER root
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 && \
@@ -235,10 +233,7 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
&& make install \
) \
&& rm /tmp/aerospike-client-php.tar.gz \
;fi
RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \
rm /usr/local/etc/php/conf.d/aerospike.ini \
&& docker-php-ext-enable aerospike \
;fi
#####################################