Commit Graph

103 Commits

Author SHA1 Message Date
root
37beb4904e Merge branch 'master' into trunk 2019-01-13 03:23:09 +02:00
root
31340521c7 Added possibility to modify Zabbix Agent port number 2019-01-13 03:20:50 +02:00
root
ef11ec0694 Merge branch 'master' into trunk 2019-01-13 00:26:01 +02:00
root
baddcb523c Improve Appliance images. Possible to mount datadir 2019-01-13 00:12:54 +02:00
root
5f7117097b Merge branch 'master' into trunk 2019-01-12 23:45:37 +02:00
root
854af68e9e Fix typos in docker-entrypoint.sh 2019-01-12 23:34:02 +02:00
root
f6cb17d97d Merge branch 'master' into trunk 2019-01-12 23:22:51 +02:00
root
5795897a3e Updated README information 2019-01-12 23:07:44 +02:00
Alexey Pustovalov
b31fd15e6d
Merge pull request #375 from zabbix/master
Fixed HTTPS on CentOS
2018-09-28 13:46:52 +03:00
root
ae8cd145b9 Fixed HTTPS on CentOS 2018-09-28 13:44:57 +03:00
root
89e8995554 Fixed Zabbix agent on Ubuntu (bionic) 2018-08-14 11:03:02 +09:00
root
4c5fdc1b1b Fixed Zabbix agent on Ubuntu (bionic) 2018-08-14 11:01:00 +09:00
root
a37653be47 Updated Ubuntu to 18.04 (bionic) release 2018-07-20 11:23:08 +09:00
root
e3a3f68138 Updated Ubuntu to 18.04 (bionic) release 2018-07-19 19:37:11 +09:00
Alexey Pustovalov
9ae94fb777
Merge pull request #327 from zabbix/master
Fixed PostgreSQL schema name. Fixed graph legends on CentOS
2018-06-28 15:52:52 +09:00
root
8ad66c8639 Fixed PostgreSQL schema name. Fixed graph legends on CentOS 2018-06-28 15:48:31 +09:00
root
074bfc2fc7 Updated build script 2018-06-06 20:55:17 -07:00
root
c32237360d Updated build script 2018-06-06 20:47:07 -07:00
root
2a24013fda Solved issue with Elastisearch parameters 2018-06-05 20:05:48 -07:00
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
8b5cf58ce8 Updated all Dockerfiles to make consistency 2018-05-31 20:08:56 -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
73859060cc Fixed Apache image on Alpine. Also using PHP7 2018-05-30 00:57:30 -07:00
root
124242cf92 Fixed Apache image on Alpine. Also using PHP7 2018-05-29 22:44:48 -07:00
root
795218279e Fixed missing ldap on Zabbix agent (ubuntu) image 2018-05-29 07:14:30 -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
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