Merge branch 'master' into gearman

2019-09-02 13:18:28 +02:00
parent 044261b06f cb910c590e
commit e608528da5
14 changed files with 62 additions and 19 deletions
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -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