Cleaned Docekrfile and updated docker-compose

[adeshpandey]

Dockerfiles are very confusing and I noticed they need cleaning so I started with a small contribution. I hope it will be approved without any problem.