Zaahir/working dockerfile

//cc @jagtalon @malbin 

I had fiddled with this a few weeks ago and managed to get this working -- I'm not sure if @jagtalon's branch was in a working state already?