docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mac updates (#5762) 

* Mac: fix name of the vm directory

Actually the directory name changed from vm to vms/0 (there has been
no release with vm, we may remove references to it).  This is for the
forthcoming 18.01 Edge release, but since it's already published we
should probably update now.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>

* Toolbox: formatting changes

No user visible changes here, just making future diffs easier to read.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>

* Toolbox: do not invite to remove ~/.docker

Docker for Mac uses that directory too.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
This commit is contained in:
Akim Demaille 2018-01-18 18:37:00 +01:00 committed by Misty Stanley-Jones
parent b9164e98aa
commit 218e1cbb23
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker-for-mac/faqs.md
View File

@ -239,8 +239,8 @@ recommend the use of [Docker Toolbox](/toolbox/overview.md).
The containers and images are stored in a _disk image_ named
`Docker.raw` or `Docker.qcow2` depending on your settings (see below).
By default, the disk image is stored in
`~/Library/Containers/com.docker.docker/Data`, in the `vm`
subdirectory starting with Docker for Mac 17.12, and
`~/Library/Containers/com.docker.docker/Data`, in the `vms/0`
subdirectory starting with Docker for Mac 18.01, and
`com.docker.driver.amd64-linux` before.
### Qcow2 or Raw?
@ -260,7 +260,7 @@ see the logical size in human readable form, add `-lh`:
```bash
$ cd ~/Library/Containers/com.docker.docker/Data
$ cd vm # or com.docker.driver.amd64-linux
$ cd vms/0 # or com.docker.driver.amd64-linux
$ ls -klsh Docker.raw
2333548 -rw-r--r--@ 1 akim staff 64G Dec 13 17:42 Docker.raw
```

4
engine/admin/index.md
View File

@ -167,8 +167,8 @@ subsystem used:
| Debian | `/var/log/daemon.log` |
| Ubuntu 16.04+, CentOS | Use the command `journalctl -u docker.service` |
| Ubuntu 14.10- | `/var/log/upstart/docker.log` |
| macOS (Docker 17.12+) | `~/Library/Containers/com.docker.docker/Data/vm/console-ring` |
| macOS (Docker <17.12) | `~/Library/Containers/com.docker.docker/Data/com.docker.driver.amd64-linux/console-ring` |
| macOS (Docker 18.01+) | `~/Library/Containers/com.docker.docker/Data/vms/0/console-ring` |
| macOS (Docker <18.01) | `~/Library/Containers/com.docker.docker/Data/com.docker.driver.amd64-linux/console-ring` |
| Windows | `AppData\Local` |

39
toolbox/toolbox_install_mac.md
View File

@ -90,7 +90,8 @@ and choosing "Open" from the pop-up menu.
4. Provide your password to continue with the installation.
When it completes, the installer provides you with some shortcuts. You can ignore this for now and click **Continue**.
When it completes, the installer provides you with some
shortcuts. You can ignore this for now and click **Continue**.
![Quickstart](images/mac-page-quickstart.png)
@ -239,9 +240,15 @@ owned by UID 1000 and GID 50.
Removing Toolbox involves removing all the Docker components it includes.
A full uninstall also includes removing the local and remote machines you created with Docker Machine. In some cases, you might want to keep machines created with Docker Machine.
A full uninstall also includes removing the local and remote machines
you created with Docker Machine. In some cases, you might want to keep
machines created with Docker Machine.
For example, if you plan to re-install Docker Machine as a part of Docker for Mac you can continue to manage those machines through Docker. Or, if you have remote machines on a cloud provider and you plan to manage them using the provider, you wouldn't want to remove them. So the step to remove machines is described here as optional.
For example, if you plan to re-install Docker Machine as a part of
Docker for Mac you can continue to manage those machines through
Docker. Or, if you have remote machines on a cloud provider and you
plan to manage them using the provider, you wouldn't want to remove
them. So the step to remove machines is described here as optional.
To uninstall Toolbox on a Mac, do the following:
@ -267,15 +274,20 @@ To uninstall Toolbox on a Mac, do the following:
of [Docker for Mac](/docker-for-mac/index.md), you can import and
continue to manage those machines through Docker.
3. Remove the Docker Quickstart Terminal and Kitematic from your "Applications" folder.
3. In your "Applications" folder, remove the "Docker" directory,
which contains "Docker Quickstart Terminal" and "Kitematic".
4. Run the following in a command shell to fully remove Kitematic:
```
rm -fr ~/Library/Application\ Support/Kitematic
$ rm -fr ~/Library/Application\ Support/Kitematic
```
5. Remove the `docker`, `docker-compose`, and `docker-machine` commands from the `/usr/local/bin` folder.
5. Remove the `docker`, `docker-compose`, and `docker-machine`
commands from the `/usr/local/bin` folder. Note that Docker for
Mac and Brew are also likely to have installed them: in case of
doubt leave them, or reinstall them via Brew, or rerun Docker for
Mac (no need to reinstall it).
```
$ rm /usr/local/bin/docker
@ -283,19 +295,14 @@ To uninstall Toolbox on a Mac, do the following:
$ rm /usr/local/bin/docker-machine
```
6. Optionally, remove the `~/.docker` directory.
6. Optionally, remove the `~/.docker/machine` directory.
If you want to remove Docker entirely, you
can remove the `~/.docker` directory
recursively. This directory stores some
Docker program configuration and/or state
(e.g., information about created machines such
as certificates). Removing this directory
is typically not necessary.
This directory stores some configuration and/or state (e.g.,
information about created machines such as certificates).
7. Uninstall Oracle VirtualBox, which is
installed as a part of the Toolbox install.
7. Uninstall Oracle VirtualBox, which is installed as a part of the
Toolbox install.
## Next steps