Skip to content

Commit e8953d1

Browse files
yeetypeteJohan-Liebert1
authored andcommitted
fix(composefs): restore registry auth discovery on direct pull
This restores #2086, dropped by the PullOptions migration (86265b2). Signed-off-by: Peter Siegel <psiegel2000@icloud.com>
1 parent f9d5d2f commit e8953d1

1 file changed

Lines changed: 14 additions & 3 deletions

File tree

  • crates/lib/src/bootc_composefs

crates/lib/src/bootc_composefs/repo.rs

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,20 @@ async fn pull_composefs_direct(
190190
let imgref_str = imgref.to_string();
191191
tracing::info!("Direct pull: fetching {imgref_str} into composefs repository");
192192

193-
let pull_result = composefs_oci::pull(repo, &imgref_str, None, PullOptions::default())
194-
.await
195-
.context("Pulling image into composefs repository")?;
193+
let mut config = crate::deploy::new_proxy_config();
194+
ostree_ext::container::apply_container_proxy_opts_for_transport(&mut config, imgref.transport)?;
195+
196+
let pull_result = composefs_oci::pull(
197+
repo,
198+
&imgref_str,
199+
None,
200+
PullOptions {
201+
img_proxy_config: Some(config),
202+
..Default::default()
203+
},
204+
)
205+
.await
206+
.context("Pulling image into composefs repository")?;
196207

197208
Ok(pull_result)
198209
}

0 commit comments

Comments
 (0)