Commit Graph

130 Commits

Author SHA1 Message Date
root
23abd5eb86 Fixed issue with init (PID 1) 2019-04-09 19:17:07 +03:00
root
eae4397351 Fixed issue with init (PID 1) 2019-04-09 18:12:26 +03:00
root
f7edd4bf67 Fixed issue with init (PID 1) 2019-04-09 16:43:18 +03: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
adffdd7a33 Merge remote-tracking branch 'origin/master' into 3.2 2018-05-31 20:36:35 -07:00
root
b93945f128 Fixed system.users.num item key 2018-05-31 20:35:53 -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
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
a633bc547f Zabbix Appliance multistage images. Fixed missing ldap on Zabbix agent (ubuntu) image 2018-05-29 07:17:33 -07:00
root
795218279e Fixed missing ldap on Zabbix agent (ubuntu) image 2018-05-29 07:14:30 -07:00
root
15986e8f85 Using multistage dockerfile for Zabbix agent (alpine) image 2018-05-28 20:49:18 -07:00
root
c8cbf57114 Using multistage dockerfile for Zabbix agent (alpine) image 2018-05-28 13:19:36 -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
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
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
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
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
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
Alexey Pustovalov
058b49c3cf
Merge pull request #207 from zabbix/master
Updated Zabbix logo
2018-02-19 01:35:51 +02:00
Alexey Pustovalov
acfe3e7a2d
Merge pull request #199 from zabbix/master
Master
2018-02-18 23:13:22 +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
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