Merge branch 'master' into gearman

This commit is contained in:
stefan authored and GitHub committed 2019-09-02 13:18:28 +02:00
commit e608528da5
14 files changed
+62 -19

No files matched your search

+2 -2
View File
@@ -14,8 +14,7 @@
ARG LARADOCK_PHP_VERSION
# FROM laradock/workspace:2.2-${LARADOCK_PHP_VERSION}
FROM letsdockerize/laradock-workspace:2.4-${LARADOCK_PHP_VERSION}
FROM laradock/workspace:2.5-${LARADOCK_PHP_VERSION}
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
@@ -456,6 +455,7 @@ RUN if [ ${INSTALL_GEARMAN} = true ]; then \
ARG INSTALL_PHPREDIS=false
RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
apt-get update -yqq && \
apt-get install -yqq php-redis \
;fi