From 891565ee0f2053b2bcf065866479b32a727b1ab7 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sat, 13 Jul 2019 03:18:33 +0300 Subject: [PATCH] Zabbix Appliance - Migrate to Alpine 3.8 --- zabbix-appliance/alpine/Dockerfile | 4 ++-- .../conf/etc/supervisor/conf.d/supervisord_web_nginx.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zabbix-appliance/alpine/Dockerfile b/zabbix-appliance/alpine/Dockerfile index fdff10e1f..1235488e9 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -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 \ diff --git a/zabbix-appliance/alpine/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf b/zabbix-appliance/alpine/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf index 4d4146a93..44da42390 100644 --- a/zabbix-appliance/alpine/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf +++ b/zabbix-appliance/alpine/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf @@ -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