Update Dockerfile

Merge ideas from https://github.com/komljen/docker/blob/master/ubuntu/Dockerfile