Merge with master branch

2017-03-17 14:36:00 +07:00
parent 8de9eca8ae
commit 5c0933d19a
87 changed files with 1966 additions and 1705 deletions
--- a/2
+++ b/2
@ -4,7 +4,7 @@


 # Grab full name of php-fpm container
-PHP_FPM_CONTAINER=$(docker-compose ps | grep php-fpm | cut -d " " -f 1)
+PHP_FPM_CONTAINER=$(docker ps | grep php-fpm | awk '{print $1}')


 # Grab OS type