From 2e928a492829cf41709f456f5e731c27e3afdc89 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Tue, 30 Jul 2019 06:48:24 +0200 Subject: [PATCH] laravel-horizon: Install 'sockets' without install 'AMQP` (#2211) * Add LARAVEL_HORIZON_INSTALL_SOCKETS variable. Issue #2209 * Get LARAVEL_HORIZON_INSTALL_SOCKETS from .env. Issue #2209 * Get INSTALL_SOCKETS variable and install 'sockets' ext. Issue #2209 --- docker-compose.yml | 2 +- env-example | 4 ++++ laravel-horizon/Dockerfile | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 00377e96..e4a4fc4b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -251,7 +251,7 @@ services: - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL} - INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH} - INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED} - - INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP} + - INSTALL_SOCKETS=${LARAVEL_HORIZON_INSTALL_SOCKETS} - INSTALL_CASSANDRA=${PHP_FPM_INSTALL_CASSANDRA} volumes: - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER} diff --git a/env-example b/env-example index a4793a7c..0e80c21b 100644 --- a/env-example +++ b/env-example @@ -222,6 +222,10 @@ NGINX_PHP_UPSTREAM_CONTAINER=php-fpm NGINX_PHP_UPSTREAM_PORT=9000 NGINX_SSL_PATH=./nginx/ssl/ +### LARAVEL_HORIZON ################################################ + +LARAVEL_HORIZON_INSTALL_SOCKETS=false + ### APACHE ################################################ APACHE_HOST_HTTP_PORT=80 diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile index c9486163..9cc9ba8d 100644 --- a/laravel-horizon/Dockerfile +++ b/laravel-horizon/Dockerfile @@ -33,8 +33,8 @@ RUN if [ ${INSTALL_BCMATH} = true ]; then \ ;fi #Install Sockets package: -ARG INSTALL_AMQP=false -RUN if [ ${INSTALL_AMQP} = true ]; then \ +ARG INSTALL_SOCKETS=false +RUN if [ ${INSTALL_SOCKETS} = true ]; then \ docker-php-ext-install sockets \ ;fi