tenno/containerctl
1
0
Fork 0
Code Releases 1 Activity

generate: container: Update Network.from_json and Environment.command

Browse source 
Signed-off-by: Enno Tensing <tenno@suij.in>
This commit is contained in:
Enno Tensing 2025-08-07 21:03:33 +02:00
parent ec61600b87
commit 2476d72192
Signed by: tenno
GPG key ID: 95265603BD36E66C
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
generate/container.py
View file

@ -382,7 +382,7 @@ class Environment:
"""Option for podman container create.""" """Option for podman container create."""
if len(self.variables) == 0: if len(self.variables) == 0:
return "" return ""
return f"--env-file={self.file}" return f"\t--env-file={self.file} \\\n"
def create(self) -> str: def create(self) -> str:
"""Create env file.""" """Create env file."""
@ -480,10 +480,12 @@ class Network:
return cls("", []) return cls("", [])
mode = maybe(val, "mode") mode = maybe(val, "mode")
options = maybe(val, "options") options = maybe(val, "options")
if mode is None or options is None or not isinstance(options, list): if mode is None:
err = "Network configuration is missing or has malformed elements!" err = "Network configuration is missing or has malformed elements!"
logger.log_error(err) logger.log_error(err)
return cls("", []) return cls("", [])
if options is None or not isinstance(options, list):
return cls(str(mode), [])
return cls(str(mode), options) return cls(str(mode), options)
def command(self) -> str: def command(self) -> str:
@ -689,8 +691,7 @@ class Container:
cmd += f"{self.network.command()}" cmd += f"{self.network.command()}"
cmd += f"{self.dns.command()}" cmd += f"{self.dns.command()}"
cmd += f"{self.ports.command()}" cmd += f"{self.ports.command()}"
if self.env is not None: cmd += f"{self.env.command()}"
cmd += f"\t{self.env.command()} \\\n"
for secret in self.secrets: for secret in self.secrets:
cmd += f"\t{secret.command()} \\\n" cmd += f"\t{secret.command()} \\\n"
for volume in self.volumes: for volume in self.volumes: