Merge branch '2021-04-07-CI-improvements'

- Assorted Azure/GitLab improvements
- Move the Dockerfile used for making containers in CI in to this
  repository.