Feat/docker cert path (#1165)

* fat: add a params to specify the docker cert path * docs: update the docs * fix: conflicts * fix: liner
railwayapp · Aug 27, 2024 · 8ec298e · 8ec298e
1 parent b7e32b9
commit 8ec298e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/docs/pages/docs/cli.md b/docs/pages/docs/cli.md
@@ -40,6 +40,7 @@ nixpacks build --help
 | `--no-cache`                | Disable caching for the build                                                                                                                           |
 | `--docker-host`             | Specify host for Docker client                                                                                                                          |
 | `--docker-tls-verify`       | Specify if Docker client should verify the TLS (Transport Layer Security) certificates of the Docker daemon when communicating over a secure connection |
+| `--docker-cert-path`        | Specify the path of your cert to docker if your connection is under TLS                                                                                 |
 | `--cache-from`              | Image to consider as cache sources                                                                                                                      |
 | `--inline-cache`            | Enable writing cache metadata into the output image                                                                                                     |
 | `--out <dir>`, `-o`         | Save output directory instead of building it with Docker                                                                                                |

diff --git a/src/main.rs b/src/main.rs
@@ -157,6 +157,9 @@ enum Commands {
         /// https://docs.docker.com/reference/cli/docker/buildx/build/#output
         #[arg(long)]
         docker_output: Option<String>,
+        /// Specify the path to the Docker client certificates
+        #[arg(long)]
+        docker_cert_path: Option<String>,
 
         /// Enable writing cache metadata into the output image
         #[arg(long)]
@@ -266,6 +269,7 @@ async fn main() -> Result<()> {
             docker_tls_verify,
             docker_output,
             add_host,
+            docker_cert_path,
             inline_cache,
             no_error_without_start,
             cpu_quota,
@@ -297,6 +301,7 @@ async fn main() -> Result<()> {
                 docker_host,
                 docker_tls_verify,
                 docker_output,
+                docker_cert_path,
                 no_error_without_start,
                 incremental_cache_image,
                 cpu_quota,

diff --git a/src/nixpacks/builder/docker/docker_image_builder.rs b/src/nixpacks/builder/docker/docker_image_builder.rs
@@ -191,8 +191,9 @@ impl DockerImageBuilder {
             }
         }
 
-        if let Some(value) = &self.options.docker_output {
-            docker_build_cmd.arg("--output").arg(value);
+        match &self.options.docker_cert_path {
+            Some(value) => env::set_var("DOCKER_CERT_PATH", value),
+            None => env::remove_var("DOCKER_CERT_PATH"),
         }
 
         if self.options.inline_cache {

diff --git a/src/nixpacks/builder/docker/mod.rs b/src/nixpacks/builder/docker/mod.rs
@@ -25,6 +25,7 @@ pub struct DockerBuilderOptions {
     pub docker_tls_verify: Option<String>,
     pub docker_output: Option<String>,
     pub add_host: Vec<String>,
+    pub docker_cert_path: Option<String>,
 }
 
 mod cache;