Benjamin Schubert pushed to branch bschubert/docker-sandbox at BuildStream / buildstream
Commits:
-
be6fc831
by Benjamin Schubert at 2018-12-13T10:12:12Z
2 changed files:
Changes:
| ... | ... | @@ -67,10 +67,10 @@ class Linux(Platform): |
| 67 | 67 |
# the normal setup process
|
| 68 | 68 |
from ..sandbox._sandboxdocker import SandboxDocker
|
| 69 | 69 |
return SandboxDocker(*args, **kwargs)
|
| 70 |
- if not self._local_sandbox_available:
|
|
| 71 |
- return self._create_dummy_sandbox(*args, **kwargs)
|
|
| 72 |
- else:
|
|
| 73 |
- return self._create_bwrap_sandbox(*args, **kwargs)
|
|
| 70 |
+ # if not self._local_sandbox_available:
|
|
| 71 |
+ # return self._create_dummy_sandbox(*args, **kwargs)
|
|
| 72 |
+ # else:
|
|
| 73 |
+ # return self._create_bwrap_sandbox(*args, **kwargs)
|
|
| 74 | 74 |
|
| 75 | 75 |
def check_sandbox_config(self, config):
|
| 76 | 76 |
if not self._local_sandbox_available:
|
| 1 | 1 |
import os
|
| 2 |
-import sys
|
|
| 3 |
-import stat
|
|
| 4 |
-import signal
|
|
| 5 |
-import subprocess
|
|
| 6 |
-from contextlib import contextmanager, ExitStack
|
|
| 7 |
-import psutil
|
|
| 8 |
-import tempfile
|
|
| 9 | 2 |
|
| 10 | 3 |
import docker
|
| 11 | 4 |
|
| 12 | 5 |
from .._exceptions import SandboxError
|
| 13 |
-from .. import utils
|
|
| 14 |
-from .. import _signals
|
|
| 15 |
-from ._mounter import Mounter
|
|
| 16 | 6 |
from ._mount import MountMap
|
| 17 | 7 |
from . import Sandbox, SandboxFlags
|
| 18 | 8 |
|
| ... | ... | @@ -28,7 +18,6 @@ class SandboxDocker(Sandbox): |
| 28 | 18 |
|
| 29 | 19 |
def run(self, command, flags, *, cwd=None, env=None):
|
| 30 | 20 |
client = docker.from_env()
|
| 31 |
- stdout, stderr = self._get_output()
|
|
| 32 | 21 |
|
| 33 | 22 |
# Fallback to the sandbox default settings for
|
| 34 | 23 |
# the cwd and env.
|
| ... | ... | @@ -60,7 +49,7 @@ class SandboxDocker(Sandbox): |
| 60 | 49 |
mount_source_overrides = self._get_mount_sources()
|
| 61 | 50 |
for mark in self._get_marked_directories():
|
| 62 | 51 |
mount_point = mark["directory"]
|
| 63 |
- if mount_point in mount_source_overrides:
|
|
| 52 |
+ if mount_point in mount_source_overrides: # pylint: disable=consider-using-get
|
|
| 64 | 53 |
mount_source = mount_source_overrides[mount_point]
|
| 65 | 54 |
else:
|
| 66 | 55 |
mount_source = mount_map.get_mount_source(mount_point)
|