From 0f80285901d59e67767bbf498f92bc2daa9720df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Tue, 25 Feb 2020 17:48:55 +0100 Subject: _sandboxreapi.py: Support optional network access This is used by `bst shell`. --- src/buildstream/sandbox/_sandboxbuildboxrun.py | 2 +- src/buildstream/sandbox/_sandboxreapi.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/buildstream/sandbox/_sandboxbuildboxrun.py b/src/buildstream/sandbox/_sandboxbuildboxrun.py index df2c4394d..df0703dfd 100644 --- a/src/buildstream/sandbox/_sandboxbuildboxrun.py +++ b/src/buildstream/sandbox/_sandboxbuildboxrun.py @@ -173,7 +173,7 @@ class SandboxBuildBoxRun(SandboxREAPI): raise SandboxError("buildbox-run failed with returncode {}".format(returncode)) def _supported_platform_properties(self): - return {"unixUID", "unixGID"} + return {"unixUID", "unixGID", "network"} def _warn(self, msg): self._get_context().messenger.message(Message(MessageType.WARN, msg)) diff --git a/src/buildstream/sandbox/_sandboxreapi.py b/src/buildstream/sandbox/_sandboxreapi.py index 774058d6a..19c599197 100644 --- a/src/buildstream/sandbox/_sandboxreapi.py +++ b/src/buildstream/sandbox/_sandboxreapi.py @@ -121,6 +121,9 @@ class SandboxREAPI(Sandbox): if "unixGID" in supported_properties: platform.properties.add(name="unixGID", value=str(gid)) + if flags & SandboxFlags.NETWORK_ENABLED and "network" in supported_properties: + platform.properties.add(name="network", value="on") + return remote_execution_pb2.Command( arguments=command, working_directory=working_directory[1:], -- cgit v1.2.1