Rollup of 5 pull requests (all of which changes src/ci/docker)
#59298
+122
−49
src/ci/docker)
#59298