Improvements to Gitlab CI container builds

[Camilla Conte]

Given my recent deep-dive in this part of the Gitlab CI, I
figured I could propose some improvements that came to mind
along the way.

The last patch removes the need for Docker in Docker.