138 Commits

Author	SHA1	Message	Date
Alexey Pustovalov	fb524b7a50	Merge pull request #331 from zabbix/master ... Fixed health check in docker compose files	2018-07-06 15:55:08 +09:00
root	59f14d89cb	Fixed health check in docker compose files	2018-07-06 15:54:10 +09:00
Alexey Pustovalov	f96e833517	Merge pull request #326 from zabbix/master ... Fixed PostgreSQL schema name. Fixed graph legends on CentOS	2018-06-28 15:52:40 +09:00
root	8ad66c8639	Fixed PostgreSQL schema name. Fixed graph legends on CentOS	2018-06-28 15:48:31 +09:00
root	f65093606a	Updated build script	2018-06-06 20:54:08 -07:00
root	c32237360d	Updated build script	2018-06-06 20:47:07 -07:00
root	fec2c8240c	Merge remote-tracking branch 'origin/master' into 3.2	2018-06-01 02:07:28 -07:00
root	c8a86b92ee	Added Elasticsearch feature	2018-06-01 02:05:57 -07:00
root	042e884ef3	Merge remote-tracking branch 'origin/master' into 3.2	2018-05-31 20:10:01 -07:00
root	a01674e016	Fixed '[' character escaping	2018-05-31 20:06:05 -07:00
root	78b98bb940	Merge remote-tracking branch 'origin/master' into 3.2	2018-05-31 18:45:15 -07:00
root	112890eadd	Updated all Dockerfiles to make consistency	2018-05-31 18:44:12 -07:00
root	aa15419ad5	Updated all Dockerfiles to make consistency	2018-05-31 18:43:44 -07:00
root	53ff586760	Updated all Dockerfiles to make consistency	2018-05-31 00:50:32 -07:00
root	b913a1c872	CentOS images fix. Systemd issue	2018-05-28 13:06:11 -07:00
root	32e02d831f	Fixed CentOS images building	2018-05-26 03:58:52 -07:00
Alexey Pustovalov	f2815b4f59	Merge pull request #310 from zabbix/master ... Fixed php-fpm7 on Alpine images	2018-05-24 15:32:29 +08:00
root	046251b853	Fixed php-fpm7 on Alpine images	2018-05-24 00:31:46 -07:00
Alexey Pustovalov	e0b04b6833	Merge pull request #302 from zabbix/master ... Fixed php-fpm7 on Alpine images	2018-05-11 23:22:28 +03:00
root	278be78a91	Fixed php-fpm7 on Alpine images	2018-05-11 13:00:31 -07:00
root	0653f8390b	Merge from master	2018-05-10 19:11:24 -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
Alexey Pustovalov	3f36bae72e	Merge pull request #269 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-31 00:06:24 +03:00
root	f4aa02c0b9	Fixed small issues. Preparation for Appliance	2018-03-30 06:15:14 -07:00
root	37df41f2f0	Fixed small issues. Preparation for Appliance	2018-03-30 02:04:04 -07:00
Alexey Pustovalov	beae98e524	Merge pull request #263 from zabbix/master ... Master	2018-03-30 16:50:45 +03: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	ad42d1a355	Merge pull request #258 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-29 16:54:08 +03:00
root	6e7a247564	Fixed small issues. Preparation for Appliance	2018-03-29 06:28:10 -07:00
root	41e45d405d	Merge remote-tracking branch 'origin/master' into 3.2	2018-02-23 13:49:05 -08:00
root	de98c6bbd8	Escpaing special characters	2018-02-23 13:43:00 -08:00
root	6a9d8dfbc7	Merge remote-tracking branch 'origin/master' into 3.2	2018-02-22 14:37:41 -08:00
root	6bde28aac3	Fix Apache on Ubuntu startup command	2018-02-22 14:37:03 -08:00
root	0685e09a30	Merge remote-tracking branch 'origin/master' into 3.2	2018-02-22 13:30:34 -08:00
root	20271e6592	Fixed issue with supervisord daemon on Nginx Ubuntu images	2018-02-22 13:29:41 -08:00
root	8f487259bb	Merge remote-tracking branch 'origin/master' into 3.2	2018-02-22 12:54:36 -08:00
root	e274af43ee	Fixed issue with missing https in apt	2018-02-22 12:53:52 -08:00
Alexey Pustovalov	a2879cb448	Merge pull request #239 from zabbix/master ... Removed supervisord from single application images	2018-02-22 22:10:58 +02:00
root	6a382c3f34	Removed supervisord from single application images	2018-02-22 12:07:15 -08:00
Alexey Pustovalov	d0e79cbb24	Merge pull request #236 from zabbix/master ... Fixed issue in ubuntu image	2018-02-22 13:03:50 +02:00
root	cfcad63159	Fixed issue in ubuntu image	2018-02-22 03:02:43 -08:00
Alexey Pustovalov	82aaab3474	Merge pull request #230 from zabbix/master ... Fixed issue with config params undef	2018-02-21 03:02:06 +02:00
root	c79f2e0271	Fixed issue with config params undef	2018-02-20 08:23:18 -08:00
Alexey Pustovalov	8d407ae506	Merge pull request #222 from zabbix/master ... Fixed issue with web-nginx-mysql image	2018-02-19 13:06:47 +02:00
root	5ccac3cdf4	Fixed issue with web-nginx-mysql image	2018-02-17 17:10:43 -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	6103911359	CentOS image update	2018-02-17 11:21:26 -08:00