osbase/oci: implement support for OCI index
Previously, only OCI images were supported, now we can also handle
indexes. The new Ref type is either an Image or Index.
Change-Id: I1b282ed6078d53e9a69e7613f601fdbbe64e192b
Reviewed-on: https://review.monogon.dev/c/monogon/+/4475
Tested-by: Jenkins CI
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
diff --git a/metropolis/cli/metroctl/cmd_install_usb.go b/metropolis/cli/metroctl/cmd_install_usb.go
index 4453ed7..5af158a 100644
--- a/metropolis/cli/metroctl/cmd_install_usb.go
+++ b/metropolis/cli/metroctl/cmd_install_usb.go
@@ -38,7 +38,7 @@
if err != nil {
return err
}
- image, err := oci.ReadLayout(imagePathResolved)
+ image, err := oci.AsImage(oci.ReadLayout(imagePathResolved))
if err != nil {
return fmt.Errorf("failed to read OS image: %w", err)
}
diff --git a/metropolis/cli/takeover/install.go b/metropolis/cli/takeover/install.go
index 97e8565..9755c55 100644
--- a/metropolis/cli/takeover/install.go
+++ b/metropolis/cli/takeover/install.go
@@ -37,7 +37,7 @@
return err
}
- image, err := oci.ReadLayout("/osimage")
+ image, err := oci.AsImage(oci.ReadLayout("/osimage"))
if err != nil {
return fmt.Errorf("failed to read OS image: %w", err)
}
diff --git a/metropolis/cli/takeover/takeover.go b/metropolis/cli/takeover/takeover.go
index 805a06d..5ff26bd 100644
--- a/metropolis/cli/takeover/takeover.go
+++ b/metropolis/cli/takeover/takeover.go
@@ -94,7 +94,7 @@
return nil, err
}
- image, err := oci.ReadLayout(filepath.Join(filepath.Dir(currPath), "osimage"))
+ image, err := oci.AsImage(oci.ReadLayout(filepath.Join(filepath.Dir(currPath), "osimage")))
if err != nil {
return nil, fmt.Errorf("failed to read OS image: %w", err)
}