Merge branch 'master' into trunk

.github/workflows/CI.yml

@@ -43,6 +43,7 @@ jobs:
           - web-apache-pgsql
           - web-nginx-mysql
           - web-nginx-pgsql
+          - web-service
         os:
          - alpine
          - ubuntu
@@ -50,6 +51,10 @@ jobs:
         exclude:
           - os: centos
             build: agent2
+          - os: centos
+            build: web-service
+          - os: ubuntu
+            build: web-service
 
     runs-on: ubuntu-20.04
     steps:

.github/workflows/dockerhub_description.yml

@@ -20,16 +20,17 @@ jobs:
         build:
           - agent
           - agent2
-          - java-gateway                                                                       
-          - proxy-mysql                                                                        
-          - proxy-sqlite3                                                                      
-          - server-mysql                                                                       
-          - server-pgsql                                                                       
-          - snmptraps                                                                          
-          - web-apache-mysql                                                                   
-          - web-apache-pgsql                                                                   
+          - java-gateway
+          - proxy-mysql
+          - proxy-sqlite3
+          - server-mysql
+          - server-pgsql
+          - snmptraps
+          - web-apache-mysql
+          - web-apache-pgsql
           - web-nginx-mysql
           - web-nginx-pgsql
+          - web-service
     steps:
       -
         uses: actions/checkout@v2

README.md

@@ -44,9 +44,9 @@ Please also follow usage instructions of each Zabbix component image:
 * [zabbix-java-gateway](https://hub.docker.com/r/zabbix/zabbix-java-gateway/) - Zabbix Java Gateway
 * [zabbix-snmptraps](https://hub.docker.com/r/zabbix/zabbix-snmptraps/) - Additional container image for Zabbix server and Zabbix proxy to support SNMP traps
 
-## Issues
+## Issues and Wiki
 
-If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues).
+Be sure to check [the Wiki-page](https://github.com/zabbix/zabbix-docker/wiki) on common problems and questions. If you still have problems with or questions about the images, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues).
 
 ## Contributing