summaryrefslogtreecommitdiff
path: root/packaging/docker/catlfish-merge
Commit message (Collapse)AuthorAgeFilesLines
* Base catlfish-merge docker image on erlang instead of base.Linus Nordberg2015-04-101-1/+1
| | | | We need erlang (escript) for running verify.erl.
* [Docker] Add docker support for merge nodes.Linus Nordberg2015-04-033-0/+74
Also, run as a separate user in docker-dev.