Commit 5fe219e
committed
fix bind-mount failure on macOS Docker Desktop
Docker Desktop on macOS only shares specific directories with its Linux VM
via VirtioFS ($HOME, /private, /Volumes, /tmp). Scripts installed to
/usr/local/bin (e.g. via Homebrew) are not accessible, so Docker creates
an empty directory placeholder in the VM. This makes /usr/bin/entrypoint
a directory in the container, causing runc to fail with "is a directory".
distrobox-create: on Darwin, copy distrobox-init, distrobox-export, and
distrobox-host-exec to ~/.local/share/distrobox/ (always under $HOME,
always VirtioFS-shared) before using them as bind-mount sources.
distrobox-enter: the self-healing detection code reads .HostConfig.Binds,
which Docker Desktop returns with a /host_mnt prefix (the VM's view of the
VirtioFS mount). Strip this prefix on Darwin before checking file existence,
preventing a spurious "mkdir: /host_mnt: Read-only file system" crash even
for correctly-created containers.
Signed-off-by: Eric Curtin <eric.curtin@docker.com>1 parent c6cc6a3 commit 5fe219e
3 files changed
Lines changed: 83 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
65 | 90 | | |
66 | 91 | | |
67 | 92 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
105 | 124 | | |
106 | 125 | | |
107 | 126 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
689 | 689 | | |
690 | 690 | | |
691 | 691 | | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
| 721 | + | |
| 722 | + | |
| 723 | + | |
| 724 | + | |
| 725 | + | |
| 726 | + | |
| 727 | + | |
| 728 | + | |
| 729 | + | |
| 730 | + | |
692 | 731 | | |
693 | 732 | | |
694 | 733 | | |
| |||
0 commit comments