Merge branch 'master' of https://github.com/laradock/laradock

* 'master' of https://github.com/laradock/laradock:
  Fix Caddy volumes to persist SSL (laradock#613)
  Fixed memcached for php5.6 (laradock#624)

Author: Mahmoudz

docker-compose.yml

@@ -287,6 +287,7 @@ services:
         volumes:
             - ./caddy/Caddyfile:/etc/Caddyfile
             - ./logs/caddy:/var/log/caddy
+            - caddy:/root/.caddy
         links:
             - php-fpm
 

php-fpm/Dockerfile-56

@@ -101,7 +101,7 @@ RUN if [ ${INSTALL_BCMATH} = true ]; then \
 ARG INSTALL_MEMCACHED=false
 RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
     # Install the php memcached extension
-    pecl install memcached && \
+    pecl install memcached-2.2.0 && \
     docker-php-ext-enable memcached \
 ;fi