|
|
@@ -6,7 +6,6 @@ import tarfile
|
|
|
import tempfile
|
|
|
import time
|
|
|
import uuid
|
|
|
-from collections import namedtuple
|
|
|
from glob import glob
|
|
|
|
|
|
import docker
|
|
|
@@ -23,6 +22,7 @@ from opendevin.runtime.plugins import AgentSkillsRequirement, JupyterRequirement
|
|
|
from opendevin.runtime.sandbox import Sandbox
|
|
|
from opendevin.runtime.utils import find_available_tcp_port
|
|
|
|
|
|
+
|
|
|
class SSHExecCancellableStream(CancellableStream):
|
|
|
def __init__(self, ssh, cmd, timeout):
|
|
|
super().__init__(self.read_output())
|
|
|
@@ -690,13 +690,13 @@ class DockerSSHBox(Sandbox):
|
|
|
if self.use_host_network:
|
|
|
network_kwargs['network_mode'] = 'host'
|
|
|
else:
|
|
|
- # FIXME: This is a temporary workaround for Mac OS
|
|
|
+ # FIXME: This is a temporary workaround for Windows where host network mode has bugs.
|
|
|
+ # FIXME: Docker Desktop for Mac OS has experimental support for host network mode
|
|
|
network_kwargs['ports'] = {f'{self._ssh_port}/tcp': self._ssh_port}
|
|
|
logger.warning(
|
|
|
(
|
|
|
- 'Using port forwarding for Mac OS. '
|
|
|
- 'Server started by OpenDevin will not be accessible from the host machine at the moment. '
|
|
|
- 'See https://github.com/OpenDevin/OpenDevin/issues/897 for more information.'
|
|
|
+ 'Using port forwarding till the enable host network mode of Docker is out of experimental mode.'
|
|
|
+ 'Check the 897th issue on https://github.com/OpenDevin/OpenDevin/issues/ for more information.'
|
|
|
)
|
|
|
)
|
|
|
|