The disk space usage of Docker on Mac has been difficult to manage
and has confused lots of people, see
https://github.com/docker/for-mac/issues/371
This patch adds a top-level section to the Docker for Mac docs
alongside networking which explains
- where the space has gone
- how to reclaim some of it
In future I'd like to add more about why some systems use `Docker.raw`
and some `Docker.qcow2` but we're in a transitional state at the moment.
It'll be simpler to explain after the next stable version has been
released.
Signed-off-by: David Scott <dave.scott@docker.com>
This will soon be obsoleted by com.docker.diagnose, but meanwhile it
is still important information.
Signed-off-by: Akim Demaille <akim.demaille@docker.com>
There's no need to document this in both Troubleshoot and FAQ. Keep
it in the FAQ. We don't need to reinstall Docker for Mac, and it's
possible to save all the data.
Signed-off-by: Akim Demaille <akim.demaille@docker.com>
consolidating some useful information. The following lines have to be added to the ~/.bash_profile for it to work. I pulled this information from https://docs.docker.com/compose/completion/.
I thought it would be useful to add it here so that all this info could be in one place.
if [ -f $(brew --prefix)/etc/bash_completion ]; then
. $(brew --prefix)/etc/bash_completion
fi
* Mac: teach how to migrate from toolbox by hand
We have removed the Toolbox migration tools from Docker for Mac (and
soon for Windows too) because they add a lot of pressure on the code
for a feature which is almost never used today by our users.
Signed-off-by: Akim Demaille <akim.demaille@docker.com>
* Reword lots of instances of 'will'
* Reword lots of instances of won't
* Reword lots of instances of we'll
* Eradicate you'll
* Eradicate 'be able to' type of phrases
* Eradicate 'unable to' type of phrases
* Eradicate 'has / have to' type of phrases
* Eradicate 'note that' type of phrases
* Eradicate 'in order to' type of phrases
* Redirect to official Chef and Puppet docs
* Eradicate gratuitous 'please'
* Reduce use of e.g.
* Reduce use of i.e.
* Reduce use of N.B.
* Get rid of 'sexagesimal' and correct some errors
* 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>
* Mac: the disk image has moved
In the forthcoming release of Docker for Mac, the disk image is in
another directory (was needed for future changes).
Signed-off-by: Akim Demaille <akim.demaille@docker.com>
* Mac: FAQ: Promote "Disk Usage" questions
One level upper.
Signed-off-by: Akim Demaille <akim.demaille@docker.com>
This commit reorders this
### Stable and Edge channels
### What is Docker.app?
### What kind of feedback are we looking for?
### What if I have problems or questions?
### How can I opt out of sending my usage data?
### Can I use Docker for Mac with new swarm mode?
### How do I connect to the remote Docker Engine API?
### How do I connect from a container to a service on the host?
### How do I connect to a container from the Mac?
### How do I add custom CA certificates?
### How do I add client certificates?
### How do I reduce the size of Docker.qcow2?
### What are system requirements for Docker for Mac?
### Do I need to reinstall Docker for Mac if I change the name of my macOS account?
### Do I need to uninstall Docker Toolbox to use Docker for Mac?
### How do I uninstall Docker Toolbox?
### What is HyperKit?
### What is the benefit of HyperKit?
### Why is com.docker.vmnetd running after I quit the app?
### Can I pass through a USB device to a container?
into this
## Questions about Docker.app
### Stable and Edge channels
### What is Docker.app?
### What are system requirements for Docker for Mac?
### Do I need to reinstall Docker for Mac if I change the name of my macOS account?
### Do I need to uninstall Docker Toolbox to use Docker for Mac?
### How do I uninstall Docker Toolbox?
## Questions about feedback and help
### What kind of feedback are we looking for?
### What if I have problems or questions?
### How can I opt out of sending my usage data?
## How can I...?
### Can I use Docker for Mac with swarm mode?
### How do I connect to the remote Docker Engine API?
### How do I connect from a container to a service on the host?
### How do I connect to a container from the Mac?
### How do I add custom CA certificates?
### How do I add client certificates?
### How do I reduce the size of Docker.qcow2?
### Can I pass through a USB device to a container?
## Components of Docker for Mac
### What is HyperKit?
### What is the benefit of HyperKit?
### Why is com.docker.vmnetd running after I quit the app?
Also, change "new swarm mode" into "swarm mode".
Signed-off-by: Akim Demaille <akim.demaille@gmail.com>
* Mac: FAQ: Disk usage in raw format
This is a new feature of Docker for Mac. Questions and PRs have
already been made about this, and we expect more of them.
Signed-off-by: Akim Demaille <akim.demaille@gmail.com>
* for all links to , changed to full path
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed link in Swarm Tutorial per review comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added Compose topics on caching options for performance
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* updated title for Compose topic
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* line wrap per review
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* add CSS tests for Josh
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* new class inline for images, updated docs to call class
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* removing last test paragraph
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Docker for Mac, Windows 17.06 stable, edge
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* incorporated review comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* changed Docker Cloud site links to open in new window
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Rather than manually creating a custom IP alas on the host, a container
can connect to the host by resolving the DNS name `docker.for.mac.localhost`.
Signed-off-by: David Scott <dave.scott@docker.com>
* add d4mac client side FAQ
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added link to FAQs from Getting Started
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added FAQs re: installing client certificates
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added more detail on client and server side certs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed Mac and Windows specific topics
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed formatting so that content renders properly
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* incorporated review comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* updated Windows FAQ to clarify directories copy, remove refs to db
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* change ref from Mac to Windows on Win side
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added certificate topic to Win getting started
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* review comments, remove 'entities' clarify meaning
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* d4mac,win 17.06 edge release notes, docs updates
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added description of new feature shared drives on demand for Windows Edge
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added missing stable release notes for mac and win
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* copyedit, kick build
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Update the osxfs documentation with recent details about caching.
Signed-off-by: Jeremy Yallop <yallop@docker.com>
* Add a note about 'cached' to the volumes tutorial.
Signed-off-by: Jeremy Yallop <yallop@docker.com>
* Add a document giving a detailed specification of osxfs caching.
Signed-off-by: Jeremy Yallop <yallop@docker.com>
* Americanize spelling in the osxfs-caching document.
Signed-off-by: Jeremy Yallop <yallop@docker.com>
* More osxfs benchmark details for 'go list'.
Signed-off-by: Jeremy Yallop <yallop@docker.com>
* Remove mentions of the blog post.
Signed-off-by: Jeremy Yallop <yallop@docker.com>
* editorial, topic structure changes, x-refs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* linked to new topic also where bind mounts are discussed in Namespaces
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* added more tags
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Decapitalize descriptions
Signed-off-by: Jeremy Yallop <yallop@docker.com>
* "releease" ~> "release"
Signed-off-by: Jeremy Yallop <yallop@docker.com>
* Use @avsm's suggested rewording for the osxfs-caching introduction.
Signed-off-by: Jeremy Yallop <yallop@docker.com>
* Add an example showing how to use `cached`, `consistent`, etc.
Signed-off-by: Jeremy Yallop <yallop@docker.com>
* Add a link to the user-guided caching blog post.
Signed-off-by: Jeremy Yallop <yallop@docker.com>
* added examples heading, more x-refs to blog post, docker run
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* escaped second dash in --volume long version of command
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed double dashes on volume option to render properly
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* fixed notes on d4mac, d4win per new format
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* streamlined d4win pre-install notes, surfaced toolbox option
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Update fedora.md
add warning class to blogquote
* Update linux-postinstall.md
add warning class to blogquote
* Update ubuntu.md
add warning class to blogquote
* Update https.md
add warning class to blogquote
* Update swarm_manager_locking.md
add warning class to blogquote
* Update dockerlinks.md
add warning class to blogquote
* Update deploying.md
add warning class to blogquote
* Update deploying.md
add warning class to blogquote
* Update insecure.md
add warning class to blogquote
* Update discovery.md
add warning class to blogquote
* Update dockerd.yaml
add warning class to blogquote
* Update docker_secret_rm.yaml
add warning class to blogquote
* Update docker_service_rm.yaml
add warning class to blogquote
* Update docker_secret_rm.yaml
add warning class to blogquote
* Update scale-your-cluster.md
add warning class to blogquote
* Update resource_constraints.md
add warning class to blogquote
* Update binaries.md
add warning class to blogquote
* Update content_trust.md
add warning class to blogquote
* Update secrets.md
add warning class to blogquote
* Update index.md
add warning class to blogquote
* Update install-sandbox-2.md
add warning class to blogquote
* Update docker-toolbox.md
add warning class to blogquote
* Update index.md
add warning class to blogquote
* Update centos.md
add warning class to blogquote
* Update debian.md
add warning class to blogquote
* Update faqs.md
add linebreak after Looking for popular FAQs on Docker for Windows?
* Update install.md
add linebreake after **Already have Docker for Windows?**
* Revert "Update dockerd.yaml"
This reverts commit 3a98eb86f700ade8941483546c33f69a9dab8ac3.
* Revert "Update docker_secret_rm.yaml"
This reverts commit 5dc1e75f37033932486c11287052b7d64bf83e55.
* Revert "Update docker_service_rm.yaml"
This reverts commit a983380a5625b471f1a03f8ed2301ead72f98f1b.
* Revert "Update docker_secret_rm.yaml"
This reverts commit 4c454b883c300e26fbb056b954bb49ec2933b172.
* Fix manager and worker join tokens. Issue #2088.
Fix screenshots per issue #2126
Move vote images to correct dir
Fix rendering issue with inline code snippet #1990
Fix for stack yaml reference (#1476)
Fix image link
Add shutdown procedures for #1017
* Make the fix asked in the PR
Little fix
* Create index.md
* Create part2.md
* Create part3.md
* Create part4.md
* Create part5.md
* Rewrite step 2
* Update part2.md
* Update part2.md
* Update part2.md
* Update part2.md
* Update part2.md
* Update part2.md
* Update index.md
* Rewrite of part 3
* Tabs-based swarm instructions, pass 1
* Rewrite of parts 3 and 4, tabs implementation
* Navigation, rewrites, part 4 completion
* Part 5 w/Redis
* Part 5, compelte Redis, rename part 6
* TOC/redirect implementation
* Update part6.md
* Changing links to point to new tutorial
* Rewrites and asciinemas
* Fix overview
* Label diagrams
* Fix button
* Fix link to where Stacks are covered
* Fix typo
* s/file/directory
* Reformat paragraph
* Shorten tabs
* Typos
* Release DTR 2.2.4, 2.1.6
* Go back to small /edge (#2736)
* Go back to small /edge
* Update site front page
Add info about Editions
Reorganize components
Update headings
* Move logic of fetching content to a script
* Add v1.28 API
* Add info about versioned API
* Fix a few 404s (#2785)
* Fix typo
* Propose use of another word (#2791)
I think that interested is better than invested, in this case.
* Update secrets.md (#2780)
remove correct secret
* Change mount syntax on windows from //c/ to c:\ (#2761)
LGTM
* Update hackathon.md (#2773)
* nodes.md grammar correction (#2802)
* Grammar and formatting check (#2797)
* Wrong article
If the first word starts with a vowel sound you use an. If the first word has a consonant sound use a.
* Making the text bold
Removing backticks because probably the text needs to be bold and not marked as code.
* Update overview.md (#2805)
It should say 'predecessors', not 'successors'. Otherwise the sentence and the subsequent example don't make sense.
* shrink some big images (#2798)
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
* #2627 (#2804)
- Fix right sidebar overflow on rescale
* Update hackathon.md
* change pre-build to pre_build to remove confusion (#2813)
* change pre-build to pre_build to remove confusion
* clarify that pre_build hook refers to a file
* Update TOC to sentence case (#2790)
* add more info about DTR on the overview page (#2794)
fix#1904
* Update glossary.yaml (#2807)
Fix#2575.
* fix imports since docker api pkg migration, fix example repository name to be canonical (#2806)
* tweak: code format for filename (#2829)
* tweak: code format for filename
slight reword, so as to avoid confusion w/filename
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* small changes just to kick build again
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Update hackathon.md
* fix broken links (#2808)
* fix broken link (#2809)
* [CONTRIBUTING] update broken link (#2826)
* [Debian] add gnupg2 requirement for stretch (#2823)
* TOC/redirect implementation
* Changing links to point to new tutorial
* Rewrites and asciinemas
* Fix bad merge
* Metadata, formatting
* Front page formatting, link instrumentation
* changed dates for release notes
relnotes dates, installer checksums, stable/beta updates
added an extra note re: VirtualBox
updated image for d4mac preference menu
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* image update per on file sharing
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
added heading and description of Swarm mode below table, tweaked headings
added Swarms screen snap
added a standard mode indicator to infrastructure overview title
re-organized order of topics in table and below
re-wording to swarm topic, added x-refs from d4mac, d4win to cloud topics
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* First pass of tabs-based organization
* Improvements
* Second pass at tabs org
* Move tab highlighting to Liquid instead of JS
* Adding forwarding links for in-product TOCs
* Move to pre-rendered left-navs instead of post-load JS for TOC sync
* Optimizations and nosync-ing the Reference section
* Optimizations, fix Cloud YAML
* Make a "Sample applications" node
* Update index.md
* Tabs CSS fixes and 12-factor reposition
* Theme Start (#1709)
* Hooking up nav to real TOC data, formatting fixes
* Fixing JS error
* Layout updates, dark themes, tons o stuff (#1971)
* Add cookie saving for day/night mode
* Newsite tabs (#2004)
* Layout updates, dark themes, tons o stuff
* Update themes
Theme updates + scaffolding
* Update style.css
* Update style-alt.css
* Missing font fixes
* Import Open Sans from Google
* Font fix, archive removal in TOC, favicon, Feedback img fix
* Oops, returning -webkit-font-smoothing: antialiased;
* Add old favicon.ico
* Make archives a non-tiered link
* Reorder docs archive to newest-first, add local instructions
* Commenting out day/night switch for now
* Fix 'rate this page'
* Rate this page fixes
* Autocomplete and Docker Cloud fixes
* Open tree to current page
* Adding indentation for nav collapse in
* Ensure left nav visibly displays the current topic
* Update flex layout
- adjust rescale
- code block styles
* add focus to search
- force code block color (for now)
- increase section max-width
* increase content padding
- add padding to toc for wrapping long strings.
* grid adjustment
- grid
- content and wrapper adjustments for mobile
* left/right sidebar adjustments
- refine position on scroll for toc on landing
- add default height to compensate for upcoming position absolute
onScroll
* side bar overflow
- hidden on X-scroll
* fix version button
- override bstrap defaults
* tabs + buttons
* update landing svgs
* fix sidebar height
set to 100% on landing pre-affix
* Update blurb about engine/editions on front page
* add side menu to mobile collapse menu
* update classnames
* overall mobile tweaks
* Right-nav highlighting and auto-scroll
* Slightly slower right-nav highlighting, correct version
* add toggle menus for small devices
* Fixing JS error/Docker 1.13>17.03
* header updates
* re-add fan to header
* update transition time
* Add first 20 words to Twitter card
* fixed width of components
- lockdown elements on rescale (wil need more TLC)
* set max-width of content
* Left and right nav resizing w/footer scroll and window resize
* update links on landing page
* Fix for overzealous resizing, JS redundancies
* Fix for JS error on homepage
* JS error fixes
* toggle adjustments
- wrap toggle button
* add tab width
* version button type
* version button both headers
* tabs - fix typo
* landing page grid
* components
* Share images, JS fixes, Marketo removal
* Anchor links fix
* Fix for black space on mobile
* Restore hamburger (partial)
* Update run.md
Minor grammar cleanup.
* Update apparmor.md
I'm a little confused about which one is better to be used here, a period (.) or a colon (:), as a command is given below. Or both are OK, and we only have to keep consistency in a single page.
* Update apparmor.md
Fixed the indentation for the codeblock (indented by 4 spaces). Thank you for your careful review.
* Replacing service with secret
* Update networking.md
fix typo with triple "m" for command word
* Update run.md
Address PR feedback.
* Update install instructions to latest version
* Added "related topics" section
* Add documentation for mem_swappiness
* Update to new Docker version scheme (#1926)
* mem_swappiness for current version and v1
* merge other changes, fix typo
* There is no OpenSuSE and there never was
though we had SuSE and S.u.S.E.
* Add release notes for 1.12.6-cs9 (#2028)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* need sudo to access key cache (#1931)
* need sudo to access key cache
* List other keyservers to try for cs-engine install (#2033)
* List other keyservers to try for cs-engine install
Sometimes ha.pool.sks-keyservers.net goes down, so let's provide some
other keyservers to try in such cases.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* Update work_issue.md (#2030)
Change "re-start" to "restart". Though not included in "Prefered usages" in the documentation guide, but I think "restart" is better and used more frequently. Besides, some other docs here, such as "Keep containers alive during daemon downtime" of "Admin Guide", also use "restart".
* Update create_pr.md (#2015)
* Update work_issue.md (#2013)
Change "id" to "ID" except for those in code.
* Update set_up_dev.md (#2011)
Add periods (.) in some steps.
* Update set_up_dev.md (#2010)
Apply Oxford Comma as described in the documentation guide.
* Update create_pr.md (#2014)
Delete an extra space.
* Update trust_key_mng.md (#1883)
* Update trust_key_mng.md
* Update trust_key_mng.md
I don‘t know how the whitespace appears, and it seems that it appears because something happened related to its original format (right-aligned pipe characters) and my change. Still unknown.
Now I've deleted some redundant whitespace.
* Update
I don‘t know how the whitespace appears, and it seems that it appears because something happened related to its original format (right-aligned pipe characters) and my change. Still unknown.
Now I've deleted some redundant whitespace.
* Update content_trust.md (#1912)
* Update content_trust.md
* update deprecation policy
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
* Update info about how to check whether Docker is running
* Updated docs to reflect edge channel
Signed-off-by: French Ben <frenchben@docker.com>
* Updated wording for SP creation
Signed-off-by: French Ben <frenchben@docker.com>
* beta to edge, cloud features first draft
added cloud images
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Distinguish between cloud stack file and stack file
* Added EE links
Signed-off-by: French Ben <frenchben@docker.com>
* Use variables
Signed-off-by: French Ben <frenchben@docker.com>
* Replace deprecated MAINTAINER with LABEL (#1445)
Replace MAINTAINER instruction with LABEL as MAINTAINER was deprecated in https://github.com/docker/docker/pull/25466
* Updates for Docker CE and Docker EE
* Updated DDC launch button
Signed-off-by: French Ben <frenchben@docker.com>
* added Docker Cloud topics for Mac and Windows
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* d4mac, d4win stable and beta release notes for 17.03.0
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* First pass of tabs-based organization
* Improvements
* Second pass at tabs org
* Move tab highlighting to Liquid instead of JS
* Adding forwarding links for in-product TOCs
* Move to pre-rendered left-navs instead of post-load JS for TOC sync
* Optimizations and nosync-ing the Reference section
* Optimizations, fix Cloud YAML
* Make a "Sample applications" node
* Tabs CSS fixes and 12-factor reposition
* Fix auto-complete left-padding
* Fix auto-complete right-padding (for symmetry)
* Fix for no left-nav on Compose file
* Fix weird wrapping on smaller screens for tabs
* reorganized d4mac, d4win per tabs structure, split out install guides
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Update reference urls to latest DDC version
* Reintroduces changes ebe778b..9abc9e to TOC
* Update allpagelinks.md
* hid the on-page TOC's for d4mac d4win topics as needed
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Add a Hopscotch tour of the new navigation
updated stable, beta download, and experimental mode descriptions with more detail
copyedits
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
updates for new advanced settings UI w/disk image labels d4mac
reformatted what the install includes lists in intros
copyedits
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Guillaume Tardif
David Scott
Justin
Akim Demaille
Gwendolynne Barr
gtardif
Akim Demaille
Alan Buxey
Joao Fernandes
Jingwen Peng
Joao Fernandes
Jose E
Jim Galasyn
James Sharpe
Alec Clews
Sasha Gerrand
Misty Stanley-Jones
Ingve Vormestrand
Takuto Kanzaki
Sebastiaan van Stijn
Ameya Shenoy
Alejandro Avilés
Victoria Bialas
pinata-mac
Jonathan Sokolowski
Wang Jie
nmur
Steven Bedrick
Hawley Waldman
skymon
Joseph Rex
Dave Scott
Nathan Handler
Joe
yallop
Lenny Linux
Julien Maitrehenry
Steven Hanna
Bill
John Mulhausen
unclejack
Henri-Lo
Victoria Bialas
Misty Stanley-Jones
Olexandr Shalakhin
Nate Angell
Steve Mao
Ben Firshman
Adrien Duermael