Bladeren bron

Merge pull request #314 from piotrkwiecinski/xdebug-reset-phpfpm-only

restart only phpfpm to toggle xdebug, rerun of selected service
Mark Shust 4 jaren geleden
bovenliggende
commit
fbdc3493c0
4 gewijzigde bestanden met toevoegingen van 6 en 6 verwijderingen
  1. 2 2
      compose/bin/restart
  2. 1 1
      compose/bin/start
  3. 1 1
      compose/bin/stop
  4. 2 2
      compose/bin/xdebug

+ 2 - 2
compose/bin/restart

@@ -1,3 +1,3 @@
 #!/bin/bash
 #!/bin/bash
-bin/stop
-bin/start
+bin/stop "$@"
+bin/start "$@"

+ 1 - 1
compose/bin/start

@@ -40,7 +40,7 @@ done
 # Wait to exit until all missing files have been outputted to the user
 # Wait to exit until all missing files have been outputted to the user
 [ $IS_VALID = false ] && echo "Failed to start docker for missing volume files" && exit
 [ $IS_VALID = false ] && echo "Failed to start docker for missing volume files" && exit
 
 
-docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --remove-orphans
+docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --remove-orphans "$@"
 
 
 ## Blackfire support
 ## Blackfire support
 # ------------------
 # ------------------

+ 1 - 1
compose/bin/stop

@@ -1,2 +1,2 @@
 #!/bin/bash
 #!/bin/bash
-docker-compose -f docker-compose.yml -f docker-compose.dev.yml stop
+docker-compose -f docker-compose.yml -f docker-compose.dev.yml stop "$@"

+ 2 - 2
compose/bin/xdebug

@@ -1,11 +1,11 @@
 #!/bin/bash
 #!/bin/bash
 if [ "$1" == "disable" ]; then
 if [ "$1" == "disable" ]; then
   bin/cli sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
   bin/cli sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-  bin/restart
+  bin/restart phpfpm
   echo "Xdebug has been disabled."
   echo "Xdebug has been disabled."
 elif [ "$1" == "enable" ]; then
 elif [ "$1" == "enable" ]; then
   bin/cli sed -i -e 's/^\;zend_extension/zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
   bin/cli sed -i -e 's/^\;zend_extension/zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-  bin/restart
+  bin/restart phpfpm
   echo "Xdebug has been enabled."
   echo "Xdebug has been enabled."
 else
 else
   echo "Please specify either 'enable' or 'disable' as an argument"
   echo "Please specify either 'enable' or 'disable' as an argument"