瀏覽代碼

Disable Xdebug by default, add script to enable/disable

Mark Shust 7 年之前
父節點
當前提交
7b8b70c531
共有 6 個文件被更改,包括 30 次插入7 次删除
  1. 4 4
      README.md
  2. 10 0
      compose/magento-1/bin/xdebug
  3. 10 0
      compose/magento-2/bin/xdebug
  4. 2 1
      images/php/5.6/Dockerfile
  5. 2 1
      images/php/7.0/Dockerfile
  6. 2 1
      images/php/7.1/Dockerfile

+ 4 - 4
README.md

@@ -7,9 +7,9 @@ View Dockerfiles:
 - <a href="https://hub.docker.com/r/markoshust/magento-nginx/" target="_blank">markoshust/magento-nginx (Docker Hub)</a>
 	- [`latest`, `1.13`, `1.13-0`](https://github.com/markoshust/magento-docker/tree/master/images/nginx/1.13)
 - <a href="https://hub.docker.com/r/markoshust/magento-php/" target="_blank">markoshust/magento-php (Docker Hub)</a>
-	- [`latest`, `7.1-fpm`, `7.1-fpm-0`](https://github.com/markoshust/magento-docker/tree/master/images/php/7.1)
-	- [`7.0-fpm`, `7.0-fpm-0`](https://github.com/markoshust/magento-docker/tree/master/images/php/7.0)
-	- [`5.6-fpm`, `5.6-fpm-0`](https://github.com/markoshust/magento-docker/tree/master/images/php/5.6)
+	- [`latest`, `7.1-fpm`, `7.1-fpm-1`](https://github.com/markoshust/magento-docker/tree/master/images/php/7.1)
+	- [`7.0-fpm`, `7.0-fpm-1`](https://github.com/markoshust/magento-docker/tree/master/images/php/7.0)
+	- [`5.6-fpm`, `5.6-fpm-1`](https://github.com/markoshust/magento-docker/tree/master/images/php/5.6)
 
 ## Usage
 
@@ -116,4 +116,4 @@ Place your auth token at `~/.composer/auth.json` with the following contents, li
         }
     }
 }
-```
+```

+ 10 - 0
compose/magento-1/bin/xdebug

@@ -0,0 +1,10 @@
+#!/bin/bash
+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
+  echo "Xdebug has been disabled."
+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
+  echo "Xdebug has been enabled."
+else
+  echo "Please specify either 'enable' or 'disable' as an argument"
+fi

+ 10 - 0
compose/magento-2/bin/xdebug

@@ -0,0 +1,10 @@
+#!/bin/bash
+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
+  echo "Xdebug has been disabled."
+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
+  echo "Xdebug has been enabled."
+else
+  echo "Please specify either 'enable' or 'disable' as an argument"
+fi

+ 2 - 1
images/php/5.6/Dockerfile

@@ -30,7 +30,8 @@ RUN docker-php-ext-install \
   zip
 
 RUN pecl install xdebug \
-  && docker-php-ext-enable xdebug
+  && docker-php-ext-enable xdebug \
+  && sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
 RUN curl -sS https://getcomposer.org/installer | \
   php -- --install-dir=/usr/local/bin --filename=composer

+ 2 - 1
images/php/7.0/Dockerfile

@@ -30,7 +30,8 @@ RUN docker-php-ext-install \
   zip
 
 RUN pecl install xdebug \
-  && docker-php-ext-enable xdebug
+  && docker-php-ext-enable xdebug \
+  && sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
 RUN curl -sS https://getcomposer.org/installer | \
   php -- --install-dir=/usr/local/bin --filename=composer

+ 2 - 1
images/php/7.1/Dockerfile

@@ -30,7 +30,8 @@ RUN docker-php-ext-install \
   zip
 
 RUN pecl install xdebug \
-  && docker-php-ext-enable xdebug
+  && docker-php-ext-enable xdebug \
+  && sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
 RUN curl -sS https://getcomposer.org/installer | \
   php -- --install-dir=/usr/local/bin --filename=composer