Merge branch 'master' into trunk

This commit is contained in:
Alexey Pustovalov
2019-07-13 16:56:15 +03:00
17 changed files with 31 additions and 31 deletions

View File

@ -1,4 +1,4 @@
FROM alpine:3.9
FROM alpine:3.10
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE

View File

@ -3,7 +3,7 @@ memory_limit=128M
post_max_size=16M
upload_max_filesize=2M
max_input_time=300
always_populate_raw_post_data=-1
; always_populate_raw_post_data=-1
max_input_vars=10000
; date.timezone=Europe/Riga
; session.save_path=/var/lib/php5