Commit Graph

112 Commits

Author SHA1 Message Date
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
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
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
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
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
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
796e0e8fbe Zabbix 3.2.10 release 2017-11-09 15:42:30 +02:00
root
b011c4d16d Fixed MySQL user creation 2017-10-27 19:05:18 +03:00
Alexey Pustovalov
d3311b68c3
Merge pull request #167 from zabbix/master
Fixed MySQL user creation
2017-10-27 18:54:45 +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
d643c8057a Zabbix 3.2.9 release 2017-10-21 17:32:57 +03:00
Alexey Pustovalov
b626f3005e Merge pull request #153 from zabbix/master
Master
2017-10-21 17:16:47 +03:00
Alexey Pustovalov
972ddcd67a Merge pull request #152 from zabbix/master
Master
2017-10-21 17:16:14 +03:00
root
a7d9831ebf Fixed issue with non UTF-8 symbols in build scripts 2017-10-20 18:06:22 +03:00