From c22856904739fbdc2ae781dbe2e343e5e1bc9b7c Mon Sep 17 00:00:00 2001
From: Jake Runzer <jakerunzer@gmail.com>
Date: Thu, 26 May 2022 11:42:30 -0400
Subject: [PATCH 1/2] flag to add additional labels to resulting image

---
 src/lib.rs          |  3 +++
 src/main.rs         | 23 ++++++++++++++++++-----
 src/nixpacks/mod.rs |  9 ++++++++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index da921adc2..aae143e38 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -49,6 +49,7 @@ pub fn gen_plan(
         out_dir: None,
         plan_path: None,
         tags: Vec::new(),
+        labels: Vec::new(),
         quiet: false,
     };
 
@@ -72,6 +73,7 @@ pub fn build(
     plan_path: Option<String>,
     out_dir: Option<String>,
     tags: Vec<&str>,
+    labels: Vec<&str>,
     quiet: bool,
 ) -> Result<()> {
     let logger = Logger::new();
@@ -85,6 +87,7 @@ pub fn build(
         out_dir,
         plan_path,
         tags: tags.iter().map(|s| s.to_string()).collect(),
+        labels: labels.iter().map(|s| s.to_string()).collect(),
         quiet,
     };
 
diff --git a/src/main.rs b/src/main.rs
index bc06c1fdc..9b9f7c507 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -45,6 +45,14 @@ fn main() -> Result<()> {
                         .help("Additional tags to add to the output image")
                         .takes_value(true)
                         .multiple_values(true),
+                )
+                .arg(
+                    Arg::new("label")
+                        .long("label")
+                        .short('l')
+                        .help("Additional labels to add to the output image")
+                        .takes_value(true)
+                        .multiple_values(true),
                 ),
         )
         .arg(
@@ -116,14 +124,19 @@ fn main() -> Result<()> {
             let plan_path = matches.value_of("plan").map(|n| n.to_string());
             let output_dir = matches.value_of("out").map(|n| n.to_string());
 
-            let tags: Vec<_> = match matches.values_of("tag") {
-                Some(values) => values.collect(),
-                None => Vec::new(),
-            };
+            let tags = matches
+                .values_of("tag")
+                .map(|values| values.collect())
+                .unwrap_or_default();
+
+            let labels = matches
+                .values_of("label")
+                .map(|values| values.collect())
+                .unwrap_or_default();
 
             build(
                 path, name, pkgs, build_cmd, start_cmd, pin_pkgs, envs, plan_path, output_dir,
-                tags, false,
+                tags, labels, false,
             )?;
         }
         _ => eprintln!("Invalid command"),
diff --git a/src/nixpacks/mod.rs b/src/nixpacks/mod.rs
index c3956543f..3f8fa6621 100644
--- a/src/nixpacks/mod.rs
+++ b/src/nixpacks/mod.rs
@@ -42,6 +42,7 @@ pub struct AppBuilderOptions {
     pub out_dir: Option<String>,
     pub plan_path: Option<String>,
     pub tags: Vec<String>,
+    pub labels: Vec<String>,
     pub quiet: bool,
 }
 
@@ -55,6 +56,7 @@ impl AppBuilderOptions {
             out_dir: None,
             plan_path: None,
             tags: Vec::new(),
+            labels: Vec::new(),
             quiet: false,
         }
     }
@@ -173,10 +175,15 @@ impl<'a> AppBuilder<'a> {
                     .arg(format!("{}={}", name, value));
             }
 
-            // Add user defined tags to the image
+            // Add user defined tags and labels to the image
             for t in self.options.tags.clone() {
                 docker_build_cmd.arg("-t").arg(t);
             }
+            for l in self.options.labels.clone() {
+                docker_build_cmd.arg("--label").arg(l);
+            }
+
+            println!("{:?}", docker_build_cmd);
 
             let build_result = docker_build_cmd.spawn()?.wait().context("Building image")?;
 

From 25c5193a3df90de9ea65fd6deeea161b8336b452 Mon Sep 17 00:00:00 2001
From: Jake Runzer <jakerunzer@gmail.com>
Date: Thu, 26 May 2022 11:46:23 -0400
Subject: [PATCH 2/2] add missing param to test

---
 tests/docker_run_tests.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/docker_run_tests.rs b/tests/docker_run_tests.rs
index deaf94801..7103f4086 100644
--- a/tests/docker_run_tests.rs
+++ b/tests/docker_run_tests.rs
@@ -100,6 +100,7 @@ fn simple_build(path: &str) -> String {
         None,
         None,
         Vec::new(),
+        Vec::new(),
         true,
     )
     .unwrap();
@@ -190,6 +191,7 @@ fn test_rust_custom_version() {
         None,
         None,
         Vec::new(),
+        Vec::new(),
         true,
     )
     .unwrap();
@@ -233,6 +235,7 @@ fn test_cowsay() {
         None,
         None,
         Vec::new(),
+        Vec::new(),
         true,
     )
     .unwrap();