92 Commits

Author	SHA1	Message	Date
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	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	ce16b08f92	Fixed Apache image on Alpine. Also using PHP7	2018-05-29 20:49:05 -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	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