Switch build to only require the dockerfile directory (#32)

capeprivacy · Oct 28, 2022 · 8819541 · 8819541
1 parent 7c6b6bd
commit 8819541
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/src/bin/nitrogen.rs b/src/bin/nitrogen.rs
@@ -50,10 +50,8 @@ enum Commands {
 
     /// Build a Nitro EIF from a given Dockerfile
     Build {
-        /// Docker context directory
-        context: String,
-        /// Dockerfile location
-        dockerfile: String,
+        /// Dockerfile directory
+        dockerfile_dir: String,
         /// Output EIF location
         #[arg(short, long, default_value_t = String::from("./nitrogen.eif"))]
         eif: String,
@@ -153,12 +151,11 @@ async fn main() -> Result<(), Error> {
             Ok(())
         }
         Commands::Build {
-            dockerfile,
-            context,
+            dockerfile_dir,
             eif,
         } => {
-            info!(context, dockerfile, "Building EIF from dockerfile.");
-            let out = build(&dockerfile, &context, &eif).await?;
+            info!(dockerfile_dir, "Building EIF from dockerfile.");
+            let out = build(&dockerfile_dir, &eif).await?;
             debug!(docker_output=?out, "Docker output:");
             Ok(())
         }
@@ -237,7 +234,6 @@ async fn main() -> Result<(), Error> {
             let eif_path = &format!("{}.eif", name);
 
             build(
-                &dockerfile_path.to_str().unwrap().to_string(),
                 &proj_dir.to_str().unwrap().to_string(),
                 eif_path,
             )

diff --git a/src/commands/build.rs b/src/commands/build.rs
@@ -7,12 +7,11 @@ use tracing::instrument;
 
 #[instrument(level = "debug")]
 pub async fn build(
-    dockerfile: &String,
-    context: &String,
+    dockerfile_dir: &String,
     eif_name: &String,
 ) -> Result<Output, Error> {
     let out = Command::new("docker")
-        .args(["build", "-t", "nitrogen-build", context, "-f", dockerfile])
+        .args(["build", "-t", "nitrogen-build", dockerfile_dir, "-f", &format!("{}/.", dockerfile_dir)])
         .output()
         .await?;
     if !out.status.success() {