Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pycomposefile/service/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def entrypoint_and_command(self):
def resolve_environment_hierarchy(self):
if self.env_file is not None:
env_file = self.env_file.readFile()
env_file.update(self.environment)
env_file.update(self.environment or [])
return env_file
else:
return self.environment