Merge branch '3.4' into master

proxy-mysql/alpine/Dockerfile

@@ -45,6 +45,7 @@ RUN addgroup zabbix && \
             bash \
             iputils \
             libcurl \
+            libevent \
             libldap \
             libssh2 \
             libxml2 \
@@ -52,13 +53,14 @@ RUN addgroup zabbix && \
             mariadb-client-libs \
             net-snmp-agent-libs \
             openipmi-libs \
+            pcre \
             supervisor \
             unixodbc \
             fping && \
     rm -rf /var/cache/apk/*
 
-ARG MAJOR_VERSION=master
-ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG MAJOR_VERSION=3.4
+ARG ZBX_VERSION=${MAJOR_VERSION}.6
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
 
@@ -72,12 +74,14 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             automake \
             coreutils \
             curl-dev \
+            libevent-dev \
             libssh2-dev \
             libxml2-dev \
             mysql-dev \
             net-snmp-dev \
             openipmi-dev \
             openldap-dev \
+            pcre-dev \
             subversion \
             unixodbc-dev \
             alpine-sdk && \