Merge pull request laradock#300 from lialosiu/master

Mahmoudz · web-flow · commit 2ed475f1efe4 · 2016-09-10T17:48:24.000-04:00
fix php warning in Workspace: "Unable to load dynamic library aerospike"
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
@@ -186,6 +186,9 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \
     ) \
     && rm /tmp/aerospike-client-php.tar.gz \
 ;fi
+RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = false ]; then \
+    rm /etc/php/7.0/cli/conf.d/aerospike.ini \
+;fi
 
 #
 #--------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,9 @@ RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = true ]; then \`
`186`	`186`	`) \`
`187`	`187`	`&& rm /tmp/aerospike-client-php.tar.gz \`
`188`	`188`	`;fi`
	`189`	`+RUN if [ ${INSTALL_AEROSPIKE_EXTENSION} = false ]; then \`
	`190`	`+ rm /etc/php/7.0/cli/conf.d/aerospike.ini \`
	`191`	`+;fi`
`189`	`192`
`190`	`193`	`#`
`191`	`194`	`#--------------------------------------------------------------------------`