Adapt it to recent changes in the docker environment and remove a few
deprecated sections.