ykxiao/laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 'master' of https://github.com/laradock/laradock:
  Fix Caddy volumes to persist SSL (#613)
  Fixed memcached for php5.6 (#624)
This commit is contained in:
Mahmoud Zalt
2017-02-21 10:28:18 -05:00
parent ee481a2a26 770a9779ca
commit 86031105be
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.yml
View File

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

2
php-fpm/Dockerfile-56
View File

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