summaryrefslogtreecommitdiff
path: root/docker/marathon.json
Commit message (Expand)AuthorAgeFilesLines
* Update docker guide and add docker-compose.ymlupdate-dockerKamil Trzcinski2015-09-301-31/+0
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-07-101-1/+1
|\
| * Update image to latest oneSytse Sijbrandij2015-07-101-1/+1
* | Add volumes to marathon file.Sytse Sijbrandij2015-07-101-1/+18
|/
* Update Docker documentation to use single containerKamil Trzcinski2015-07-061-0/+14