Merge pull request #5499 from tonistiigi/v0.17.1-picks #4763

Job	Run time
prepare	1s
test / prepare	5m 31s
test / run (containerd, ./frontend/dockerfile, integration)	4m 55s
test / run (containerd, ./frontend/dockerfile, dockerfile)	6m 45s
test / run (containerd-rootless, ./frontend/dockerfile, integration)	5m 29s
test / run (containerd-rootless, ./frontend/dockerfile, dockerfile)	7m 15s
test / run (containerd-1.6, ./frontend/dockerfile, integration)	4m 48s
test / run (containerd-1.6, ./frontend/dockerfile, dockerfile)	6m 44s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, integration)	5m 4s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	7m 7s
test / run (oci, ./frontend/dockerfile, integration)	4m 33s
test / run (oci, ./frontend/dockerfile, dockerfile)	6m 0s
test / run (oci-rootless, ./frontend/dockerfile, integration)	4m 12s
test / run (oci-rootless, ./frontend/dockerfile, dockerfile)	5m 38s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, integration)	4m 18s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, dockerfile)	5m 46s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, integration)	4m 26s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	6m 15s
image (dockerfile/1.11.1)	5m 10s
release	3s
scout	0s
	1h 40m 0s

Provide feedback