In particular, in .gitlab-ci.yml I see no reason to hard-code
the version of clang tools - it seems easier to control that
only when generating the image.

(cherry picked from commit 449851ff)