Dockerfile, removed commented code and added ENV override