Skip to content

Commit 6bd0369

Browse files
committed
Added self-guard for lima cmds.
To prevent infinite looping, we need to self-guard lima cmds, when .lima suffixes were removed or symlinked without it (e.g. `ln -s docker.lima docker`) Signed-off-by: Andrei Gaivoronskii <[email protected]>
1 parent 38b8280 commit 6bd0369

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

cmd/docker.lima

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ elif [ "$(limactl ls -f '{{ .Status }}' "$LIMA_INSTANCE" 2>/dev/null)" != "Runni
1515
exit 1
1616
fi
1717
DOCKER=$(command -v "$DOCKER" || true)
18+
if [ -n "$DOCKER" ]; then
19+
[ "$(readlink -f -- "$DOCKER")" = "$(readlink -f -- "$0")" ] && DOCKER=""
20+
fi
1821
if [ -n "$DOCKER" ]; then
1922
DOCKER_HOST=$(limactl list "$LIMA_INSTANCE" --format 'unix://{{.Dir}}/sock/docker.sock')
2023
export DOCKER_HOST

cmd/kubectl.lima

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ elif [ "$(limactl ls -f '{{ .Status }}' "$LIMA_INSTANCE" 2>/dev/null)" != "Runni
3131
exit 1
3232
fi
3333
KUBECTL=$(command -v "$KUBECTL" || true)
34+
if [ -n "$KUBECTL" ]; then
35+
[ "$(readlink -f -- "$KUBECTL")" = "$(readlink -f -- "$0")" ] && KUBECTL=""
36+
fi
3437
if [ -n "$KUBECTL" ]; then
3538
KUBECONFIG=$(limactl list "$LIMA_INSTANCE" --format '{{.Dir}}/copied-from-guest/kubeconfig.yaml')
3639
export KUBECONFIG

cmd/podman.lima

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ elif [ "$(limactl ls -f '{{ .Status }}' "$LIMA_INSTANCE" 2>/dev/null)" != "Runni
1111
exit 1
1212
fi
1313
PODMAN=$(command -v "$PODMAN" || true)
14+
if [ -n "$PODMAN" ]; then
15+
[ "$(readlink -f -- "$PODMAN")" = "$(readlink -f -- "$0")" ] && PODMAN=""
16+
fi
1417
if [ -n "$PODMAN" ]; then
1518
CONTAINER_HOST=$(limactl list "$LIMA_INSTANCE" --format 'unix://{{.Dir}}/sock/podman.sock')
1619
export CONTAINER_HOST

0 commit comments

Comments
 (0)