Merge pull request #4804 from AkihiroSuda/fix-4746 #2771

Job	Run time
prepare	1s
test / prepare	2m 15s
test / run (containerd, ./frontend/dockerfile, integration)	4m 50s
test / run (containerd, ./frontend/dockerfile, dockerfile)	11m 31s
test / run (containerd-rootless, ./frontend/dockerfile, integration)	4m 31s
test / run (containerd-rootless, ./frontend/dockerfile, dockerfile)	5m 36s
test / run (containerd-1.6, ./frontend/dockerfile, integration)	4m 59s
test / run (containerd-1.6, ./frontend/dockerfile, dockerfile)	6m 58s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, integration)	4m 39s
test / run (containerd-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	10m 7s
test / run (oci, ./frontend/dockerfile, integration)	4m 7s
test / run (oci, ./frontend/dockerfile, dockerfile)	9m 21s
test / run (oci-rootless, ./frontend/dockerfile, integration)	4m 7s
test / run (oci-rootless, ./frontend/dockerfile, dockerfile)	1m 31s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, integration)	6m 18s
test / run (oci-rootless-slirp4netns-detachnetns, ./frontend/dockerfile, dockerfile)	4m 59s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, integration)	4m 20s
test / run (oci-snapshotter-stargz, ./frontend/dockerfile, dockerfile)	5m 18s
image	0s
release	0s
	1h 35m 28s

Provide feedback