Merge branch 'master' into 4.2

zeroidle · Jul 13, 2019 · 021ef62 · 021ef62
2 parents 1d94d9a + 891565e
commit 021ef62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -57,7 +57,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
@@ -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