ch-run: run oci bundles

README.rst

@@ -56,6 +56,7 @@ Contributors:
 
 * Richard Berger <[email protected]>
 * Lucas Caudill <[email protected]>
+* Krishna Chilleri <[email protected]>
 * Rusty Davis <[email protected]>
 * Hunter Easterday <[email protected]>
 * Oliver Freyermuth <[email protected]>

bin/ch-run.c

@@ -216,6 +216,12 @@ int main(int argc, char *argv[])
    case IMG_NONE:
       FATAL("unknown image type: %s", args.c.img_ref);
       break;
+   case OCI_BUNDLE:
+      if (args.c.newroot != NULL)  // --mount was set
+         WARNING("--mount invalid with directory image, ignoring");
+      args.c.newroot = realpath_(cat(args.c.img_ref, "/rootfs"), false);
+      img_directory_verify(args.c.newroot, &args);
+      break;
    }
 
    if (args.c.join) {

bin/ch_core.c

@@ -370,6 +370,8 @@ enum img_type image_type(const char *ref, const char *storage_dir)
    struct stat st;
    FILE *fp;
    char magic[4];  // four bytes, not a string
+   char *conff = cat(ref, "/config.json");
+   char *rootfs = cat(ref, "/rootfs");
 
    // If there’s a directory in storage where we would expect there to be if
    // ref were an image name, assume it really is an image name.
@@ -380,8 +382,15 @@ enum img_type image_type(const char *ref, const char *storage_dir)
    Zf (stat(ref, &st), "can't stat: %s", ref);
 
    // If ref is the path to a directory, then it’s a directory.
-   if (S_ISDIR(st.st_mode))
-      return IMG_DIRECTORY;
+   // If ref is the path to a directory that contains rootfs directory
+   // and config.json file, assume it is an oci bundle
+   if (S_ISDIR(st.st_mode)) {
+      if (path_exists(rootfs, NULL, true) && path_exists(conff, NULL, true)) {
+         return OCI_BUNDLE;
+      } else {
+         return IMG_DIRECTORY;
+      }
+   }
 
    // Now we know it’s file-like enough to read. See if it has the SquashFS
    // magic number.

bin/ch_core.h

@@ -25,6 +25,7 @@ enum img_type {
    IMG_SQUASH,     // SquashFS archive file (not yet mounted)
    IMG_NAME,       // name of image in storage
    IMG_NONE,       // image type is not set yet
+   OCI_BUNDLE,     // contains rootfs img_directory and config.json file
 };
 
 struct container {