From bf331d53fe4b673c3b6a1060998dd5be371ad8eb Mon Sep 17 00:00:00 2001 From: Carlos Santana Date: Wed, 23 Feb 2022 16:31:56 -0500 Subject: [PATCH 1/3] add check for colima docker socket as fall back Signed-off-by: Carlos Santana --- build/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common.sh b/build/common.sh index 5ef3ed6607e..4d5cc27f5b6 100755 --- a/build/common.sh +++ b/build/common.sh @@ -189,7 +189,7 @@ function kube::build::verify_prereqs() { function kube::build::docker_available_on_osx() { if [[ -z "${DOCKER_HOST}" ]]; then - if [[ -S "/var/run/docker.sock" ]]; then + if [[ -S "/var/run/docker.sock" ]] || [[ -S "${HOME}/.colima/docker.sock" ]]; then kube::log::status "Using Docker for MacOS" return 0 fi From b8bd6f190b1375e144aee0e485d16dd98ef2767b Mon Sep 17 00:00:00 2001 From: Carlos Santana Date: Thu, 24 Feb 2022 22:04:39 -0500 Subject: [PATCH 2/3] make docker socket more generic than colima Signed-off-by: Carlos Santana --- build/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/common.sh b/build/common.sh index 4d5cc27f5b6..20bcee7b29d 100755 --- a/build/common.sh +++ b/build/common.sh @@ -189,8 +189,8 @@ function kube::build::verify_prereqs() { function kube::build::docker_available_on_osx() { if [[ -z "${DOCKER_HOST}" ]]; then - if [[ -S "/var/run/docker.sock" ]] || [[ -S "${HOME}/.colima/docker.sock" ]]; then - kube::log::status "Using Docker for MacOS" + if [[ -S "/var/run/docker.sock" ]] || [[ -S "$(docker context inspect | jq -r '.[0].Endpoints.docker.Host' | awk -F 'unix://' '{print $2}')" ]]; then + kube::log::status "Using docker on macOS" return 0 fi From e914f6bf20d194dd9ff5b3298a2fe64a82a653b8 Mon Sep 17 00:00:00 2001 From: Carlos Santana Date: Fri, 4 Mar 2022 07:11:37 -0500 Subject: [PATCH 3/3] remove jq usage Signed-off-by: Carlos Santana --- build/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common.sh b/build/common.sh index 20bcee7b29d..fd8b057ea53 100755 --- a/build/common.sh +++ b/build/common.sh @@ -189,7 +189,7 @@ function kube::build::verify_prereqs() { function kube::build::docker_available_on_osx() { if [[ -z "${DOCKER_HOST}" ]]; then - if [[ -S "/var/run/docker.sock" ]] || [[ -S "$(docker context inspect | jq -r '.[0].Endpoints.docker.Host' | awk -F 'unix://' '{print $2}')" ]]; then + if [[ -S "/var/run/docker.sock" ]] || [[ -S "$(docker context inspect --format '{{.Endpoints.docker.Host}}' | awk -F 'unix://' '{print $2}')" ]]; then kube::log::status "Using docker on macOS" return 0 fi