Merge pull request #5545 from tonistiigi/v0.17.2-picks #4934

Job	Run time
prepare	1s
test / prepare	5m 53s
test / run (containerd, ./frontend/dockerfile, integration)	4m 56s
test / run (containerd, ./frontend/dockerfile, dockerfile)	6m 53s
test / run (containerd-rootless, ./frontend/dockerfile, integration)	4m 47s
test / run (containerd-rootless, ./frontend/dockerfile, dockerfile)	7m 7s
test / run (containerd-1.6, ./frontend/dockerfile, integration)	4m 47s
test / run (containerd-1.6, ./frontend/dockerfile, dockerfile)	6m 52s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, integration)	6m 16s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	8m 59s
test / run (oci, ./frontend/dockerfile, integration)	4m 59s
test / run (oci, ./frontend/dockerfile, dockerfile)	5m 40s
test / run (oci-rootless, ./frontend/dockerfile, integration)	4m 49s
test / run (oci-rootless, ./frontend/dockerfile, dockerfile)	5m 42s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, integration)	4m 14s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, dockerfile)	5m 30s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, integration)	4m 17s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	5m 43s
image (mainline)	5m 12s
image (labs)	5m 9s
release	0s
scout	0s
	1h 47m 46s

Provide feedback