adding support for php memory limit

Author: rok

Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.3-alpine
 
 LABEL maintainer="ipunkt Business Solutions <info@ipunkt.biz>" \
-		version.image="v4.0" \
+		version.image="v4.1" \
 		version.php=$PHP_VERSION \
 		description="A supervisor configured to run with laravel artisan queue:work or artisan horizon command"
 
@@ -19,6 +19,7 @@ WORKDIR /etc/supervisor/conf.d
 # Use local configuration
 COPY laravel-worker.conf.tpl /etc/supervisor/conf.d/laravel-worker.conf.tpl
 COPY laravel-horizon.conf.tpl /etc/supervisor/conf.d/laravel-horizon.conf.tpl
+COPY custom-php.ini.tpl /opt/etc/custom-php.ini.tpl
 
 # Copy scripts
 COPY init.sh /usr/local/bin/init.sh

README.md

@@ -10,6 +10,10 @@ The default queue name in laravel is called `default`. So we configured the `QUE
 
 If you want to use [Laravel Horizon](https://laravel.com/docs/horizon) then you have to set the environment `LARAVEL_HORIZON` to `true`. By default it is `false`.
 
+Since version v4.1 is it possible to modify the php memory limit. The environment variable `PHP_MEMORY_LIMIT` is by default set to `512` (MB). For unlimited memory usage just set it to `-1`. The queue worker command will also be called with the memory limit given to this value to be consistent.
+
+For Laravel Horizon you have to configure your memory limit in your `horizon.php` configuration. The default php memory limit has to set within the container by setting `PHP_MEMORY_LIMIT` as well.
+
 
 ## Docker Images
 
@@ -18,4 +22,5 @@ If you want to use [Laravel Horizon](https://laravel.com/docs/horizon) then you
 | 7.0 | ipunktbs/laravel-queue-worker:php7.0-v1.0 |
 | 7.1 | ipunktbs/laravel-queue-worker:php7.1-v2.0 |
 | 7.2 | ipunktbs/laravel-queue-worker:php7.2-v3.0 |
-| 7.3 | ipunktbs/laravel-queue-worker:php7.3-v4.0 |
+| 7.3 | ipunktbs/laravel-queue-worker:php7.3-v4.0 - deprecated |
+| 7.3 | ipunktbs/laravel-queue-worker:php7.3-v4.1 - recommended |

custom-php.ini.tpl

@@ -0,0 +1 @@
+memory_limit=%%MEMORY_LIMIT%%

init.sh

@@ -12,9 +12,14 @@ if [ -z "$LARAVEL_HORIZON" ]; then
 	LARAVEL_HORIZON=false
 fi
 
+PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT:-512}
+sed -e "s~%%MEMORY_LIMIT%%~${PHP_MEMORY_LIMIT}m~" \
+    /opt/etc/custom-php.ini.tpl > /usr/local/etc/php/conf.d/custom-php.ini
+
 if [ "$LARAVEL_HORIZON" = false ]; then
 	sed -e "s~%%QUEUE_CONNECTION%%~$QUEUE_CONNECTION~" \
 		-e "s~%%QUEUE_NAME%%~$QUEUE_NAME~" \
+		-e "s~%%MEMORY_LIMIT%%~$PHP_MEMORY_LIMIT~" \
 		/etc/supervisor/conf.d/laravel-worker.conf.tpl > /etc/supervisor/supervisord.conf
 fi
 

laravel-worker.conf.tpl

@@ -3,7 +3,7 @@ nodaemon=true
 
 [program:laravel-worker]
 process_name=%(program_name)s_%(process_num)02d
-command=php /var/www/app/artisan queue:work %%QUEUE_CONNECTION%% --queue=%%QUEUE_NAME%%
+command=php /var/www/app/artisan queue:work %%QUEUE_CONNECTION%% --queue=%%QUEUE_NAME%% --memory=%%MEMORY_LIMIT%%
 autostart=true
 autorestart=true
 numprocs=1