extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-12-11 09:01:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.2

Browse Source
This commit is contained in:
Alexey Pustovalov 2019-07-13 03:19:59 +03:00
commit 021ef6210c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zabbix-appliance/alpine/Dockerfile
View File

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

2
zabbix-appliance/alpine/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf
View File

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