FIX various minor stuff on Dockerfile
ADD supervisor support for etcd