[internal] Update merge conflick in changelog

pulumi · Sep 21, 2022 · c72fb8e · c72fb8e
2 parents ac43892 + 50c41eb
commit c72fb8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/CHANGELOG_OLD.md b/CHANGELOG_OLD.md
@@ -3,10 +3,6 @@
 *As of this notice, using CHANGELOG.md is DEPRECATED. We will be using [GitHub Releases](https://github.com/pulumi/pulumi-docker/releases) for this repository*
 
 ## HEAD (Unreleased)
-* Upgrade to terraform-bridge 3.11.0
-* Upgrade to pulumi 3.17.0
-* Avoid blocking the message loop for Docker builds in Python
-  [#314](https://github.com/pulumi/pulumi-docker/pull/314).
 
 ---
 

diff --git a/sdk/python/pulumi_docker/docker.py b/sdk/python/pulumi_docker/docker.py
@@ -665,7 +665,9 @@ async def run_command_that_can_fail(
     stream_id = math.floor(random() * (1 << 30))
 
     if env is not None:
-        env = os.environ.copy().update(env)
+        environ = os.environ.copy()
+        environ.update(env)
+        env = environ
 
     process = await asyncio.create_subprocess_exec(
         cmd_name, *args, env=env,