Merge pull request #159 from zabbix/master

Fixed issue with sender and get in case of proxy and server images
zabbix · Oct 21, 2017 · 8beb1a4 · 8beb1a4
2 parents d643c80 + 098b780
commit 8beb1a4
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 0 deletions.
diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile
@@ -77,6 +77,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-proxy \
+            --enable-agent \
             --enable-ipv6 \
 # Does not support stable iksemel library
 #            --with-jabber \

diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile
@@ -84,6 +84,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-proxy \
+            --enable-agent \
             --enable-ipv6 \
             --with-jabber \
             --with-ldap \

diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile
@@ -73,6 +73,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-proxy \
+            --enable-agent \
             --enable-ipv6 \
 # Does not support stable iksemel library
 #            --with-jabber \

diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile
@@ -82,6 +82,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-proxy \
+            --enable-agent \
             --enable-ipv6 \
             --with-jabber \
             --with-ldap \

diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile
@@ -78,6 +78,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-server \
+            --enable-agent \
             --enable-ipv6 \
 # Does not support stable iksemel library
 #            --with-jabber \

diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile
@@ -85,6 +85,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-server \
+            --enable-agent \
             --enable-ipv6 \
             --with-jabber \
             --with-ldap \

diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile
@@ -78,6 +78,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-server \
+            --enable-agent \
             --enable-ipv6 \
 # Does not support stable iksemel library
 #            --with-jabber \

diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile
@@ -85,6 +85,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-server \
+            --enable-agent \
             --enable-ipv6 \
             --with-jabber \
             --with-ldap \