summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-05-22 12:43:15 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-05-22 12:43:15 +0100
commitc4070c7f003be9c7e61ba53f49c6f96c1726e5da (patch)
tree42acce31c32eedd50cd2aa01f0c1fbc9aac820b3
parent8aec6d1a52b6386d2d9d664471a9a47cc62e9078 (diff)
downloadsandboxlib-c4070c7f003be9c7e61ba53f49c6f96c1726e5da.tar.gz
Honour environment variables defined in App Container images
-rwxr-xr-xrun-sandbox10
1 files changed, 7 insertions, 3 deletions
diff --git a/run-sandbox b/run-sandbox
index 9abcf81..b1bd332 100755
--- a/run-sandbox
+++ b/run-sandbox
@@ -80,12 +80,16 @@ def run():
else:
command = args.command
+ cwd = None
if 'workingDirectory' in manifest['app']:
cwd = manifest['app']['workingDirectory']
- else:
- cwd = None
- executor.run_sandbox(rootfs_path, command, cwd=cwd)
+ extra_env = {}
+ if 'environment' in manifest['app']:
+ for item in manifest['app']['environment']:
+ extra_env[item['name']] = item['value']
+
+ executor.run_sandbox(rootfs_path, command, cwd=cwd, extra_env=extra_env)
else:
# We should at minimum handle filesystem trees as well.
raise RuntimeError(