Merge branch 'trunk' of https://github.com/zabbix/zabbix-docker into trunk

agent2/ubuntu/Dockerfile

@@ -67,7 +67,7 @@ RUN set -eux && \
             make \
             pkg-config \
             git \
-            gcc \
+            g++ \
             golang && \
     cd /tmp/ && \
     git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
@@ -106,7 +106,7 @@ RUN set -eux && \
             make \
             pkg-config \
             git \
-            gcc \
+            g++ \
             golang && \ 
     chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
     chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \

web-service/alpine/Dockerfile

@@ -50,7 +50,7 @@ RUN set -eux && \
     git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
     cd /tmp/zabbix-${ZBX_VERSION} && \
     zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \
     ./bootstrap.sh && \
     export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
     ./configure \

web-service/alpine/README.md

@@ -52,10 +52,6 @@ The Zabbix web service log is available through Docker's container log:
 $ docker logs some-zabbix-web-service
 ```
 
-## Capaibilities
-
-
-
 ## Environment Variables
 
 When you start the `zabbix-web-service` image, you can adjust the configuration of the Zabbix web service by passing one or more environment variables on the `docker run` command line.
@@ -139,6 +135,13 @@ If you have any problems with or questions about this image, please contact us t
 
 ### Known issues
 
+Zabbix web services uses Google Chromium with headless mode. Because of restrictions you may see the following error during report generation:
+```
+Failed to move to new namespace: PID namespaces supported, Network namespace supported, but failed: errno = Operation not permitted
+```
+
+To avoid the issue it is required to add ``SYS_ADMIN`` capability for Zabbix web service. The capability is redundant and allow too much.
+
 ## Contributing
 
 You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.

web-service/ubuntu/Dockerfile

@@ -45,6 +45,8 @@ RUN set -eux && \
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 112695A0E562B32A && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install chromium chromium-sandbox && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
+            gnupg && \
     apt-get -y autoremove && \
     apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*