diff --git a/README.md b/README.md index 60b341d7b..f5454ca6f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ ![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png) +![CI](https://github.com/zabbix/zabbix-docker/workflows/CI/badge.svg?branch=master&event=release) +![CI](https://github.com/zabbix/zabbix-docker/workflows/CI/badge.svg?branch=master&event=push) + # What is Zabbix? Zabbix is an enterprise-class open source distributed monitoring solution. diff --git a/web-apache-mysql/alpine/README.md b/web-apache-mysql/alpine/README.md index 5075b064c..9585f2eb6 100644 --- a/web-apache-mysql/alpine/README.md +++ b/web-apache-mysql/alpine/README.md @@ -190,6 +190,10 @@ The variable allows to activate host verification. Available since 5.0.0. The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0. +## `ZBX_SSO_SETTINGS` + +The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/apache2`` @@ -198,6 +202,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must Please follow official Apache2 [documentation](https://httpd.apache.org/docs/2.4/ssl/ssl_howto.html) to get more details about how to create certificate files. +### ``/etc/zabbix/web/certs`` + +The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. + # The image variants The `zabbix-web-apache-mysql` images come in many flavors, each designed for a specific use case. diff --git a/web-apache-mysql/centos/README.md b/web-apache-mysql/centos/README.md index 5075b064c..9585f2eb6 100644 --- a/web-apache-mysql/centos/README.md +++ b/web-apache-mysql/centos/README.md @@ -190,6 +190,10 @@ The variable allows to activate host verification. Available since 5.0.0. The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0. +## `ZBX_SSO_SETTINGS` + +The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/apache2`` @@ -198,6 +202,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must Please follow official Apache2 [documentation](https://httpd.apache.org/docs/2.4/ssl/ssl_howto.html) to get more details about how to create certificate files. +### ``/etc/zabbix/web/certs`` + +The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. + # The image variants The `zabbix-web-apache-mysql` images come in many flavors, each designed for a specific use case. diff --git a/web-apache-mysql/ubuntu/README.md b/web-apache-mysql/ubuntu/README.md index 5075b064c..9585f2eb6 100644 --- a/web-apache-mysql/ubuntu/README.md +++ b/web-apache-mysql/ubuntu/README.md @@ -190,6 +190,10 @@ The variable allows to activate host verification. Available since 5.0.0. The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0. +## `ZBX_SSO_SETTINGS` + +The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/apache2`` @@ -198,6 +202,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must Please follow official Apache2 [documentation](https://httpd.apache.org/docs/2.4/ssl/ssl_howto.html) to get more details about how to create certificate files. +### ``/etc/zabbix/web/certs`` + +The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. + # The image variants The `zabbix-web-apache-mysql` images come in many flavors, each designed for a specific use case. diff --git a/web-apache-pgsql/alpine/README.md b/web-apache-pgsql/alpine/README.md index 6108945d5..c02a20c00 100644 --- a/web-apache-pgsql/alpine/README.md +++ b/web-apache-pgsql/alpine/README.md @@ -184,6 +184,10 @@ The variable allows to specify the full path to a valid TLS certificate authorit The variable allows to activate host verification. Available since 5.0.0. +## `ZBX_SSO_SETTINGS` + +The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/apache2`` @@ -192,6 +196,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must Please follow official Apache2 [documentation](https://httpd.apache.org/docs/2.4/ssl/ssl_howto.html) to get more details about how to create certificate files. +### ``/etc/zabbix/web/certs`` + +The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. + # The image variants The `zabbix-web-apache-pgsql` images come in many flavors, each designed for a specific use case. diff --git a/web-apache-pgsql/centos/README.md b/web-apache-pgsql/centos/README.md index 482127781..c5ed6556d 100644 --- a/web-apache-pgsql/centos/README.md +++ b/web-apache-pgsql/centos/README.md @@ -185,6 +185,10 @@ The variable allows to specify the full path to a valid TLS certificate authorit The variable allows to activate host verification. Available since 5.0.0. +## `ZBX_SSO_SETTINGS` + +The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/apache2`` @@ -193,6 +197,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must Please follow official Apache2 [documentation](https://httpd.apache.org/docs/2.4/ssl/ssl_howto.html) to get more details about how to create certificate files. +### ``/etc/zabbix/web/certs`` + +The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. + # The image variants The `zabbix-web-apache-pgsql` images come in many flavors, each designed for a specific use case. diff --git a/web-apache-pgsql/ubuntu/README.md b/web-apache-pgsql/ubuntu/README.md index 482127781..c5ed6556d 100644 --- a/web-apache-pgsql/ubuntu/README.md +++ b/web-apache-pgsql/ubuntu/README.md @@ -185,6 +185,10 @@ The variable allows to specify the full path to a valid TLS certificate authorit The variable allows to activate host verification. Available since 5.0.0. +## `ZBX_SSO_SETTINGS` + +The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/apache2`` @@ -193,6 +197,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must Please follow official Apache2 [documentation](https://httpd.apache.org/docs/2.4/ssl/ssl_howto.html) to get more details about how to create certificate files. +### ``/etc/zabbix/web/certs`` + +The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. + # The image variants The `zabbix-web-apache-pgsql` images come in many flavors, each designed for a specific use case. diff --git a/web-nginx-mysql/alpine/README.md b/web-nginx-mysql/alpine/README.md index b9cae9599..f5418a58c 100644 --- a/web-nginx-mysql/alpine/README.md +++ b/web-nginx-mysql/alpine/README.md @@ -192,6 +192,10 @@ The variable allows to activate host verification. Available since 5.0.0. The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0. +## `ZBX_SSO_SETTINGS` + +The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/nginx`` @@ -200,6 +204,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must Please follow official Nginx [documentation](http://nginx.org/en/docs/http/configuring_https_servers.html) to get more details about how to create certificate files. +### ``/etc/zabbix/web/certs`` + +The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. + # The image variants The `zabbix-web-nginx-mysql` images come in many flavors, each designed for a specific use case. diff --git a/web-nginx-mysql/centos/README.md b/web-nginx-mysql/centos/README.md index b9cae9599..f5418a58c 100644 --- a/web-nginx-mysql/centos/README.md +++ b/web-nginx-mysql/centos/README.md @@ -192,6 +192,10 @@ The variable allows to activate host verification. Available since 5.0.0. The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0. +## `ZBX_SSO_SETTINGS` + +The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/nginx`` @@ -200,6 +204,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must Please follow official Nginx [documentation](http://nginx.org/en/docs/http/configuring_https_servers.html) to get more details about how to create certificate files. +### ``/etc/zabbix/web/certs`` + +The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. + # The image variants The `zabbix-web-nginx-mysql` images come in many flavors, each designed for a specific use case. diff --git a/web-nginx-mysql/ubuntu/README.md b/web-nginx-mysql/ubuntu/README.md index b9cae9599..f5418a58c 100644 --- a/web-nginx-mysql/ubuntu/README.md +++ b/web-nginx-mysql/ubuntu/README.md @@ -192,6 +192,10 @@ The variable allows to activate host verification. Available since 5.0.0. The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0. +## `ZBX_SSO_SETTINGS` + +The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/nginx`` @@ -200,6 +204,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must Please follow official Nginx [documentation](http://nginx.org/en/docs/http/configuring_https_servers.html) to get more details about how to create certificate files. +### ``/etc/zabbix/web/certs`` + +The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. + # The image variants The `zabbix-web-nginx-mysql` images come in many flavors, each designed for a specific use case. diff --git a/web-nginx-pgsql/alpine/README.md b/web-nginx-pgsql/alpine/README.md index 82fa63502..098e13f09 100644 --- a/web-nginx-pgsql/alpine/README.md +++ b/web-nginx-pgsql/alpine/README.md @@ -184,6 +184,10 @@ The variable allows to specify the full path to a valid TLS certificate authorit The variable allows to activate host verification. Available since 5.0.0. +## `ZBX_SSO_SETTINGS` + +The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/nginx`` @@ -192,6 +196,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must Please follow official Nginx [documentation](http://nginx.org/en/docs/http/configuring_https_servers.html) to get more details about how to create certificate files. +### ``/etc/zabbix/web/certs`` + +The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. + # The image variants The `zabbix-web-nginx-pgsql` images come in many flavors, each designed for a specific use case. diff --git a/web-nginx-pgsql/centos/README.md b/web-nginx-pgsql/centos/README.md index 82fa63502..098e13f09 100644 --- a/web-nginx-pgsql/centos/README.md +++ b/web-nginx-pgsql/centos/README.md @@ -184,6 +184,10 @@ The variable allows to specify the full path to a valid TLS certificate authorit The variable allows to activate host verification. Available since 5.0.0. +## `ZBX_SSO_SETTINGS` + +The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/nginx`` @@ -192,6 +196,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must Please follow official Nginx [documentation](http://nginx.org/en/docs/http/configuring_https_servers.html) to get more details about how to create certificate files. +### ``/etc/zabbix/web/certs`` + +The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. + # The image variants The `zabbix-web-nginx-pgsql` images come in many flavors, each designed for a specific use case. diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 70ea09d4c..fc74fa605 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -60,7 +60,7 @@ RUN set -eux && \ rm -rf /var/cache/nginx/ && \ rm -f /etc/php/7.4/fpm/pool.d/www.conf && \ ln -sf /dev/fd/2 /var/log/nginx/error.log && \ - DEBIAN_FRONTEND=noninteractive apt-get -y purge curl gpg dirmngr gpg-agent && \ + DEBIAN_FRONTEND=noninteractive apt-get -y purge gpg dirmngr gpg-agent && \ apt-get -y autoremove && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* diff --git a/web-nginx-pgsql/ubuntu/README.md b/web-nginx-pgsql/ubuntu/README.md index 82fa63502..098e13f09 100644 --- a/web-nginx-pgsql/ubuntu/README.md +++ b/web-nginx-pgsql/ubuntu/README.md @@ -184,6 +184,10 @@ The variable allows to specify the full path to a valid TLS certificate authorit The variable allows to activate host verification. Available since 5.0.0. +## `ZBX_SSO_SETTINGS` + +The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/nginx`` @@ -192,6 +196,10 @@ The volume allows to enable HTTPS for the Zabbix web interface. The volume must Please follow official Nginx [documentation](http://nginx.org/en/docs/http/configuring_https_servers.html) to get more details about how to create certificate files. +### ``/etc/zabbix/web/certs`` + +The volume allows to use custom certificates for SAML authentification. The volume must contains three files ``sp.key``, ``sp.crt`` and ``idp.crt``. Available since 5.0.0. + # The image variants The `zabbix-web-nginx-pgsql` images come in many flavors, each designed for a specific use case.