Merge pull request #421 from cytopia/update-php-container

Minor fixes
cytopia · Nov 11, 2018 · b45284b · b45284b
2 parents ef5b353 + f91ef8d
commit b45284b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 31 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -95,7 +95,7 @@ services:
   # PHP / HHVM
   # ------------------------------------------------------------
   php:
-    image: devilbox/php-fpm:${PHP_SERVER:-7.0}-work-0.48
+    image: devilbox/php-fpm:${PHP_SERVER:-7.0}-work-0.50
 
     ##
     ## All .env variables

diff --git a/docs/intermediate/configure-php-xdebug/xdebug-docker-toolbox.rst b/docs/intermediate/configure-php-xdebug/xdebug-docker-toolbox.rst
@@ -66,19 +66,19 @@ The following example show how to configure PHP Xdebug for PHP 5.6:
       :caption: xdebug.ini
       :emphasize-lines: 6-7,11
 
-      # Defaults
+      ; Defaults
       xdebug.remote_enable=1
       xdebug.remote_port=9000
 
-      # The Docker Toolbox way
+      ; The Docker Toolbox way
       xdebug.remote_connect_back=0
       xdebug.remote_host=docker.for.lin.host.internal
 
-      # idekey value is specific to each editor
-      # Verify with your IDE/editor documentation
+      ; idekey value is specific to each editor
+      ; Verify with your IDE/editor documentation
       xdebug.idekey=PHPSTORM
 
-      # Optional: Set to true to auto-start xdebug
+      ; Optional: Set to true to auto-start xdebug
       xdebug.remote_autostart=false
 
 **4. Configure your IDE/editor**

diff --git a/docs/intermediate/configure-php-xdebug/xdebug-lin.rst b/docs/intermediate/configure-php-xdebug/xdebug-lin.rst
@@ -53,19 +53,19 @@ The following example show how to configure PHP Xdebug for PHP 5.6:
       :caption: xdebug.ini
       :emphasize-lines: 7,11
 
-      # Defaults
+      ; Defaults
       xdebug.default_enable=1
       xdebug.remote_enable=1
       xdebug.remote_port=9000
 
-      # The Linux way
+      ; The Linux way
       xdebug.remote_connect_back=1
 
-      # idekey value is specific to each editor
-      # Verify with your IDE/editor documentation
+      ; idekey value is specific to each editor
+      ; Verify with your IDE/editor documentation
       xdebug.idekey=PHPSTORM
 
-      # Optional: Set to true to auto-start xdebug
+      ; Optional: Set to true to auto-start xdebug
       xdebug.remote_autostart=false
 
 **3. Configure your IDE/editor**

diff --git a/docs/intermediate/configure-php-xdebug/xdebug-mac.rst b/docs/intermediate/configure-php-xdebug/xdebug-mac.rst
@@ -77,20 +77,20 @@ The following example show how to configure PHP Xdebug for PHP 5.6:
       :caption: xdebug.ini
       :emphasize-lines: 7-8,12
 
-      # Defaults
+      ; Defaults
       xdebug.default_enable=1
       xdebug.remote_enable=1
       xdebug.remote_port=9000
 
-      # The MacOS way (CNAME)
+      ; The MacOS way (CNAME)
       xdebug.remote_connect_back=0
       xdebug.remote_host=host.docker.internal
 
-      # idekey value is specific to each editor
-      # Verify IDE/editor documentation
+      ; idekey value is specific to each editor
+      ; Verify IDE/editor documentation
       xdebug.idekey=PHPSTORM
 
-      # Optional: Set to true to auto-start xdebug
+      ; Optional: Set to true to auto-start xdebug
       xdebug.remote_autostart=false
 
 **3. Configure your IDE/editor**
@@ -141,20 +141,20 @@ The following example show how to configure PHP Xdebug for PHP 5.6:
       :caption: xdebug.ini
       :emphasize-lines: 7-8,12
 
-      # Defaults
+      ; Defaults
       xdebug.default_enable=1
       xdebug.remote_enable=1
       xdebug.remote_port=9000
 
-      # The MacOS way (host alias)
+      ; The MacOS way (host alias)
       xdebug.remote_connect_back=0
       xdebug.remote_host=10.254.254.254
 
-      # idekey value is specific to each editor
-      # Verify with your IDE/editor documentation
+      ; idekey value is specific to each editor
+      ; Verify with your IDE/editor documentation
       xdebug.idekey=PHPSTORM
 
-      # Optional: Set to true to auto-start xdebug
+      ; Optional: Set to true to auto-start xdebug
       xdebug.remote_autostart=false
 
 **3. Configure your IDE/editor**

diff --git a/docs/intermediate/configure-php-xdebug/xdebug-win.rst b/docs/intermediate/configure-php-xdebug/xdebug-win.rst
@@ -70,20 +70,20 @@ The following example show how to configure PHP Xdebug for PHP 5.6:
       :caption: xdebug.ini
       :emphasize-lines: 7-8,12
 
-      # Defaults
+      ; Defaults
       xdebug.default_enable=1
       xdebug.remote_enable=1
       xdebug.remote_port=9000
 
-      # The Windows way (CNAME)
+      ; The Windows way (CNAME)
       xdebug.remote_connect_back=0
       xdebug.remote_host=host.docker.internal
 
-      # idekey value is specific to each editor
-      # Verify IDE/editor documentation
+      ; idekey value is specific to each editor
+      ; Verify IDE/editor documentation
       xdebug.idekey=PHPSTORM
 
-      # Optional: Set to true to auto-start xdebug
+      ; Optional: Set to true to auto-start xdebug
       xdebug.remote_autostart=false
 
 **3. Configure your IDE/editor**
@@ -140,20 +140,20 @@ The following example show how to configure PHP Xdebug for PHP 5.6:
       :caption: xdebug.ini
       :emphasize-lines: 7-8,12
 
-      # Defaults
+      ; Defaults
       xdebug.default_enable=1
       xdebug.remote_enable=1
       xdebug.remote_port=9000
 
-      # The Windows way (IP address)
+      ; The Windows way (IP address)
       xdebug.remote_connect_back=0
       xdebug.remote_host=192.168.246.1
 
-      # idekey value is specific to each editor
-      # Verify IDE/editor documentation
+      ; idekey value is specific to each editor
+      ; Verify IDE/editor documentation
       xdebug.idekey=PHPSTORM
 
-      # Optional: Set to true to auto-start xdebug
+      ; Optional: Set to true to auto-start xdebug
       xdebug.remote_autostart=false
 
    .. important::