Condense Dockerfile for smaller intermediate containers footprint

3 jobs for master in 26 seconds (queued for 31 seconds)
Status Job ID Name Coverage
  .Pre
passed #76391
make-targets

00:00:26

 
  Build
passed build-images

 
  Publish
skipped #76393
publish-docker