Merge pull request #15 from slp/release-v0.1.6

Release v0.1.6

Author: slp

.github/workflows/code_quality.yml

@@ -23,6 +23,9 @@ jobs:
             override: true
             components: rustfmt, clippy
 
+      - name: Install asciidoctor
+        run: sudo apt-get install -y asciidoctor
+
       - name: Formatting (rustfmt)
         run: cargo fmt -- --check
 

Cargo.lock

@@ -1,7 +1,9 @@
 [package]
 name = "krunvm"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["Sergio Lopez <[email protected]>"]
+description = "Create microVMs from OCI images"
+repository = "https://github.com/containers/krunvm"
 license = "Apache-2.0"
 edition = "2018"
 build = "build.rs"

Cargo.toml

@@ -74,7 +74,7 @@ pub fn create(cfg: &mut KrunvmConfig, matches: &ArgMatches) {
         }
     }
 
-    let mut args = get_buildah_args(&cfg, BuildahCommand::From);
+    let mut args = get_buildah_args(cfg, BuildahCommand::From);
     args.push(image.to_string());
 
     let output = match Command::new("buildah")
@@ -87,7 +87,7 @@ pub fn create(cfg: &mut KrunvmConfig, matches: &ArgMatches) {
             if err.kind() == std::io::ErrorKind::NotFound {
                 println!("{} requires buildah to manage the OCI images, and it wasn't found on this system.", APP_NAME);
             } else {
-                println!("Error executing buildah: {}", err.to_string());
+                println!("Error executing buildah: {}", err);
             }
             std::process::exit(-1);
         }
@@ -119,9 +119,9 @@ pub fn create(cfg: &mut KrunvmConfig, matches: &ArgMatches) {
         mapped_ports,
     };
 
-    let rootfs = mount_container(&cfg, &vmcfg).unwrap();
-    fix_resolv_conf(&rootfs, &dns).unwrap();
-    umount_container(&cfg, &vmcfg).unwrap();
+    let rootfs = mount_container(cfg, &vmcfg).unwrap();
+    fix_resolv_conf(&rootfs, dns).unwrap();
+    umount_container(cfg, &vmcfg).unwrap();
 
     cfg.vmconfig_map.insert(name.clone(), vmcfg);
     confy::store(APP_NAME, cfg).unwrap();

src/create.rs

@@ -16,8 +16,8 @@ pub fn delete(cfg: &mut KrunvmConfig, matches: &ArgMatches) {
         Some(vmcfg) => vmcfg,
     };
 
-    umount_container(&cfg, &vmcfg).unwrap();
-    remove_container(&cfg, &vmcfg).unwrap();
+    umount_container(cfg, &vmcfg).unwrap();
+    remove_container(cfg, &vmcfg).unwrap();
 
     confy::store(APP_NAME, &cfg).unwrap();
 }

src/delete.rs

@@ -143,11 +143,7 @@ volume.
 #[cfg(target_os = "linux")]
 fn check_unshare() {
     let uid = unsafe { libc::getuid() };
-    if uid != 0
-        && std::env::vars()
-            .find(|(key, _)| key == "BUILDAH_ISOLATION")
-            .is_none()
-    {
+    if uid != 0 && !std::env::vars().any(|(key, _)| key == "BUILDAH_ISOLATION") {
         println!("Please re-run krunvm inside a \"buildah unshare\" session");
         std::process::exit(-1);
     }
@@ -356,17 +352,17 @@ fn main() {
     #[cfg(target_os = "linux")]
     check_unshare();
 
-    if let Some(ref matches) = matches.subcommand_matches("changevm") {
+    if let Some(matches) = matches.subcommand_matches("changevm") {
         changevm::changevm(&mut cfg, matches);
-    } else if let Some(ref matches) = matches.subcommand_matches("config") {
+    } else if let Some(matches) = matches.subcommand_matches("config") {
         config::config(&mut cfg, matches);
-    } else if let Some(ref matches) = matches.subcommand_matches("create") {
+    } else if let Some(matches) = matches.subcommand_matches("create") {
         create::create(&mut cfg, matches);
-    } else if let Some(ref matches) = matches.subcommand_matches("delete") {
+    } else if let Some(matches) = matches.subcommand_matches("delete") {
         delete::delete(&mut cfg, matches);
-    } else if let Some(ref matches) = matches.subcommand_matches("list") {
+    } else if let Some(matches) = matches.subcommand_matches("list") {
         list::list(&cfg, matches);
-    } else if let Some(ref matches) = matches.subcommand_matches("start") {
+    } else if let Some(matches) = matches.subcommand_matches("start") {
         start::start(&cfg, matches);
     } else {
         app.print_long_help().unwrap();

src/main.rs

@@ -84,7 +84,7 @@ unsafe fn exec_vm(vmcfg: &VmConfig, rootfs: &str, cmd: &str, args: Vec<CString>)
         std::process::exit(-1);
     }
 
-    map_volumes(ctx, &vmcfg, rootfs);
+    map_volumes(ctx, vmcfg, rootfs);
 
     let mut ports = Vec::new();
     for (host_port, guest_port) in vmcfg.mapped_ports.iter() {
@@ -187,8 +187,8 @@ pub fn start(cfg: &KrunvmConfig, matches: &ArgMatches) {
         Some(vmcfg) => vmcfg,
     };
 
-    umount_container(&cfg, vmcfg).expect("Error unmounting container");
-    let rootfs = mount_container(&cfg, vmcfg).expect("Error mounting container");
+    umount_container(cfg, vmcfg).expect("Error unmounting container");
+    let rootfs = mount_container(cfg, vmcfg).expect("Error mounting container");
 
     let args: Vec<CString> = match matches.values_of("ARGS") {
         Some(a) => a.map(|val| CString::new(val).unwrap()).collect(),
@@ -201,5 +201,5 @@ pub fn start(cfg: &KrunvmConfig, matches: &ArgMatches) {
 
     unsafe { exec_vm(vmcfg, &rootfs, cmd, args) };
 
-    umount_container(&cfg, vmcfg).expect("Error unmounting container");
+    umount_container(cfg, vmcfg).expect("Error unmounting container");
 }

src/start.rs

@@ -147,7 +147,7 @@ pub fn mount_container(cfg: &KrunvmConfig, vmcfg: &VmConfig) -> Result<String, s
             if err.kind() == std::io::ErrorKind::NotFound {
                 println!("{} requires buildah to manage the OCI images, and it wasn't found on this system.", APP_NAME);
             } else {
-                println!("Error executing buildah: {}", err.to_string());
+                println!("Error executing buildah: {}", err);
             }
             std::process::exit(-1);
         }
@@ -181,7 +181,7 @@ pub fn umount_container(cfg: &KrunvmConfig, vmcfg: &VmConfig) -> Result<(), std:
             if err.kind() == std::io::ErrorKind::NotFound {
                 println!("{} requires buildah to manage the OCI images, and it wasn't found on this system.", APP_NAME);
             } else {
-                println!("Error executing buildah: {}", err.to_string());
+                println!("Error executing buildah: {}", err);
             }
             std::process::exit(-1);
         }
@@ -214,7 +214,7 @@ pub fn remove_container(cfg: &KrunvmConfig, vmcfg: &VmConfig) -> Result<(), std:
             if err.kind() == std::io::ErrorKind::NotFound {
                 println!("{} requires buildah to manage the OCI images, and it wasn't found on this system.", APP_NAME);
             } else {
-                println!("Error executing buildah: {}", err.to_string());
+                println!("Error executing buildah: {}", err);
             }
             std::process::exit(-1);
         }