Dockerfile: Perform some rework of docker