clore
/
hosting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enforce valid ipv4 configuration

This commit is contained in:
clore 2024-03-26 02:30:42 +00:00
parent ea6403258b
commit 884c9d8428
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/docker_deploy.py
View File

@ -3,6 +3,7 @@ from lib import logging as logging_lib
from lib import docker_interface from lib import docker_interface
from lib import get_specs from lib import get_specs
import docker import docker
from docker.types import EndpointConfig, NetworkingConfig
import os import os
client = docker_interface.client client = docker_interface.client
@ -76,11 +77,8 @@ def deploy(validated_containers):
if "network" in validated_container: if "network" in validated_container:
container_options["network_mode"]=validated_container["network"] container_options["network_mode"]=validated_container["network"]
if "ip" in validated_container: if "ip" in validated_container:
container_options["networking_config"]=client.api.create_networking_config({ del container_options["network_mode"]
'clore-br0': client.api.create_endpoint_config(
ipv4_address=validated_container["ip"]
)
})
if "gpus" in validated_container and type(validated_container["gpus"])==bool: if "gpus" in validated_container and type(validated_container["gpus"])==bool:
container_options["runtime"]="nvidia" container_options["runtime"]="nvidia"
container_options["device_requests"].append(docker.types.DeviceRequest(count=-1, capabilities=[['gpu']])) container_options["device_requests"].append(docker.types.DeviceRequest(count=-1, capabilities=[['gpu']]))
@ -121,6 +119,9 @@ def deploy(validated_containers):
if not validated_container["name"] in created_container_names and image_ready: if not validated_container["name"] in created_container_names and image_ready:
container = client.containers.create(**container_options) container = client.containers.create(**container_options)
if "ip" in validated_container:
client.networks.get(validated_container["network"] if "network" in validated_container else "clore-br0").connect(container, ipv4_address=validated_container["ip"])
client.networks.get("bridge").disconnect(container)
if not "paused" in validated_container: if not "paused" in validated_container:
container.start() container.start()
except Exception as e: except Exception as e:
@ -138,6 +139,11 @@ def deploy(validated_containers):
all_stopped_container_names.append(container.name) all_stopped_container_names.append(container.name)
if container.name in needed_running_names and container.status != 'running': if container.name in needed_running_names and container.status != 'running':
try: try:
attached_networks = container.attrs['NetworkSettings']['Networks']
if "bridge" in attached_networks.keys() or len(attached_networks.keys())==0: # Ip was not attached, remove container
container.stop()
container.remove()
else:
container.start() container.start()
except Exception as e: except Exception as e:
pass pass