[1.x] Allow easy customization of the command ran by supervisor's PHP…

… process (#645) * Add PHP_COMMAND environment variable to Dockerfile * Add environment variable substitution in supervisord.conf * Fix variable name
laravel · Dec 29, 2023 · 9fa62a7 · 9fa62a7
1 parent 15ec4be
commit 9fa62a7
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 4 deletions.
diff --git a/runtimes/8.0/Dockerfile b/runtimes/8.0/Dockerfile
@@ -10,6 +10,7 @@ WORKDIR /var/www/html
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV TZ=UTC
+ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80"
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 

diff --git a/runtimes/8.0/supervisord.conf b/runtimes/8.0/supervisord.conf
@@ -5,7 +5,7 @@ logfile=/var/log/supervisor/supervisord.log
 pidfile=/var/run/supervisord.pid
 
 [program:php]
-command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80
+command=%(ENV_SUPERVISOR_PHP_COMMAND)s
 user=sail
 environment=LARAVEL_SAIL="1"
 stdout_logfile=/dev/stdout

diff --git a/runtimes/8.1/Dockerfile b/runtimes/8.1/Dockerfile
@@ -10,6 +10,7 @@ WORKDIR /var/www/html
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV TZ=UTC
+ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80"
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 

diff --git a/runtimes/8.1/supervisord.conf b/runtimes/8.1/supervisord.conf
@@ -5,7 +5,7 @@ logfile=/var/log/supervisor/supervisord.log
 pidfile=/var/run/supervisord.pid
 
 [program:php]
-command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80
+command=%(ENV_SUPERVISOR_PHP_COMMAND)s
 user=sail
 environment=LARAVEL_SAIL="1"
 stdout_logfile=/dev/stdout

diff --git a/runtimes/8.2/Dockerfile b/runtimes/8.2/Dockerfile
@@ -10,6 +10,7 @@ WORKDIR /var/www/html
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV TZ=UTC
+ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80"
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 

diff --git a/runtimes/8.2/supervisord.conf b/runtimes/8.2/supervisord.conf
@@ -5,7 +5,7 @@ logfile=/var/log/supervisor/supervisord.log
 pidfile=/var/run/supervisord.pid
 
 [program:php]
-command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80
+command=%(ENV_SUPERVISOR_PHP_COMMAND)s
 user=sail
 environment=LARAVEL_SAIL="1"
 stdout_logfile=/dev/stdout

diff --git a/runtimes/8.3/Dockerfile b/runtimes/8.3/Dockerfile
@@ -10,6 +10,7 @@ WORKDIR /var/www/html
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV TZ=UTC
+ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80"
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 

diff --git a/runtimes/8.3/supervisord.conf b/runtimes/8.3/supervisord.conf
@@ -5,7 +5,7 @@ logfile=/var/log/supervisor/supervisord.log
 pidfile=/var/run/supervisord.pid
 
 [program:php]
-command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80
+command=%(ENV_SUPERVISOR_PHP_COMMAND)s
 user=sail
 environment=LARAVEL_SAIL="1"
 stdout_logfile=/dev/stdout