From 76a51f8a909a927ff3187f09e9723ed9c466bdc4 Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Thu, 17 Jul 2014 15:28:21 -0700 Subject: [PATCH 1/2] #35: Windows rage --- Dockerfile | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 60de368..7259230 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN dpkg-divert --local --rename --add /sbin/initctl # Basic requirements for Kalabox/Switchboard-based containers RUN DEBIAN_FRONTEND=noninteractive apt-get -y install apt-utils RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure apt-utils -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git rsync curl openssh-server php5 php5-curl php5-sqlite php5-mcrypt mysql-client python-setuptools +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git rsync curl openssh-server php5 php5-curl python-setuptools # Install composer and set it vendor dir to $PATH RUN curl -sS https://getcomposer.org/installer | php RUN mv composer.phar /usr/local/bin/composer @@ -36,7 +36,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install nginx RUN DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server # PHP -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install php5-gd php5-intl php-pear php5-imap php5-fpm php5-mysql php-apc php5-xdebug +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install php5-gd php5-fpm php5-mysql # Is this a Twisted Sister pin? On your uniform? RUN apt-get clean @@ -66,18 +66,6 @@ RUN sed -i -e "s/;listen.owner = www-data/listen.owner = www-data/g" /etc/php5/f RUN sed -i -e "s/;listen.group = www-data/listen.group = www-data/g" /etc/php5/fpm/pool.d/www.conf RUN sed -i -e "s/;listen.mode = www-data/listen.mode = 0660/g" /etc/php5/fpm/pool.d/www.conf -# php5-apc -RUN sed -i '$a apc.shm_size=128M' /etc/php5/conf.d/apc.ini -RUN sed -i '$a apc.include_once_override=0' /etc/php5/conf.d/apc.ini -# php5-xdebug -# @todo this assumes 1.3.3.1 is your host machine, need to abstract out -# in the future -RUN sed -i '$a xdebug.remote_host="1.3.3.1"' /etc/php5/conf.d/xdebug.ini -RUN sed -i '$a xdebug.remote_enable=1' /etc/php5/conf.d/xdebug.ini -RUN sed -i '$a xdebug.remote_port=9000' /etc/php5/conf.d/xdebug.ini -RUN sed -i '$a xdebug.remote_handler="dbgp"' /etc/php5/conf.d/xdebug.ini -RUN sed -i '$a xdebug.remote_autostart=1' /etc/php5/conf.d/xdebug.ini - # Supervisor Config RUN /usr/bin/easy_install supervisor ADD ./supervisord.conf /etc/supervisord.conf From 4022382e17e057d65f3ec3b71152a8fccedb6f22 Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Thu, 17 Jul 2014 16:59:12 -0700 Subject: [PATCH 2/2] #35: Xdebug remoteautostart causing php-fpm pool rage on windows --- Dockerfile | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7259230..5de110d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN dpkg-divert --local --rename --add /sbin/initctl # Basic requirements for Kalabox/Switchboard-based containers RUN DEBIAN_FRONTEND=noninteractive apt-get -y install apt-utils RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure apt-utils -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git rsync curl openssh-server php5 php5-curl python-setuptools +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git rsync curl openssh-server php5 php5-curl php5-sqlite php5-mcrypt mysql-client python-setuptools # Install composer and set it vendor dir to $PATH RUN curl -sS https://getcomposer.org/installer | php RUN mv composer.phar /usr/local/bin/composer @@ -36,7 +36,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install nginx RUN DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server # PHP -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install php5-gd php5-fpm php5-mysql +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install php5-gd php-pear php5-imap php5-fpm php5-mysql php-apc php5-xdebug # Is this a Twisted Sister pin? On your uniform? RUN apt-get clean @@ -66,6 +66,19 @@ RUN sed -i -e "s/;listen.owner = www-data/listen.owner = www-data/g" /etc/php5/f RUN sed -i -e "s/;listen.group = www-data/listen.group = www-data/g" /etc/php5/fpm/pool.d/www.conf RUN sed -i -e "s/;listen.mode = www-data/listen.mode = 0660/g" /etc/php5/fpm/pool.d/www.conf +# php5-apc +RUN sed -i '$a apc.shm_size=128M' /etc/php5/conf.d/apc.ini +RUN sed -i '$a apc.include_once_override=0' /etc/php5/conf.d/apc.ini +# php5-xdebug +# @todo this assumes 1.3.3.1 is your host machine, need to abstract out +# in the future +RUN sed -i '$a xdebug.remote_host="1.3.3.1"' /etc/php5/conf.d/xdebug.ini +RUN sed -i '$a xdebug.remote_enable=1' /etc/php5/conf.d/xdebug.ini +RUN sed -i '$a xdebug.remote_port=9000' /etc/php5/conf.d/xdebug.ini +RUN sed -i '$a xdebug.remote_handler="dbgp"' /etc/php5/conf.d/xdebug.ini +RUN sed -i '$a ;remote_autostart causes php-fpm pool to take 4eva to respond on windows' /etc/php5/conf.d/xdebug.ini +RUN sed -i '$a ;xdebug.remote_autostart=1' /etc/php5/conf.d/xdebug.ini + # Supervisor Config RUN /usr/bin/easy_install supervisor ADD ./supervisord.conf /etc/supervisord.conf