4 commits

Author	SHA1	Message	Date
Sytse Sijbrandij	526813581b	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce ... Conflicts: docker/marathon.json	2015-07-10 18:44:54 +02:00
Sytse Sijbrandij	1ea0db475f	Add volumes to marathon file.	2015-07-10 18:43:32 +02:00
Sytse Sijbrandij	aa33189c09	Update image to latest one	2015-07-10 16:32:09 +00:00
Kamil Trzcinski	954c1df256	Update Docker documentation to use single container	2015-07-06 16:42:52 +02:00

Renamed from docker/single/marathon.json (Browse further)