diff options
| author |  Siddhartha Bagaria <sbagaria@grailbio.com> | 2018-05-17 05:09:52 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-17 05:11:03 -0700 |
| commit | a61b53a8ef65881c6c4a69f16edc52ed7f1662a3 (patch) | |
| tree | 9e6178233c5441cc3d3159fba103f912b2470060 /src/main/java/com/google/devtools/build/lib/sandbox | |
| parent | e1ada6d351cb714c9e5694e1e58cd2b761c84784 (diff) | |
uid related fixes in docker sandbox
uid and gid of -1 (set when not linux) can not really be used anywhere.
Closes #5165.
PiperOrigin-RevId: 196974660
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/sandbox')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java index cfbfdc4859..67c495248a 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java @@ -292,6 +292,12 @@ final class DockerSandboxedSpawnRunner extends AbstractSandboxSpawnRunner { return baseImage; } + // We only need to create a customized image, if we're running on Linux, as Docker on macOS + // and Windows doesn't map users from the host into the container anyway. + if (OS.getCurrent() != OS.LINUX) { + return baseImage; + } + return imageMap.computeIfAbsent( baseImage, (image) -> { |