Fixed xdebug for php5, moved php binding to sock, enable cache after install

compose/magento-1/docker-compose.yml

@@ -14,6 +14,7 @@ services:
     volumes: &appvolumes
       - ./src:/var/www/html:delegated
       - ~/.composer:/var/www/.composer:delegated
+      - sockdata:/sock
 
   phpfpm:
     image: markoshust/magento-php:5.6-fpm
@@ -40,3 +41,4 @@ services:
 
 volumes:
   dbdata:
+  sockdata:

compose/magento-2/bin/setup

@@ -22,3 +22,5 @@ echo "Turning on developer mode.."
 ./bin/magento deploy:mode:set developer
 
 ./bin/magento indexer:reindex
+
+./bin/magento cache:enable

compose/magento-2/docker-compose.yml

@@ -14,6 +14,7 @@ services:
     volumes: &appvolumes
       - ./src:/var/www/html:delegated
       - ~/.composer:/var/www/html/var/composer_home:delegated
+      - sockdata:/sock
 
   phpfpm:
     image: markoshust/magento-php:7.1-fpm
@@ -40,3 +41,4 @@ services:
 
 volumes:
   dbdata:
+  sockdata:

images/nginx/1.13/Dockerfile

@@ -4,7 +4,8 @@ MAINTAINER Mark Shust <mark@shust.com>
 RUN groupadd -g 1000 app \
  && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app
 RUN touch /var/run/nginx.pid
-RUN chown -R app:app /var/cache/nginx/ /var/run/nginx.pid
+RUN mkdir /sock
+RUN chown -R app:app /var/cache/nginx/ /var/run/nginx.pid /sock
 
 COPY ./conf/nginx.conf /etc/nginx/
 COPY ./conf/default.conf /etc/nginx/conf.d/

images/nginx/1.13/conf/default.conf

@@ -1,5 +1,5 @@
 upstream fastcgi_backend {
-  server phpfpm:9000;
+  server unix:/sock/docker.sock;
 }
 
 server {

images/php/5.6/Dockerfile

@@ -29,7 +29,8 @@ RUN docker-php-ext-install \
   xsl \
   zip
 
-RUN pecl install xdebug \
+RUN pecl channel-update pecl.php.net \
+  && pecl install xdebug-2.5.5 \
   && 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
 
@@ -46,7 +47,8 @@ COPY conf/php.ini /usr/local/etc/php/
 COPY conf/php-fpm.conf /usr/local/etc/
 COPY bin/cronstart /usr/local/bin/
 
-RUN chown -R app:app /usr/local/etc/php/conf.d
+RUN mkdir /sock
+RUN chown -R app:app /usr/local/etc/php/conf.d /sock
 
 USER app:app
 

images/php/5.6/conf/php-fpm.conf

@@ -14,7 +14,10 @@ access.log = /proc/self/fd/2
 user = app
 group = app
 
-listen = [::]:9000
+listen = /sock/docker.sock
+listen.owner = app
+listen.group = app
+listen.mode = 0660
 
 pm = dynamic
 pm.max_children = 10

images/php/5.6/conf/php.ini

@@ -1,4 +1,7 @@
 memory_limit = 2G
+max_execution_time = 1800
+zlib.output_compression = On
+cgi.fix_pathinfo = 0
 date.timezone = UTC
 
 xdebug.idekey = PHPSTORM

images/php/7.0/Dockerfile

@@ -29,7 +29,8 @@ RUN docker-php-ext-install \
   xsl \
   zip
 
-RUN pecl install xdebug \
+RUN pecl channel-update pecl.php.net \
+  && pecl install 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
 
@@ -48,7 +49,8 @@ COPY conf/php.ini /usr/local/etc/php/
 COPY conf/php-fpm.conf /usr/local/etc/
 COPY bin/cronstart /usr/local/bin/
 
-RUN chown -R app:app /usr/local/etc/php/conf.d
+RUN mkdir /sock
+RUN chown -R app:app /usr/local/etc/php/conf.d /sock
 
 USER app:app
 

images/php/7.0/conf/php-fpm.conf

@@ -14,7 +14,10 @@ access.log = /proc/self/fd/2
 user = app
 group = app
 
-listen = [::]:9000
+listen = /sock/docker.sock
+listen.owner = app
+listen.group = app
+listen.mode = 0660
 
 pm = dynamic
 pm.max_children = 10

images/php/7.0/conf/php.ini

@@ -1,4 +1,7 @@
 memory_limit = 2G
+max_execution_time = 1800
+zlib.output_compression = On
+cgi.fix_pathinfo = 0
 date.timezone = UTC
 
 xdebug.idekey = PHPSTORM

images/php/7.1/Dockerfile

@@ -29,7 +29,8 @@ RUN docker-php-ext-install \
   xsl \
   zip
 
-RUN pecl install xdebug \
+RUN pecl channel-update pecl.php.net \
+  && pecl install 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
 
@@ -48,7 +49,8 @@ COPY conf/php.ini /usr/local/etc/php/
 COPY conf/php-fpm.conf /usr/local/etc/
 COPY bin/cronstart /usr/local/bin/
 
-RUN chown -R app:app /usr/local/etc/php/conf.d
+RUN mkdir /sock
+RUN chown -R app:app /usr/local/etc/php/conf.d /sock
 
 USER app:app
 

images/php/7.1/conf/php-fpm.conf

@@ -14,7 +14,10 @@ access.log = /proc/self/fd/2
 ;user = app
 ;group = app
 
-listen = [::]:9000
+listen = /sock/docker.sock
+listen.owner = app
+listen.group = app
+listen.mode = 0660
 
 pm = dynamic
 pm.max_children = 10

images/php/7.1/conf/php.ini

@@ -1,4 +1,7 @@
 memory_limit = 2G
+max_execution_time = 1800
+zlib.output_compression = On
+cgi.fix_pathinfo = 0
 date.timezone = UTC
 
 xdebug.idekey = PHPSTORM