a
Update start
Update Dockerfile

Add elasticsearch
Create run

Elasticsearch run script
Update supervisord.conf

Add elasticsearch run config
Update Dockerfile

Add duff fuse so that we can install openjdk-7-jre
Update Dockerfile
Update Dockerfile
Update Dockerfile
Make run executable
Update config.js
Update nginx.conf
Update config.js
Update nginx.conf
Update start
Update start
Resolve merge conflict
Merge branch 'master' of https://github.com/iplayer/docker-metrics
Merge branch 'master' of https://github.com/iplayer/docker-metrics
Merge branch 'master' of https://github.com/iplayer/docker-metrics