Commit Graph

86 Commits

Author SHA1 Message Date
root
618bedf26f Merge branch 'master' into trunk 2019-04-09 23:36:25 +03:00
root
ec52185af3 Fixed issue with init (PID 1) 2019-04-09 22:43:56 +03:00
Alexey Pustovalov
39ad9461fc
Merge pull request #333 from zabbix/master
Fixed health check in docker compose files
2018-07-06 15:55:28 +09:00
root
59f14d89cb Fixed health check in docker compose files 2018-07-06 15:54:10 +09: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
124242cf92 Fixed Apache image on Alpine. Also using PHP7 2018-05-29 22:44:48 -07:00
root
9aa8e0362b Fixed Apache image on Alpine. Also using PHP7 2018-05-29 22:36:35 -07:00
root
85a78b6743 Fixed Apache image on Alpine. Also using PHP7 2018-05-29 20:48:47 -07:00
root
9cbee91a1c Merge master 2018-05-10 16:38:07 -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
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
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
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
Alexey Pustovalov
67d50cacb3 The big one update :-) 2018-02-18 22:42:44 +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
b011c4d16d Fixed MySQL user creation 2017-10-27 19:05:18 +03:00
root
3b989be95f Zabbix 3.4.3 release 2017-10-21 17:34:03 +03:00
root
a2ab1a9bfd Zabbix 3.4.2 release 2017-10-12 20:33:53 +03:00
root
3e03235c40 Zabbix 3.4.1 release 2017-08-31 10:48:49 +03:00
dotneft
a206680ea3 Zabbix 3.4.0 release 2017-08-22 02:42:14 -07:00
Alexey Pustovalov
31d4d911a7 Merge pull request #99 from zabbix/master
Master
2017-04-28 16:28:33 +03:00
dotneft
fa1542a14e Changed maintainer to new format 2017-04-27 09:32:34 -07:00
Alexey Pustovalov
9926532893 Merge pull request #89 from zabbix/master
Replace Alpine 3.5 to 3.4 version
2017-03-12 03:15:49 +05:00
dotneft
be21e83dd9 Replace Alpine 3.5 to 3.4 version 2017-03-11 14:13:50 -08:00
dotneft
d36f651731 Trunk update 2016-10-28 07:10:53 -07:00
dotneft
ec613786c9 Trunk update 2016-10-28 07:09:29 -07:00
dotneft
1f208172b9 Added Apache with PostgreSQL support image 2016-10-28 06:49:42 -07:00