From 6ac8623216e4dfea3f9ec64d819b065271dfd91b Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon.neon@gmail.com>
Date: Wed, 30 Dec 2020 15:05:56 -0800
Subject: [PATCH] Fix $PATH explicitly in Docker shims

---
 bin/docker | 2 ++
 bin/skopeo | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/bin/docker b/bin/docker
index 79eba1b..d1e1ebb 100755
--- a/bin/docker
+++ b/bin/docker
@@ -2,6 +2,8 @@
 
 set -euo pipefail
 
+export PATH="$(sed -E 's/:bin:/:/; s/(^|:)bin(:|$)//' <<< "${PATH}")"
+
 if [[ "${OSTYPE:-}" != darwin* ]] && [[ "${EUID}" != 0 ]]; then
     exec sudo -E docker "$@"
 else
diff --git a/bin/skopeo b/bin/skopeo
index 602dbba..c9a585c 100755
--- a/bin/skopeo
+++ b/bin/skopeo
@@ -2,6 +2,8 @@
 
 set -euo pipefail
 
+export PATH="$(sed -E 's/:bin:/:/; s/(^|:)bin(:|$)//' <<< "${PATH}")"
+
 if [[ "${OSTYPE:-}" != darwin* ]] && [[ "${EUID}" != 0 ]]; then
     exec sudo -E skopeo "$@"
 else