Commit Graph

122 Commits

Author SHA1 Message Date
Alexey Pustovalov
465f2957e5
Merge pull request #309 from zabbix/master
Fixed php-fpm7 on Alpine images
2018-05-24 15:32:12 +08:00
root
046251b853 Fixed php-fpm7 on Alpine images 2018-05-24 00:31:46 -07:00
Alexey Pustovalov
36e16d463c
Merge pull request #305 from zabbix/master
Fixed php-fpm7 on Alpine images
2018-05-11 23:54:58 +03:00
root
ddd519ce0b Fixed php-fpm7 on Alpine images 2018-05-11 13:33:38 -07:00
Alexey Pustovalov
b2c3ed6705
Merge pull request #301 from zabbix/master
Fixed php-fpm7 on Alpine images
2018-05-11 23:22:13 +03:00
root
278be78a91 Fixed php-fpm7 on Alpine images 2018-05-11 13:00:31 -07:00
root
5cec9cca9b Zabbix 3.0.17 2018-05-10 17:02:20 -07:00
root
e080cc3e0d Merge master 2018-05-10 17:01:14 -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
f8675ee603 Zabbix v3.0.16 2018-04-06 07:55:54 -07:00
Alexey Pustovalov
a7a45ad4ee
Merge pull request #267 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-31 00:05:52 +03:00
root
f4aa02c0b9 Fixed small issues. Preparation for Appliance 2018-03-30 06:15:14 -07:00
Alexey Pustovalov
b6821475c1
Merge pull request #262 from zabbix/master
Master
2018-03-30 16:36:06 +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
9665660e09
Merge pull request #257 from zabbix/master
Fixed small issues. Preparation for Appliance
2018-03-29 16:53:24 +03:00
root
6e7a247564 Fixed small issues. Preparation for Appliance 2018-03-29 06:28:10 -07:00
root
17a29083cf Zabbix 3.0.15 release 2018-02-26 02:37:43 -08:00
root
cd2a3a0627 Merge remote-tracking branch 'origin/master' into 3.0 2018-02-23 13:48:40 -08:00
root
de98c6bbd8 Escpaing special characters 2018-02-23 13:43:00 -08:00
root
428e64e7e9 Merge remote-tracking branch 'origin/master' into 3.0 2018-02-22 14:37:22 -08:00
root
6bde28aac3 Fix Apache on Ubuntu startup command 2018-02-22 14:37:03 -08:00
root
d61f132b80 Merge remote-tracking branch 'origin/master' into 3.0 2018-02-22 13:30:02 -08:00
root
20271e6592 Fixed issue with supervisord daemon on Nginx Ubuntu images 2018-02-22 13:29:41 -08:00
root
8e36252f50 Merge remote-tracking branch 'origin/master' into 3.0 2018-02-22 12:54:07 -08:00
root
e274af43ee Fixed issue with missing https in apt 2018-02-22 12:53:52 -08:00
Alexey Pustovalov
f1800bb057
Merge pull request #238 from zabbix/master
Removed supervisord from single application images
2018-02-22 22:09:45 +02:00
root
6a382c3f34 Removed supervisord from single application images 2018-02-22 12:07:15 -08:00
Alexey Pustovalov
55f5754a0a
Merge pull request #235 from zabbix/master
Fixed issue in ubuntu image
2018-02-22 13:03:33 +02:00
root
cfcad63159 Fixed issue in ubuntu image 2018-02-22 03:02:43 -08:00
Alexey Pustovalov
b0b2e073ec
Merge pull request #229 from zabbix/master
Fixed issue with config params undef
2018-02-21 03:01:40 +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
06e4fe7296 CentOS image update 2018-02-17 11:20:13 -08:00
Alexey Pustovalov
9f08c43b04
Merge pull request #206 from zabbix/master
Updated Zabbix logo
2018-02-19 01:35:30 +02:00
Alexey Pustovalov
ff2e320cee
Merge pull request #198 from zabbix/master
Master
2018-02-18 23:08:00 +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
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
2948c37084 Zabbix 3.0.14 release 2018-01-04 21:21:25 +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