Commit Graph

206 Commits

Author SHA1 Message Date
root
6465a70acc Merge branch 'master' into trunk 2019-01-13 02:22:21 +02:00
root
91a8d57873 Fixed multilang support on CentOS based images 2019-01-13 02:20:45 +02:00
root
3f30022956 Fixed multilang support on CentOS based images 2019-01-13 01:46:08 +02:00
root
ef11ec0694 Merge branch 'master' into trunk 2019-01-13 00:26:01 +02:00
root
baddcb523c Improve Appliance images. Possible to mount datadir 2019-01-13 00:12:54 +02:00
root
5f7117097b Merge branch 'master' into trunk 2019-01-12 23:45:37 +02:00
root
854af68e9e Fix typos in docker-entrypoint.sh 2019-01-12 23:34:02 +02:00
root
f6cb17d97d Merge branch 'master' into trunk 2019-01-12 23:22:51 +02:00
root
5795897a3e Updated README information 2019-01-12 23:07:44 +02:00
root
07bd770154 Missing headers module for Apache on Ubuntu 2018-10-02 22:43:00 +05:00
Alexey Pustovalov
8bbd31f16d
Merge pull request #378 from zabbix/master
Updated Apache config for non-SSL connections
2018-09-28 14:00:09 +03:00
root
9ab47299c1 Updated Apache config for non-SSL connections 2018-09-28 13:58:15 +03:00
Alexey Pustovalov
b31fd15e6d
Merge pull request #375 from zabbix/master
Fixed HTTPS on CentOS
2018-09-28 13:46:52 +03:00
root
ae8cd145b9 Fixed HTTPS on CentOS 2018-09-28 13:44:57 +03:00
Alexey Pustovalov
3b96a97391
Merge pull request #357 from zabbix/master
Fixed Apache SSL on CentOS
2018-08-15 12:26:02 +09:00
root
faee6eebe8 Fixed Apache SSL on CentOS 2018-08-15 12:24:39 +09:00
Alexey Pustovalov
25a917cee3
Merge pull request #349 from zabbix/master
Added max_input_vars param for PHP
2018-07-30 12:34:06 +09:00
root
67a750dcb0 Added max_input_vars param for PHP 2018-07-30 12:32:30 +09:00
root
a37653be47 Updated Ubuntu to 18.04 (bionic) release 2018-07-20 11:23:08 +09:00
root
e3a3f68138 Updated Ubuntu to 18.04 (bionic) release 2018-07-19 19:37:11 +09:00
Alexey Pustovalov
39ad9461fc
Merge pull request #333 from zabbix/master
Fixed health check in docker compose files
2018-07-06 15:55:28 +09:00
root
59f14d89cb Fixed health check in docker compose files 2018-07-06 15:54:10 +09:00
Alexey Pustovalov
9ae94fb777
Merge pull request #327 from zabbix/master
Fixed PostgreSQL schema name. Fixed graph legends on CentOS
2018-06-28 15:52:52 +09:00
root
8ad66c8639 Fixed PostgreSQL schema name. Fixed graph legends on CentOS 2018-06-28 15:48:31 +09:00
root
074bfc2fc7 Updated build script 2018-06-06 20:55:17 -07:00
root
c32237360d Updated build script 2018-06-06 20:47:07 -07:00
root
2a24013fda Solved issue with Elastisearch parameters 2018-06-05 20:05:48 -07:00
root
3b84f57857 Merge remote-tracking branch 'origin/master' into trunk 2018-06-01 02:06:43 -07:00
root
c8a86b92ee Added Elasticsearch feature 2018-06-01 02:05:57 -07:00
root
4355caab21 Added Elasticsearch feature 2018-06-01 02:02:20 -07:00
root
0a8d38b8ac Merge remote-tracking branch 'origin/master' into trunk 2018-05-31 20:09:12 -07:00
root
a01674e016 Fixed '[' character escaping 2018-05-31 20:06:05 -07:00
root
f06c11f91a Updated all Dockerfiles to make consistency 2018-05-31 19:02:46 -07:00
root
112890eadd Updated all Dockerfiles to make consistency 2018-05-31 18:44:12 -07:00
root
53ff586760 Updated all Dockerfiles to make consistency 2018-05-31 00:50:32 -07:00
root
124242cf92 Fixed Apache image on Alpine. Also using PHP7 2018-05-29 22:44:48 -07:00
root
9aa8e0362b Fixed Apache image on Alpine. Also using PHP7 2018-05-29 22:36:35 -07:00
root
0e102226fe Fixed Apache image on Alpine. Also using PHP7 2018-05-29 22:07:59 -07:00
root
85a78b6743 Fixed Apache image on Alpine. Also using PHP7 2018-05-29 20:48:47 -07:00
root
a3fb960b3e Using multistage dockerfile for centos-based images + Zabbix agent images 2018-05-28 23:58:42 -07:00
root
5fae1b3437 Fixed CentOS images building 2018-05-26 06:50:04 -07:00
root
32e02d831f Fixed CentOS images building 2018-05-26 03:58:52 -07:00
Alexey Pustovalov
e9867a0d11
Merge pull request #303 from zabbix/master
Fixed php-fpm7 on Alpine images
2018-05-11 23:22:47 +03:00
root
278be78a91 Fixed php-fpm7 on Alpine images 2018-05-11 13:00:31 -07:00
root
9cbee91a1c Merge master 2018-05-10 16:38:07 -07:00
root
26b9a39092 Some images bumped to Alpine 3.7 version. Added Alpine and CentOS snmptraps image 2018-05-10 13:30:42 -07:00
root
15ffcfc51e Fixed font config for trunk web-interface 2018-04-12 01:28:04 +03:00
Alexey Pustovalov
c4937b52fd
Merge pull request #270 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-31 00:06:48 +03:00
root
f4aa02c0b9 Fixed small issues. Preparation for Appliance 2018-03-30 06:15:14 -07:00
root
305b77fe7f Fixed small issues. Preparation for Appliance 2018-03-30 05:36:16 -07:00
root
2f8752ac1c Fixed small issues. Preparation for Appliance 2018-03-30 01:36:04 -07:00
root
fb6866403c Fixed small issues. Preparation for Appliance 2018-03-29 07:21:02 -07:00
Alexey Pustovalov
f6e90789a9
Merge pull request #260 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-29 16:54:52 +03:00
root
6e7a247564 Fixed small issues. Preparation for Appliance 2018-03-29 06:28:10 -07:00
root
26ba6ae137 Merge remote-tracking branch 'origin/master' into trunk 2018-02-23 13:49:47 -08:00
root
de98c6bbd8 Escpaing special characters 2018-02-23 13:43:00 -08:00
root
fc85c2c687 Merge remote-tracking branch 'origin/master' into trunk 2018-02-22 14:38:27 -08:00
root
6bde28aac3 Fix Apache on Ubuntu startup command 2018-02-22 14:37:03 -08:00
root
2dbef36163 Removed supervisord from single application images 2018-02-22 12:31:38 -08:00
root
6a382c3f34 Removed supervisord from single application images 2018-02-22 12:07:15 -08:00
Alexey Pustovalov
d6677fabf9
Merge pull request #232 from zabbix/master
Fixed issue with config params undef
2018-02-21 03:02:52 +02:00
root
c79f2e0271 Fixed issue with config params undef 2018-02-20 08:23:18 -08:00
root
08e0021858 New config parameters since Zabbix 3.4 2018-02-18 02:11:27 -08:00
root
0b7127d2f3 Fixed issue with proxy-mysql image 2018-02-17 16:20:18 -08:00
root
1be4813733 Revert "Merge branch '3.4' into master"
This reverts commit e3dd845396, reversing
changes made to 461f869a4a.
2018-02-17 16:12:34 -08:00
root
a60fdb8a05 CentOS image update 2018-02-17 11:22:21 -08:00
Alexey Pustovalov
594b40be22
Merge pull request #205 from zabbix/master
Updated Zabbix logo
2018-02-19 01:35:11 +02:00
root
ae0b7a95a0 Updated Zabbix logo 2018-02-17 11:12:25 -08:00
root
93d3ff421a Updated Zabbix logo 2018-02-17 10:51:12 -08:00
root
8f39e80b6f Revert "Merge branch 'trunk' into master"
This reverts commit 78b62d9ce5, reversing
changes made to f4e4c3f70f.
2018-02-17 10:38:49 -08:00
Alexey Pustovalov
78b62d9ce5
Merge branch 'trunk' into master 2018-02-19 00:59:05 +02:00
root
f4e4c3f70f Revert "Merge branch '3.4' into master"
This reverts commit 49a0e5deb7, reversing
changes made to b2bb957389.
2018-02-17 10:22:18 -08:00
Alexey Pustovalov
49a0e5deb7
Merge branch '3.4' into master 2018-02-19 00:10:51 +02:00
Alexey Pustovalov
b2bb957389 Added Centos images 2018-02-18 22:45:33 +02:00
Alexey Pustovalov
67d50cacb3 The big one update :-) 2018-02-18 22:42:44 +02:00
root
e212ec751b Zabbix 3.4.6 release 2018-01-16 20:04:34 +02:00
root
5160cf3c02 Zabbix 3.4.5 release 2018-01-04 21:20:26 +02:00
root
19dc7d69e7 Zabbix 3.4.4 release 2017-11-09 15:43:26 +02:00
root
b011c4d16d Fixed MySQL user creation 2017-10-27 19:05:18 +03:00
root
3bbbdeff92 Fixed MySQL user creation 2017-10-27 18:53:31 +03:00
root
4f481f811e Fixed MySQL user creation 2017-10-27 18:51:39 +03:00
root
3b989be95f Zabbix 3.4.3 release 2017-10-21 17:34:03 +03:00
root
a2ab1a9bfd Zabbix 3.4.2 release 2017-10-12 20:33:53 +03:00
root
3e03235c40 Zabbix 3.4.1 release 2017-08-31 10:48:49 +03:00
dotneft
a206680ea3 Zabbix 3.4.0 release 2017-08-22 02:42:14 -07:00
Alexey Pustovalov
95b65f1aee Merge pull request #128 from zabbix/master
Zabbix 3.4 release
2017-08-22 12:25:50 +03:00
dotneft
6c7849cdd3 Zabbix 3.4 release 2017-08-22 02:23:19 -07:00
Alexey Pustovalov
805863cb31 Merge pull request #115 from zabbix/master
Master
2017-05-26 12:06:26 +03:00
Alexey Pustovalov
be96e101dd TZ env variable renamed to PHP_TZ to avoid confusing with system-wide envs 2017-05-22 12:34:39 +03:00
Alexey Pustovalov
5e22f7959d Merge pull request #112 from zabbix/master
Fixed issue with ListenIP parameter
2017-05-12 16:53:59 +03:00
Alexey Pustovalov
e11021a1ec Fixed issue with ListenIP parameter 2017-05-12 16:52:41 +03:00
Alexey Pustovalov
9569864706 Merge pull request #109 from zabbix/master
Added SourceIP and ListenIP params
2017-05-11 13:41:43 +03:00
dotneft
8d9866a123 Added SourceIP and ListenIP params 2017-05-11 03:37:37 -07:00
Alexey Pustovalov
462b628ce3 Merge pull request #105 from zabbix/master
Fixed PostgreSQL default root account
2017-05-01 17:25:56 +03:00
Alexey Pustovalov
780944d92c Merge pull request #102 from zabbix/master
Master
2017-05-01 16:55:05 +03:00
Alexey Pustovalov
31d4d911a7 Merge pull request #99 from zabbix/master
Master
2017-04-28 16:28:33 +03:00
dotneft
a98a984f6d Fixed PostgreSQL default root account 2017-04-27 16:28:30 -07:00
dotneft
5bde7d2629 Fixed mistypo in docker exec command 2017-04-27 15:58:06 -07:00
dotneft
fa1542a14e Changed maintainer to new format 2017-04-27 09:32:34 -07:00
Alexey Pustovalov
9926532893 Merge pull request #89 from zabbix/master
Replace Alpine 3.5 to 3.4 version
2017-03-12 03:15:49 +05:00
dotneft
be21e83dd9 Replace Alpine 3.5 to 3.4 version 2017-03-11 14:13:50 -08:00
Alexey Pustovalov
0b51b489c0 Merge pull request #64 from zabbix/master
Updated doc
2016-10-28 18:21:27 +03:00
dotneft
d681f6b87c Updated doc 2016-10-28 08:19:42 -07:00
dotneft
d36f651731 Trunk update 2016-10-28 07:10:53 -07:00
dotneft
ec613786c9 Trunk update 2016-10-28 07:09:29 -07:00
dotneft
1f208172b9 Added Apache with PostgreSQL support image 2016-10-28 06:49:42 -07:00