[autoscaler/docker] Relax missing docker section (#9105)

This commit is contained in:
Ian Rodney
2020-06-24 12:35:42 -07:00
committed by GitHub
parent 0487c250e8
commit 67e049bc7b
3 changed files with 7 additions and 7 deletions
+2 -2
View File
@@ -322,7 +322,7 @@ class StandardAutoscaler:
runtime_hash=self.runtime_hash,
process_runner=self.process_runner,
use_internal_ip=True,
docker_config=self.config["docker"])
docker_config=self.config.get("docker"))
updater.start()
self.updaters[node_id] = updater
@@ -362,7 +362,7 @@ class StandardAutoscaler:
runtime_hash=self.runtime_hash,
process_runner=self.process_runner,
use_internal_ip=True,
docker_config=self.config["docker"])
docker_config=self.config.get("docker"))
updater.start()
self.updaters[node_id] = updater
+4 -4
View File
@@ -152,7 +152,7 @@ def kill_node(config_file, yes, hard, override_cluster_name):
setup_commands=[],
ray_start_commands=[],
runtime_hash="",
docker_config=config["docker"])
docker_config=config.get("docker"))
_exec(updater, "ray stop", False, False)
@@ -291,7 +291,7 @@ def get_or_create_head_node(config, config_file, no_restart, restart_only, yes,
setup_commands=init_commands,
ray_start_commands=ray_start_commands,
runtime_hash=runtime_hash,
docker_config=config["docker"])
docker_config=config.get("docker"))
updater.start()
updater.join()
@@ -412,7 +412,7 @@ def exec_cluster(config_file,
setup_commands=[],
ray_start_commands=[],
runtime_hash="",
docker_config=config["docker"])
docker_config=config.get("docker"))
def wrap_docker(command):
container_name = config["docker"]["container_name"]
@@ -534,7 +534,7 @@ def rsync(config_file,
setup_commands=[],
ray_start_commands=[],
runtime_hash="",
docker_config=config["docker"])
docker_config=config.get("docker"))
if down:
rsync = updater.rsync_down
else:
+1 -1
View File
@@ -23,7 +23,6 @@ def dockerize_if_needed(config):
worker_docker_image = config["docker"].get("worker_image", docker_image)
worker_run_options = config["docker"].get("worker_run_options", [])
ssh_user = config["auth"]["ssh_user"]
if not docker_image and not (head_docker_image and worker_docker_image):
if cname:
logger.warning(
@@ -32,6 +31,7 @@ def dockerize_if_needed(config):
return config
else:
assert cname, "Must provide container name!"
ssh_user = config["auth"]["ssh_user"]
docker_mounts = {dst: dst for dst in config["file_mounts"]}
if docker_pull: