summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2018-04-22 19:09:47 +0300
committerLars Wirzenius <liw@liw.fi>2018-04-22 19:09:47 +0300
commit36fdecf43d7b41ae5e213803fc8f429fc08d659c (patch)
tree757c42bba2fd724bea7a3cea344a0916a3ac7a48
parent6047f0065ec155fff9b8b07ade81892f342afde1 (diff)
downloadick2-36fdecf43d7b41ae5e213803fc8f429fc08d659c.tar.gz
Fix: set env vars inside container
-rw-r--r--NEWS2
-rw-r--r--ick2/actionenvs.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index d7a0e76..85c2db8 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
Version 0.46+git, not yet released
----------------------------------
+* Worker manager now sets `LC_ALL` and `DEBIAN_FRONTEND` variables
+ inside the container.
Version 0.46, released 2018-04-22
----------------------------------
diff --git a/ick2/actionenvs.py b/ick2/actionenvs.py
index 8b12c2f..78d4e5a 100644
--- a/ick2/actionenvs.py
+++ b/ick2/actionenvs.py
@@ -163,7 +163,8 @@ class ContainerEnvironment(ActionEnvironment):
'--bind', bind,
'--chdir', '/workspace',
]
- for key in self._extra_env: # pragma: no cover
- var = '{}={}'.format(key, self._extra_env[key])
+ env = self.get_env_vars()
+ for key in env: # pragma: no cover
+ var = '{}={}'.format(key, env[key])
prefix.extend(['--setenv', var])
return self.host_runcmd(prefix + argv)