Add etcd
Update shell scripts
Update Dockerfile