summaryrefslogtreecommitdiffhomepage
path: root/runsc/test/testutil/testutil.go
diff options
context:
space:
mode:
authorNicolas Lacasse <nlacasse@google.com>2018-09-04 20:08:41 -0700
committerShentubot <shentubot@google.com>2018-09-04 20:10:01 -0700
commitad8648c6343cf2cf3e51a0f58cb053ee303f6ffb (patch)
tree3b1c7c9e8d978258eee349592fd13fbebb36eb1e /runsc/test/testutil/testutil.go
parent2cff07381a911ad52cf9df70d702f39217e9539e (diff)
runsc: Pass log and config files to sandbox process by FD.
This is a prereq for running the sandbox process as user "nobody", when it may not have permissions to open these files. Instead, we must open then before starting the sandbox process, and pass them by FD. The specutils.ReadSpecFromFile method was fixed to always seek to the beginning of the file before reading. This allows Files from the same FD to be read multiple times, as we do in the boot command when the apply-caps flag is set. Tested with --network=host. PiperOrigin-RevId: 211570647 Change-Id: I685be0a290aa7f70731ebdce82ebc0ebcc9d475c
Diffstat (limited to 'runsc/test/testutil/testutil.go')
-rw-r--r--runsc/test/testutil/testutil.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/runsc/test/testutil/testutil.go b/runsc/test/testutil/testutil.go
index 25987d040..4429b981b 100644
--- a/runsc/test/testutil/testutil.go
+++ b/runsc/test/testutil/testutil.go
@@ -176,6 +176,7 @@ func SetupContainerInRoot(rootDir string, spec *specs.Spec, conf *boot.Config) (
}
conf.RootDir = rootDir
+ conf.SpecFile = filepath.Join(bundleDir, "config.json")
return bundleDir, nil
}