summaryrefslogtreecommitdiffstats
path: root/crates/runner
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2024-04-12 19:34:13 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2024-04-13 20:07:55 +0200
commit6f11f3f247d8949401cd0afb676198b439053740 (patch)
treef3d244a97885e22f5a678f937ad44789aa5fb0d5 /crates/runner
parent35e0cd907a89b751637f71ce910950a8a8865fe0 (diff)
downloadrebel-6f11f3f247d8949401cd0afb676198b439053740.tar
rebel-6f11f3f247d8949401cd0afb676198b439053740.zip
Replace 'inherit' recipe field with 'parent'
All occurrences of 'inherit' in the code are replaced with 'parent' or 'ancestors'.
Diffstat (limited to 'crates/runner')
-rw-r--r--crates/runner/src/task.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/runner/src/task.rs b/crates/runner/src/task.rs
index 5c27e78..19b74f4 100644
--- a/crates/runner/src/task.rs
+++ b/crates/runner/src/task.rs
@@ -52,7 +52,7 @@ fn input_hash(task: &Task) -> InputHash {
pub command: &'a str,
pub workdir: &'a str,
pub rootfs: &'a ArchiveHash,
- pub inherit: &'a [LayerHash],
+ pub ancestors: &'a [LayerHash],
pub depends: HashMap<DependencyHash, &'a Dependency>,
pub outputs: &'a HashMap<String, String>,
}
@@ -60,7 +60,7 @@ fn input_hash(task: &Task) -> InputHash {
command: &task.command,
workdir: &task.workdir,
rootfs: &task.rootfs,
- inherit: &task.inherit,
+ ancestors: &task.ancestors,
depends: task
.depends
.iter()
@@ -94,7 +94,7 @@ fn init_task(input_hash: &InputHash, task: &Task) -> Result<fs::Mount> {
.with_context(|| format!("Failed to write {}", runfile))?;
let mount_target = paths::join(&[&task_tmp_dir, &task.workdir]);
- let mount = if task.inherit.is_empty() {
+ let mount = if task.ancestors.is_empty() {
fs::mount(task_layer_dir, &mount_target, None, MsFlags::MS_BIND, None)
.with_context(|| format!("Failed to bind mount to {:?}", mount_target))?
} else {
@@ -104,7 +104,7 @@ fn init_task(input_hash: &InputHash, task: &Task) -> Result<fs::Mount> {
fs::fixup_permissions(&task_work_dir)?;
let lower = task
- .inherit
+ .ancestors
.iter()
.rev()
.map(paths::layer_dir)