Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.0.0] Do not do magic to achieve a hermetic /tmp when the sandbox is hermetic #20145

Merged
merged 3 commits into from
Nov 10, 2023
Merged

[7.0.0] Do not do magic to achieve a hermetic /tmp when the sandbox is hermetic #20145

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db18f6b
Do not do magic to achieve a hermetic `/tmp` when the sandbox is herm…
lberki Nov 6, 2023
3868d17
Merge branch 'release-7.0.0' into cp_ondemand_20144-7.0.0
keertk Nov 10, 2023
aed2d4f
Merge branch 'release-7.0.0' into cp_ondemand_20144-7.0.0
keertk Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ private boolean useHermeticTmp() {
return false;
}

if (getSandboxOptions().useHermetic) {
// The hermetic sandbox is, well, already hermetic. Also, it creates an empty /tmp by default
// so nothing needs to be done to achieve a /tmp that is also hermetic.
return false;
}

boolean tmpExplicitlyBindMounted =
getSandboxOptions().sandboxAdditionalMounts.stream()
.anyMatch(e -> e.getKey().equals("/tmp"));
Expand Down