diff --git a/docker-for-mac/images/settings-uninstall.png b/docker-for-mac/images/settings-uninstall.png index 33d23cff53..2ddd6dd731 100644 Binary files a/docker-for-mac/images/settings-uninstall.png and b/docker-for-mac/images/settings-uninstall.png differ diff --git a/docker-for-mac/images/settings.png b/docker-for-mac/images/settings.png index ab46df761e..f981a1d0cf 100644 Binary files a/docker-for-mac/images/settings.png and b/docker-for-mac/images/settings.png differ diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md index 63fab44550..5349f50b24 100644 --- a/docker-for-mac/index.md +++ b/docker-for-mac/index.md @@ -107,7 +107,9 @@ the menu bar. You can set the following runtime options. ->**Note:** The above example shows a user signed in for integrated Docker Cloud access. This is currently available only on the [Edge channel](install.md#download-docker-for-mac). To learn more about the feature, see [Docker Cloud (Edge feature)](#docker-cloud-edge-feature). +>**Note:** The above example shows a user signed in for integrated +Docker Cloud access. To learn more about the feature, +see [Docker Cloud](#docker-cloud). ### General @@ -125,8 +127,11 @@ You can set the following runtime options. disable the check for updates, you can still find out about updates manually by choosing ![whale-x](/docker-for-mac/images/whale-x.png) -> **Check for Updates** -* Check **Exclude VM from Time Machine backups** to prevent Time Machine - from backing up the Docker for Mac virtual machine. +* Check **Include VM in Time Machine backups** to back up the Docker for Mac virtual machine. (By default, this is unchecked.) + +* You have the option to **Securely store Docker logins in MacOS keychain**, + enabled by default. To "opt out" of storing your Docker login credentials, + uncheck this option. * **Send usage statistics** — You can set Docker for Mac to auto-send diagnostics, crash reports, and usage data. This information can help Docker @@ -134,16 +139,6 @@ You can set the following runtime options. Uncheck this to opt out and prevent auto-send of data. Docker may prompt for more information in some cases, even with auto-send enabled. -#### Choose whether to store Docker credentials on Mac keychain (Edge feature) - -In current Edge releases, you have an additonal option to **Securely store -Docker logins in MacOS keychain**. This is enabled by default, and on Stable -releases you have no option to disable it. So the effect of this is that on Edge -releases, you can "opt out" of storing your Docker login credentials by -disabling this. - -![Opt in or out of storing credentials in keychain](images/settings-edge.png) - ### File sharing You can decide which directories on your Mac to share with containers. @@ -304,13 +299,19 @@ the menu bar, then click **Uninstall / Reset** on the Preferences dialog. ![Uninstall or reset Docker](images/settings-uninstall.png) +* **Remove all data** - This option removes/resets all Docker data _without_ +a reset to factory defaults (which would cause you to lose settings). + * **Uninstall** - Choose this option to remove Docker for Mac from your system. * **Reset to factory defaults** - Choose this option to reset all options on Docker for Mac to its initial state, the same as when it was first installed. -You can uninstall Docker for Mac from the command line with this command: -` --uninstall`. If Docker is installed in the default + +### Uninstall from the command line + +Alternatively, you can uninstall Docker for Mac from the command line with this +command: ` --uninstall`. If Docker is installed in the default location, the following command will provide a clean uninstall. ```shell @@ -322,18 +323,6 @@ Docker uninstalled successfully. You can move the Docker application to the tras You might want to use the command-line uninstall if, for example, you find that the app is non-functional, and you cannot uninstall it from the menu. -### Reset Docker data (Edge feature) - -In current Edge releases, you have an additonal reset option to **Remove all -data**. - -This option removes/resets all Docker data _without_ a reset to factory defaults -(which would cause you to lose settings). This is an update per Edge release -17.06.0-rc1-ce-mac13, and fixes [Docker for Mac issue -1309](https://github.com/docker/for-mac/issues/1309)). - -![Uninstall or reset Docker Edge features](images/settings-uninstall-edge.png) - ## Adding TLS certificates You can add trusted Certificate Authorities (CAs) (used to verify registry @@ -477,21 +466,14 @@ options at the bottom of each docs page. ## Docker Store -Choose **Docker Store** from the Docker for Mac menu -to get to the Docker app downloads site. -[Docker store](https://store.docker.com/) is a -component of the next-generation Docker Hub, and the best place -to find compliant, trusted commercial and free software -distributed as Docker Images. +Choose **Docker Store** from the Docker for Mac menu to get to the Docker app +downloads site. [Docker store](https://store.docker.com/) is a component of the +next-generation Docker Hub, and the best place to find compliant, trusted +commercial and free software distributed as Docker Images. ![Docker Store](images/docker-store.png) -## Docker Cloud (Edge feature) - ->**Note:** Integrated Docker Cloud access is currently available only on -the [Edge channel](install.md#download-docker-for-mac). On stable, you'll -need to log onto [Docker Cloud](https://cloud.docker.com/) independently -for now. +## Docker Cloud You can access your [Docker Cloud](/docker-cloud/index.md) account from within Docker for Mac. @@ -512,6 +494,9 @@ Check out these [Docker Cloud topics](/docker-cloud/index.md) to learn more: * [Builds and Images](/docker-cloud/builds/index.md) * [Swarms in Docker Cloud](/docker-cloud/cloud-swarm/index.md) +Need a direct link to Cloud? [Take me to Docker +Cloud](https://cloud.docker.com/){: target="_blank" class="_" }. + ## Where to go next * Try out the walkthrough at [Get Started](/get-started/). diff --git a/docker-for-mac/release-notes.md b/docker-for-mac/release-notes.md index 4fcdea0643..7613fdd680 100644 --- a/docker-for-mac/release-notes.md +++ b/docker-for-mac/release-notes.md @@ -19,6 +19,49 @@ about both kinds of releases, and download stable and edge product installers at ## Stable Release Notes +### Docker Community Edition 17.06.0-ce-mac18, 2017-06-28 (stable) + +**Upgrades** + +- [Docker 17.06.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.06.0-ce) +- [Docker Credential Helpers 0.5.2](https://github.com/docker/docker-credential-helpers/releases/tag/v0.5.2) +- [Docker Machine 0.12.0](https://github.com/docker/machine/releases/tag/v0.12.0) +- [Docker compose 1.14.0](https://github.com/docker/compose/releases/tag/1.14.0) +- qcow-tool v0.10.0 (improve the performance of `compact`: mirage/ocaml-qcow#94) +- OSX Yosemite 10.10 is marked as deprecated +- Linux Kernel 4.9.31 + +**New** + +- Integration with Docker Cloud: control remote Swarms from the local CLI and view your repositories. +- GUI Option to opt out of credential store +- GUI option to reset Docker data without losing all settings (fixes [docker/for-mac#1309](https://github.com/docker/for-mac/issues/1309)) +- Add an experimental DNS name for the host: `docker.for.mac.localhost` +- Support for client (i.e. "login") certificates for authenticating registry access (fixes [docker/for-mac#1320](https://github.com/docker/for-mac/issues/1320)) +- OSXFS: support for `cached` mount flag to improve performance of macOS mounts when strict consistency is not necessary + +**Bug fixes and minor changes** + +- Resync HTTP(S) proxy settings on application start +- Interpret system proxy setting of `localhost` correctly (see [docker/for-mac#1511](https://github.com/docker/for-mac/issues/1511)) +- All Docker binaries bundled with Docker for Mac are now signed +- Display all Docker Cloud organizations and repositories in the whale menu (fixes [docker/for-mac#1538 ](https://github.com/docker/for-mac/issues/1538)) +- OSXFS: improved latency for many common operations (e.g. read and write) by approximately 25% +- Fixed GUI crash when text table view was selected and windows re-opened (fixes [docker/for-mac#1477](https://github.com/docker/for-mac/issues/1477)) +- Reset to default / uninstall also remove `config.json` and `osxkeychain` credentials +- More detailed VirtualBox uninstall requirements ( [docker/for-mac#1343](https://github.com/docker/for-mac/issues/1343)) +- Request time sync after waking up to improve [docker/for-mac#17](https://github.com/docker/for-mac/issues/17) +- VPNKit: Improved DNS timeout handling (fixes [docker/for-mac#202](https://github.com/docker/vpnkit/issues/202)) +- VPNKit: Use DNSServiceRef API by default (only enabled for new installs or after factory reset) +- Add a reset to factory defaults button when application crashes +- Toolbox import dialog now defaults to "Skip" +- Buffered data should be treated correctly when Docker client requests are upgraded to raw streams +- Removed an error message from the output related to experimental features handling +- `vmnetd` should not crash when user home directory is on an external drive +- Improved settings database schema handling +- Disk trimming should work as expected +- Diagnostics now contains more settings data + ### Docker Community Edition 17.03.1-ce-mac12, 2017-05-12 (stable) **Upgrades** @@ -355,6 +398,12 @@ events or unexpected unmounts. ## Edge Release Notes +### Docker Community Edition 17.06.0-ce-mac17, 2017-06-28 (edge) + +**Upgrades** + +- [Docker 17.06.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.06.0-ce) + ### Docker Community Edition 17.06.0-rc5-ce-mac16, 2017-06-21 (edge) **Upgrades** @@ -419,9 +468,9 @@ events or unexpected unmounts. **Bug fixes and minor changes** -- Fix GUI crash when text table view was selected and windows re-opened (fixes [docker/for-mac#1477](https://github.com/docker/for-mac/issues/1477)) +- Fixed GUI crash when text table view was selected and windows re-opened (fixes [docker/for-mac#1477](https://github.com/docker/for-mac/issues/1477)) - Reset to default / uninstall also remove `config.json` and `osxkeychain` credentials -- More detailed virtualbox uninstall requirements ( [docker/for-mac#1343](https://github.com/docker/for-mac/issues/1343)) +- More detailed VirtualBox uninstall requirements ( [docker/for-mac#1343](https://github.com/docker/for-mac/issues/1343)) - You are now prompted for your password, if you changed it in Docker Cloud. - Request time sync after waking up to improve [docker/for-mac#17](https://github.com/docker/for-mac/issues/17) @@ -436,7 +485,7 @@ events or unexpected unmounts. **New** -- osxfs: support for `cached` mount flag to improve performance of macOS mounts when strict consistency is not necessary +- OSXFS: support for `cached` mount flag to improve performance of macOS mounts when strict consistency is not necessary **Upgrades** @@ -446,7 +495,7 @@ events or unexpected unmounts. **Bug fixes and minor changes** -- VPNKit: Improve DNS timeout handling (fixes https://github.com/docker/vpnkit/issues/202) +- VPNKit: Improved DNS timeout handling (fixes [docker/for-mac#202](https://github.com/docker/vpnkit/issues/202)) - VPNKit: Use DNSServiceRef API by default (only enabled for new installs or after factory reset) - Add a reset to factory defaults button when application crashes - Toolbox import dialog now defaults to "Skip" @@ -1321,7 +1370,7 @@ The `osxfs` file system now persists ownership changes in an extended attribute. **Upgrades** -* docker-compose 1.7.1 (see changelog) +* docker-compose 1.7.1 (see [changelog](https://github.com/docker/compose/releases/tag/1.7.1){: target="_blank" class="_" }) * Linux kernel 4.4.9 **Bug fixes and minor changes** @@ -1337,7 +1386,7 @@ The `osxfs` file system now persists ownership changes in an extended attribute. - Fixes to disk formatting scripts - Linux kernel upgrade to 4.4.9 -## Beta 10 Release (2016-05-03 1.11.0-beta10) +### Beta 10 Release (2016-05-03 1.11.0-beta10) **New** @@ -1511,7 +1560,7 @@ lead to `Docker.app` not starting on reboot - File system/sharing: Support `inotify` events so that file system events on the Mac will trigger file system activations inside Linux containers -- Install Docker Machine as a part of Docker for Mac install in ``/usr/local` +- Install Docker Machine as a part of Docker for Mac install in `/usr/local` - Added animated popover window to help first-time users get started diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md index 5ca905341f..fb2372a152 100644 --- a/docker-for-windows/index.md +++ b/docker-for-windows/index.md @@ -327,7 +327,9 @@ To get a popup menu with application options, right-click the whale: ![Docker for Windows popup menu](/docker-for-windows/images/config-popup-menu-win.png) ->**Note:** The above example shows a user signed in for integrated Docker Cloud access. This is currently available only on the [Edge channel](install.md#download-docker-for-windows). To learn more about the feature, see [Docker Cloud (Edge feature)](#docker-cloud-edge-feature). +>**Note:** The above example shows a user signed in for integrated +Docker Cloud access. To learn more about the feature, see +[Docker Cloud](#docker-cloud). The **Settings** dialogs provide options to allow Docker auto-start, automatically check for updates, share local drives with Docker containers, @@ -426,10 +428,10 @@ If the firewall rules appear to be open, consider [reinstalling the File and Print Sharing service on the virtual network adapter.](http://stackoverflow.com/questions/42203488/settings-to-windows-firewall-to-allow-docker-for-windows-to-share-drive/43904051#43904051) -#### Shared drives on demand (Edge feature) +#### Shared drives on demand -On current Edge releases, sharing a drive can be done "on demand", the first -time a particular mount is requested. +You can share a drive "on demand" the first time a particular mount is +requested. If you run a Docker command from a shell with a volume mount (as shown in the example below) or kick off a Compose file that includes volume mounts, you get a @@ -661,21 +663,14 @@ because they do not apply to Windows containers: ### Docker Store -Choose **Docker Store** from the Docker for Windows menu -to get to the Docker app downloads site. -[Docker store](https://store.docker.com/) is a -component of the next-generation Docker Hub, and the best place -to find compliant, trusted commercial and free software -distributed as Docker Images. +Choose **Docker Store** from the Docker for Windows menu to get to the Docker +app downloads site. [Docker store](https://store.docker.com/) is a component of +the next-generation Docker Hub, and the best place to find compliant, trusted +commercial and free software distributed as Docker Images. ![Docker Store](images/docker-store.png) -### Docker Cloud (Edge feature) - ->**Note:** Integrated Docker Cloud access is currently available only on -the [Edge channel](install.md#download-docker-for-windows). On stable, -you'll need to log onto [Docker Cloud](https://cloud.docker.com/) -independently for now. +### Docker Cloud You can access your [Docker Cloud](/docker-cloud/index.md) account from within Docker for Windows. @@ -697,6 +692,9 @@ Check out these [Docker Cloud topics](/docker-cloud/index.md) to learn more: * [Builds and Images](/docker-cloud/builds/index.md) * [Swarms in Docker Cloud](/docker-cloud/cloud-swarm/index.md) +Need a direct link to Cloud? [Take me to Docker +Cloud](https://cloud.docker.com/){: target="_blank" class="_" }. + ### Giving feedback and getting help To get help from the community, review current user topics, join or start a diff --git a/docker-for-windows/release-notes.md b/docker-for-windows/release-notes.md index 5d1e831651..fa81a7763b 100644 --- a/docker-for-windows/release-notes.md +++ b/docker-for-windows/release-notes.md @@ -19,6 +19,44 @@ about both kinds of releases, and download stable and edge product installers at ## Stable Release Notes +### Docker CommunityEdition 17.06.0-ce-win18 2017-06-28 (stable) + +**Upgrades** + +- [Docker 17.06.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.06.0-ce) +- [Docker Credential Helpers 0.5.2](https://github.com/docker/docker-credential-helpers/releases/tag/v0.5.2) +- [Docker Machine 0.12.0](https://github.com/docker/machine/releases/tag/v0.12.0) +- [Docker compose 1.14.0](https://github.com/docker/compose/releases/tag/1.14.0) +- Linux Kernel 4.9.31 + +**New** + +- Windows Server 2016 support +- Windows 10586 is marked as deprecated; it will not be supported going forward in stable releases +- Integration with Docker Cloud, with the ability to control remote Swarms from the local command line interface (CLI) and view your repositories +- Unified login between the Docker CLI and Docker Hub, Docker Cloud. +- Sharing a drive can be done on demand, the first time a mount is requested +- Add an experimental DNS name for the host: docker.for.win.localhost +- Support for client (i.e. "login") certificates for authenticating registry access (fixes [docker/for-win#569](https://github.com/docker/for-win/issues/569)) +- New installer experience + +**Bug fixes and minor changes** + +- Fixed group access check for users logged in with Active Directory (fixes [docker/for-win#785](https://github.com/docker/for-win/issues/785)) +- Check environment variables and add some warnings in logs if they can cause docker to fail +- Many processes that were running in admin mode are now running within the user identity +- Cloud federation command lines now opens in the user home directory +- Named pipes are now created with more constrained security descriptors to improve security +- Security fix : Users must be part of a specific group "docker-users" to run Docker for windows +- Reset to default / uninstall also reset docker cli settings and logout user from Docker Cloud and registries +- Detect a bitlocker policy preventing windows containers to work +- Fixed an issue on filesharing when explicitly disabled on vmswitch interface +- Fixed VM not starting when machine had very long name +- Fixed a bug where Windows daemon.json file was not written (fixes [docker/for-win#670](https://github.com/docker/for-win/issues/670)) +- Added patches to the kernel to fix VMBus crash +- Named pipe client connection should not trigger dead locks on `docker run` with data in stdin anymore +- Buffered data should be treated correctly when docker client requests are upgraded to raw streams + ### Docker Community Edition 17.03.1-ce-win12 2017-05-12 (stable) **Upgrades** @@ -309,6 +347,12 @@ We did not distribute a 1.12.4 stable release ## Edge Release Notes +### Docker Community Edition 17.06.0-win17 Release Notes (2017-06-28 17.06.0-win17) (edge) + +**Upgrades** + +- [Docker 17.06.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.06.0-ce) + ### Docker Community Edition 17.06.0-win16 Release Notes (2017-06-21 17.06.0-rc5-ce-win16) (edge) **Upgrades** @@ -387,9 +431,9 @@ registry access (fixes [docker/for-win#569](https://github.com/docker/for-win/is - Reset to default / uninstall also reset docker cli settings and logout user from Docker Cloud and registries - Detect a bitlocker policy preventing windows containers to work -- fix an issue on filesharing when explicitly disabled on vmswitch interface -- fix VM not starting when machine had very long name -- Fix a bug where Windows daemon.json file was not written (fixes [docker/for-win#670](https://github.com/docker/for-win/issues/670)) +- Fixed an issue on filesharing when explicitly disabled on vmswitch interface +- Fixed VM not starting when machine had very long name +- Fixed a bug where Windows daemon.json file was not written (fixes [docker/for-win#670](https://github.com/docker/for-win/issues/670)) ### Docker Community Edition 17.0.5-win8 Release Notes (2017-04-13 17.05.0-ce-rc1-win8) (edge) @@ -412,7 +456,7 @@ registry access (fixes [docker/for-win#569](https://github.com/docker/for-win/is **Bug fixes and minor changes** -- Add patches to the kernel to fix VMBus crash +- Added patches to the kernel to fix VMBus crash ### Docker Community Edition 17.04.0-ce-win6 Release Notes (2017-04-03 17.04.0-ce-rc2-win6) (edge)