diff --git a/xmanager/docker/docker_adapter.py b/xmanager/docker/docker_adapter.py index 077141b..719df1d 100644 --- a/xmanager/docker/docker_adapter.py +++ b/xmanager/docker/docker_adapter.py @@ -17,19 +17,13 @@ import subprocess from typing import Dict, List, Mapping, Optional, Sequence, Tuple, Union -from absl import flags from absl import logging import docker from docker import errors from docker import types from docker.models import containers from docker.utils import utils - -_USE_SUBPROCESS = flags.DEFINE_bool( - 'xm_subprocess_docker_impl', - False, - 'Launch docker using `subprocess` command.', -) +from xmanager import xm_flags Ports = Dict[Union[int, str], Union[None, int, Tuple[str, int], List[int]]] @@ -96,7 +90,7 @@ def run_container( interactive: bool = False, ) -> Optional[containers.Container]: """Runs a given container image.""" - if _USE_SUBPROCESS.value or interactive: + if xm_flags.SUBPROCESS_DOCKER.value or interactive: return self.run_container_subprocess( image_id, args, diff --git a/xmanager/xm_flags.py b/xmanager/xm_flags.py index 5a18417..27ed4f2 100644 --- a/xmanager/xm_flags.py +++ b/xmanager/xm_flags.py @@ -57,6 +57,14 @@ 'xm_bazel_command', 'bazel', 'A command that runs Bazel.', ) +# -------------------- docker --------------------- + +SUBPROCESS_DOCKER = flags.DEFINE_bool( + 'xm_subprocess_docker_impl', + False, + 'Launch docker using `subprocess` command.', +) + # -------------------- contrib -------------------- GCS_PATH = flags.DEFINE_string(