Skip to content

Commit 0b18b87

Browse files
authored
Merge pull request #36 from sourceboat/feature/32-add-max-execution-time-environment-variable
add max execution time environment variable
2 parents 73fce5e + d09c70e commit 0b18b87

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
44
PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \
55
PHP_OPCACHE_MEMORY_CONSUMPTION="192" \
66
PHP_OPCACHE_MAX_WASTED_PERCENTAGE="10" \
7-
PHP_MEMORY_LIMIT="512M"
7+
PHP_MEMORY_LIMIT="512M" \
8+
PHP_MAX_EXECUTION_TIME="60"
89

910
RUN apk info \
1011
&& echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ services:
4949
environment:
5050
- PHP_OPCACHE_VALIDATE_TIMESTAMPS=1
5151
- PHP_MEMORY_LIMIT=1G
52+
- PHP_MAX_EXECUTION_TIME=30
5253
- STARTUP_COMMAND1=/root/modules/dev.sh
5354
- STARTUP_COMMAND2=php artisan migrate --force
5455
- STARTUP_COMMAND3=php artisan setup
@@ -86,6 +87,7 @@ services:
8687
environment:
8788
- PHP_OPCACHE_VALIDATE_TIMESTAMPS=1
8889
- PHP_MEMORY_LIMIT=1G
90+
- PHP_MAX_EXECUTION_TIME=30
8991
- STARTUP_COMMAND1=/root/modules/storage.sh
9092
- STARTUP_COMMAND2=/root/modules/cache.sh
9193
- STARTUP_COMMAND3=php artisan migrate --force

usr/local/etc/php/php.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
; Resource Limits ;
55
;;;;;;;;;;;;;;;;;;;
66

7-
max_execution_time = 60
7+
max_execution_time = ${PHP_MAX_EXECUTION_TIME}
88
max_input_time = 60
99
memory_limit = ${PHP_MEMORY_LIMIT}
1010

0 commit comments

Comments
 (0)