Support for running the catalog with docker images

Github says it can't be merged automatically, but the branches that has been merged into master has also been merged into this branch so it should be a clean merge.  (I can do it, once we verified that the commits are sound.)