particle-os/particle-os-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Pull extra akmods image too (#169)

Browse source 
Adds the new `-extra` image from akmods image
This commit is contained in:
Gerald Pinder 2024-04-27 15:01:06 -04:00 • committed by GitHub
parent 92150693d4
commit 3898202bc3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
recipe/src/module.rs
View file

@ -120,22 +120,34 @@ impl<'a> Module<'a> {
.images(match (base, nvidia) {
(Some(b), NvidiaAkmods::Nvidia(nv)) if !b.is_empty() && nv => (
format!("akmods:{b}-{os_version}"),
format!("akmods-extra:{b}-{os_version}"),
Some(format!("akmods-nvidia:{b}-{os_version}")),
),
(Some(b), NvidiaAkmods::Version(nv)) if !b.is_empty() && nv > 0 => (
format!("akmods:{b}-{os_version}"),
format!("akmods-extra:{b}-{os_version}"),
Some(format!("akmods-nvidia:{b}-{os_version}-{nv}")),
),
(Some(b), _) if !b.is_empty() => (format!("akmods:{b}-{os_version}"), None),
(Some(b), _) if !b.is_empty() => (
format!("akmods:{b}-{os_version}"),
format!("akmods-extra:{b}-{os_version}"),
None,
),
(_, NvidiaAkmods::Nvidia(nv)) if nv => (
format!("akmods:main-{os_version}"),
format!("akmods-extra:main-{os_version}"),
Some(format!("akmods-nvidia:main-{os_version}")),
),
(_, NvidiaAkmods::Version(nv)) if nv > 0 => (
format!("akmods:main-{os_version}"),
format!("akmods-extra:main-{os_version}"),
Some(format!("akmods-nvidia:main-{os_version}-{nv}")),
),
_ => (format!("akmods:main-{os_version}"), None),
_ => (
format!("akmods:main-{os_version}"),
format!("akmods-extra:main-{os_version}"),
None,
),
})
.stage_name(format!(
"{}{}",