Merge branch 'updatedocker' into 'NIFTy_7'

After updating build machine use newest docker version again

See merge request !553
12 jobs for NIFTy_7 in 13 minutes and 17 seconds (queued for 2 seconds)