3 files changed, 17 insertions, 5 deletions
diff --git a/pkg/test/dockerutil/BUILD b/pkg/test/dockerutil/BUILD
index 7f983a0b3..366f068e3 100644
--- a/pkg/test/dockerutil/BUILD
+++ b/pkg/test/dockerutil/BUILD
@@ -36,8 +36,8 @@ go_test(
     tags = [
         # Requires docker and runsc to be configured before test runs.
         # Also requires the test to be run as root.
-        "manual",
         "local",
+        "manual",
     ],
     visibility = ["//:sandbox"],
 )
diff --git a/pkg/test/dockerutil/container.go b/pkg/test/dockerutil/container.go
index 41fcf4978..06152a444 100644
--- a/pkg/test/dockerutil/container.go
+++ b/pkg/test/dockerutil/container.go
@@ -434,7 +434,14 @@ func (c *Container) Wait(ctx context.Context) error {
 	select {
 	case err := <-errChan:
 		return err
-	case <-statusChan:
+	case res := <-statusChan:
+		if res.StatusCode != 0 {
+			var msg string
+			if res.Error != nil {
+				msg = res.Error.Message
+			}
+			return fmt.Errorf("container returned non-zero status: %d, msg: %q", res.StatusCode, msg)
+		}
 		return nil
 	}
 }
diff --git a/pkg/test/dockerutil/profile.go b/pkg/test/dockerutil/profile.go
index 4855a52fc..12fe98b16 100644
--- a/pkg/test/dockerutil/profile.go
+++ b/pkg/test/dockerutil/profile.go
@@ -82,10 +82,15 @@ func (p *profile) createProcess(c *Container) error {
 	}
 
 	// The root directory of this container's runtime.
-	root := fmt.Sprintf("--root=/var/run/docker/runtime-%s/moby", c.runtime)
+	rootDir := fmt.Sprintf("/var/run/docker/runtime-%s/moby", c.runtime)
+	if _, err := os.Stat(rootDir); os.IsNotExist(err) {
+		// In docker v20+, due to https://github.com/moby/moby/issues/42345 the
+		// rootDir seems to always be the following.
+		rootDir = "/var/run/docker/runtime-runc/moby"
+	}
 
-	// Format is `runsc --root=rootdir debug --profile-*=file --duration=24h containerID`.
-	args := []string{root, "debug"}
+	// Format is `runsc --root=rootDir debug --profile-*=file --duration=24h containerID`.
+	args := []string{fmt.Sprintf("--root=%s", rootDir), "debug"}
 	for _, profileArg := range p.Types {
 		outputPath := filepath.Join(p.BasePath, fmt.Sprintf("%s.pprof", profileArg))
 		args = append(args, fmt.Sprintf("--profile-%s=%s", profileArg, outputPath))