From 13cbc2f403ed78d38655915f0b63ea685e08070e Mon Sep 17 00:00:00 2001 From: Enno Tensing Date: Tue, 22 Jul 2025 13:22:38 +0200 Subject: [PATCH] generate: container: Update methods to use {create,remove}_environment Update Container methods to use the new {create,remove}_environment methods. Signed-off-by: Enno Tensing --- generate/container.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/generate/container.py b/generate/container.py index 094a65a..44bb71d 100644 --- a/generate/container.py +++ b/generate/container.py @@ -476,8 +476,6 @@ class Container: def create_container(self) -> str: """Create podman container.""" cmd = "" - if self.env is not None: - cmd += self.env.create() cmd += self.create() return cmd @@ -505,11 +503,13 @@ class Container: """Generate podman container upgrade composite command.""" comment = f"# Upgrade container {self.name}\n" remove_container = self.remove_container() - remove_env_file = self.env.remove() + remove_env_file = self.remove_environment() create_container = self.create_container() + create_env_file = self.create_environment() start_container = self.start_container() remove = f"{remove_container}\n{remove_env_file}\n" - create_and_start = create_container + "\n" + start_container + create = f"{create_env_file}\n{create_container}\n" + create_and_start = create + "\n" + start_container return f"{comment}\n{remove}\n{create_and_start}" def purge_container(self) -> str: @@ -517,9 +517,7 @@ class Container: remove_container = self.remove_container() remove_volumes = self.remove_volumes() remove_secrets = self.remove_secrets() - remove_env_file = "" - if self.env is not None: - remove_env_file = self.env.remove() + remove_env_file = self.remove_environment() remove_data = f"{remove_volumes}\n{remove_secrets}\n{remove_env_file}" return f"{remove_container}\n{remove_data}"