reivilibre/scone
1
0
Fork 0
Code Issues 21 Pull Requests Releases Wiki Activity

Antilint

Browse Source
This commit is contained in:
Olivier 'reivilibre' 2021-01-01 14:20:24 +00:00
parent 6ed8987bd4
commit a110731ce0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scone/default/recipes/docker.py
View File

@ -33,7 +33,9 @@ class DockerContainer(Recipe):
async def cook(self, kitchen: Kitchen) -> None: async def cook(self, kitchen: Kitchen) -> None:
kitchen.get_dependency_tracker() kitchen.get_dependency_tracker()
current_state = ContainerState(await kitchen.ut1(DockerContainerState(self.name))) current_state = ContainerState(
await kitchen.ut1(DockerContainerState(self.name))
)
if current_state == ContainerState.NOTFOUND: if current_state == ContainerState.NOTFOUND:
await kitchen.ut1areq( await kitchen.ut1areq(
@ -41,7 +43,7 @@ class DockerContainer(Recipe):
self.image, self.image,
self.command, self.command,
self.name, self.name,
{k: (v['host'], v['port']) for k, v in self.ports.items()}, {k: (v["host"], v["port"]) for k, v in self.ports.items()},
self.volumes, self.volumes,
{k: str(v) for k, v in self.environment.items()}, {k: str(v) for k, v in self.environment.items()},
self.restart_policy, self.restart_policy,

4
scone/default/utensils/docker_utensils.py
View File

@ -93,7 +93,7 @@ class DockerContainerRun(Utensil):
restart_policy = { restart_policy = {
"Name": self.restart_policy, "Name": self.restart_policy,
} }
if self.restart_policy == 'on-failure': if self.restart_policy == "on-failure":
restart_policy["MaximumRetryCount"] = 5 restart_policy["MaximumRetryCount"] = 5
container = _docker_client().containers.run( container = _docker_client().containers.run(
@ -104,7 +104,7 @@ class DockerContainerRun(Utensil):
ports=self.ports, ports=self.ports,
volumes=self.volumes, volumes=self.volumes,
environment=self.environment, environment=self.environment,
restart_policy=restart_policy restart_policy=restart_policy,
) )
await channel.send(DockerContainerRun.Result(name=container.name)) await channel.send(DockerContainerRun.Result(name=container.name))