I finally finished the reorg of the ci-images repo. It has now been split into:
It is much easier to maintain the Docker images when they are each in their own git repo. The only downside I can see is that each Docker image is then only available in its own Docker registry. Seems like it would be nicer to have one central Docker registry for F-Droid.