From cf124be413046bc08c4ca9126c2f317700b4d88a Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Wed, 27 May 2026 12:15:14 -0400 Subject: [PATCH] =?UTF-8?q?fix(types):=20finish=20image.ref=20=E2=86=92=20?= =?UTF-8?q?image.docker=20rename=20in=20env=20var=20substitution?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- Cargo.lock | 2 +- lib/crates/fabro-types/src/settings/run.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fe93492ce..ebd8e2593 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", diff --git a/lib/crates/fabro-types/src/settings/run.rs b/lib/crates/fabro-types/src/settings/run.rs index 992d684e9..f138157a0 100644 --- a/lib/crates/fabro-types/src/settings/run.rs +++ b/lib/crates/fabro-types/src/settings/run.rs @@ -256,7 +256,7 @@ where F: FnMut(&str) -> Option, { 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!(