Merge branch 'master' into trunk

This commit is contained in:
Alexey Pustovalov 2019-07-13 03:20:20 +03:00
commit 8ef14e6cdd
2 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
FROM alpine:3.4
FROM alpine:3.8
ARG BUILD_DATE
ARG VCS_REF
@ -56,7 +56,7 @@ RUN set -eux && \
libssh2 \
libxml2 \
mariadb-client \
mariadb-client-libs \
mariadb-connector-c \
mysql \
net-snmp-agent-libs \
nginx \

View File

@ -15,7 +15,7 @@ redirect_stderr=true
stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0
[program:php-fpm]
[program:php-fpm5]
command = /usr/bin/%(program_name)s -F -c /etc/php5/%(program_name)s.conf
auto_start = true
autorestart = true