deploy: Change pull function to take sysroot

Prep for a podman backend, where we will write outside of the ostree repo. Signed-off-by: Colin Walters <[email protected]>
containers · Dec 3, 2023 · 6956054 · 6956054
1 parent f7036d5
commit 6956054
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/src/cli.rs b/lib/src/cli.rs
@@ -294,7 +294,7 @@ async fn upgrade(opts: UpgradeOpts) -> Result<()> {
             }
         }
     } else {
-        let fetched = crate::deploy::pull(&sysroot.repo(), imgref, opts.quiet).await?;
+        let fetched = crate::deploy::pull(&sysroot, imgref, opts.quiet).await?;
         let staged_digest = staged_image.as_ref().map(|s| s.image_digest.as_str());
         let fetched_digest = fetched.manifest_digest.as_str();
         tracing::debug!("staged: {staged_digest:?}");
@@ -371,7 +371,7 @@ async fn switch(opts: SwitchOpts) -> Result<()> {
     }
     let new_spec = RequiredHostSpec::from_spec(&new_spec)?;
 
-    let fetched = crate::deploy::pull(repo, &target, opts.quiet).await?;
+    let fetched = crate::deploy::pull(sysroot, &target, opts.quiet).await?;
 
     if !opts.retain {
         // By default, we prune the previous ostree ref so it will go away after later upgrades
@@ -395,7 +395,6 @@ async fn switch(opts: SwitchOpts) -> Result<()> {
 async fn edit(opts: EditOpts) -> Result<()> {
     prepare_for_write().await?;
     let sysroot = &get_locked_sysroot().await?;
-    let repo = &sysroot.repo();
     let (booted_deployment, _deployments, host) =
         crate::status::get_status_require_booted(sysroot)?;
     let new_host: Host = if let Some(filename) = opts.filename {
@@ -414,7 +413,7 @@ async fn edit(opts: EditOpts) -> Result<()> {
         return Ok(());
     }
     let new_spec = RequiredHostSpec::from_spec(&new_host.spec)?;
-    let fetched = crate::deploy::pull(repo, new_spec.image, opts.quiet).await?;
+    let fetched = crate::deploy::pull(sysroot, new_spec.image, opts.quiet).await?;
 
     // TODO gc old layers here
 

diff --git a/lib/src/deploy.rs b/lib/src/deploy.rs
@@ -54,10 +54,11 @@ pub(crate) async fn new_importer(
 /// Wrapper for pulling a container image, wiring up status output.
 #[context("Pulling")]
 pub(crate) async fn pull(
-    repo: &ostree::Repo,
+    sysroot: &SysrootLock,
     imgref: &ImageReference,
     quiet: bool,
 ) -> Result<Box<LayeredImageState>> {
+    let repo = &sysroot.repo();
     let imgref = &OstreeImageReference::from(imgref.clone());
     let mut imp = new_importer(repo, imgref).await?;
     let prep = match imp.prepare().await? {