Merge master into staging-next

2021-03-26 12:06:41 +00:00
parent 26fdaef6b2 36f2c10ca5
commit eddd1a74ec
64 changed files with 806 additions and 387 deletions
@@ -202,7 +202,9 @@ def overlay_base_config(from_image, final_config):
    # Preserve environment from base image
    final_env = base_config.get("Env", []) + final_config.get("Env", [])
    if final_env:
-        final_config["Env"] = final_env
+        # Resolve duplicates (last one wins) and format back as list
+        resolved_env = {entry.split("=", 1)[0]: entry for entry in final_env}
+        final_config["Env"] = list(resolved_env.values())
    return final_config