summaryrefslogtreecommitdiff
path: root/packaging/docker/catlfish-merge
Commit message (Expand)AuthorAgeFilesLines
* create supervisord_logLinus Nordberg2015-04-021-3/+2
* dockeridockLinus Nordberg2015-04-021-2/+2
* create a group tooLinus Nordberg2015-04-021-1/+2
* docker moarLinus Nordberg2015-04-023-11/+13
* Is this how we let non-root users write to mounted "volumes"?Linus Nordberg2015-04-011-0/+4
* Run merge.sh under supervisord.Linus Nordberg2015-04-013-13/+16
* add gitLinus Nordberg2015-04-011-1/+1
* Dockerfile for merge, first cut.Linus Nordberg2015-04-012-0/+65