Simplify Dockerfile maintenance

We shouldn't really need to maintain the packages lists in the Dockerfiles, as there's a lot of duplication and easy to miss things.