From 73f219d4ca3ec4db21ec0064a2465b85040c21e3 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Tue, 14 May 2024 13:50:33 -0400
Subject: [PATCH] fix: Don't create builder if DOCKER_HOST is set

---
 src/drivers/docker_driver.rs | 18 ++++++++++++++----
 utils/src/constants.rs       |  3 +++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/drivers/docker_driver.rs b/src/drivers/docker_driver.rs
index 395f343..f56cebf 100644
--- a/src/drivers/docker_driver.rs
+++ b/src/drivers/docker_driver.rs
@@ -5,7 +5,9 @@ use std::{
 };
 
 use anyhow::{anyhow, bail, Result};
-use blue_build_utils::constants::{BB_BUILDKIT_CACHE_GHA, CONTAINER_FILE, SKOPEO_IMAGE};
+use blue_build_utils::constants::{
+    BB_BUILDKIT_CACHE_GHA, CONTAINER_FILE, DOCKER_HOST, SKOPEO_IMAGE,
+};
 use log::{info, trace, warn};
 use once_cell::sync::Lazy;
 use semver::Version;
@@ -196,13 +198,21 @@ impl BuildDriver for DockerDriver {
             warn!("Squash is deprecated for docker so this build will not squash");
         }
 
+        trace!("docker buildx");
         let mut command = Command::new("docker");
+        command.arg("buildx");
 
-        trace!("docker buildx build -f {CONTAINER_FILE}");
+        if !env::var(DOCKER_HOST).is_ok_and(|dh| !dh.is_empty()) {
+            Self::setup()?;
+
+            trace!("--builder=bluebuild");
+            command.arg("--builder=bluebuild");
+        }
+
+        trace!("build --progress=plain --pull -f {CONTAINER_FILE}",);
         command
-            .arg("buildx")
-            .arg("--builder=bluebuild")
             .arg("build")
+            .arg("--progress=plain")
             .arg("--pull")
             .arg("-f")
             .arg(CONTAINER_FILE);
diff --git a/utils/src/constants.rs b/utils/src/constants.rs
index 4112c5c..745df12 100644
--- a/utils/src/constants.rs
+++ b/utils/src/constants.rs
@@ -18,6 +18,9 @@ pub const IMAGE_VERSION_LABEL: &str = "org.opencontainers.image.version";
 // BlueBuild vars
 pub const BB_BUILDKIT_CACHE_GHA: &str = "BB_BUILDKIT_CACHE_GHA";
 
+// Docker vars
+pub const DOCKER_HOST: &str = "DOCKER_HOST";
+
 // Cosign vars
 pub const COSIGN_PRIVATE_KEY: &str = "COSIGN_PRIVATE_KEY";
 pub const GITHUB_TOKEN_ISSUER_URL: &str = "https://token.actions.githubusercontent.com";