scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-10-09 03:20:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(types): finish image.ref → image.docker rename in env var substitution

Browse source 
Commit ec1b3f2 (#429) renamed `EnvironmentImageSettings::reference` to
`docker` but missed the variable-substitution call site in
`substitute_environment` and its companion test, breaking the workspace
build.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bryan Helmkamp 2026-05-27 12:15:14 -04:00
parent 03d2a9acdd
commit cf124be413
No known key found for this signature in database
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -2652,7 +2652,7 @@ dependencies = [
[[package]]
name = "fabro-variable"
version = "0.245.0-nightly.1"
version = "0.246.0-nightly.0"
dependencies = [
"chrono",
"fabro-types",

6
lib/crates/fabro-types/src/settings/run.rs
View file

@ -256,7 +256,7 @@ where
F: FnMut(&str) -> Option<String>,
{
substitute_string(&mut environment.id, lookup)?;
substitute_option_string(&mut environment.image.reference, lookup)?;
substitute_option_string(&mut environment.image.docker, lookup)?;
substitute_dockerfile_source(&mut environment.image.dockerfile, lookup)?;
substitute_string_vec(&mut environment.network.allow, lookup)?;
substitute_string_map(&mut environment.labels, lookup)?;
@ -418,7 +418,7 @@ mod run_namespace_variable_substitution_tests {
},
environment: RunEnvironmentSettings {
image: EnvironmentImageSettings {
reference: Some("registry.example/{{ vars.ENV }}:latest".to_string()),
docker: Some("registry.example/{{ vars.ENV }}:latest".to_string()),
dockerfile: Some(DockerfileSource::Inline(
"FROM registry.example/base:{{ vars.ENV }}".to_string(),
)),
@ -450,7 +450,7 @@ mod run_namespace_variable_substitution_tests {
assert_eq!(run.checkpoint.exclude_globs, vec!["tmp/prod/**"]);
assert_eq!(
run.environment.image.reference.as_deref(),
run.environment.image.docker.as_deref(),
Some("registry.example/prod:latest")
);
assert_eq!(