Commit Graph

82 Commits

Author SHA1 Message Date
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
53ff586760 Updated all Dockerfiles to make consistency 2018-05-31 00:50:32 -07:00
root
a3fb960b3e Using multistage dockerfile for centos-based images + Zabbix agent images 2018-05-28 23:58:42 -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
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
root
ae0b7a95a0 Updated Zabbix logo 2018-02-17 11:12:25 -08:00
Alexey Pustovalov
b2bb957389 Added Centos images 2018-02-18 22:45:33 +02:00