From 50c41eb72a066054f25152756a025472f4c00e6c Mon Sep 17 00:00:00 2001 From: MatthewSuntup Date: Wed, 3 Nov 2021 14:51:25 +1100 Subject: [PATCH] Fix passing of env variables to docker build (#310) --- CHANGELOG.md | 2 +- sdk/python/pulumi_docker/docker.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa28ee2f..1bd146fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## HEAD (Unreleased) -_(none)_ +* Fix passing of `env` parameter in `docker.DockerBuildArgs` in the Python SDK [#310](https://github.com/pulumi/pulumi-docker/issues/310) --- diff --git a/sdk/python/pulumi_docker/docker.py b/sdk/python/pulumi_docker/docker.py index 56aeff2e..b26d5c38 100644 --- a/sdk/python/pulumi_docker/docker.py +++ b/sdk/python/pulumi_docker/docker.py @@ -655,7 +655,9 @@ def run_command_that_can_fail( cmd.extend(args) if env is not None: - env = os.environ.copy().update(env) + environ = os.environ.copy() + environ.update(env) + env = environ process = subprocess.Popen(cmd, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, encoding="utf-8")