From 7e98f9a85dd9691adc47e7cdb2218a95368def40 Mon Sep 17 00:00:00 2001 From: Jerae Duffin Date: Mon, 29 Nov 2021 10:22:43 -0600 Subject: [PATCH 1/4] Consolidated sections --- subscription/upgrade.md | 44 +++++------------------------------------ 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/subscription/upgrade.md b/subscription/upgrade.md index f55de0955c..1132e7ad3e 100644 --- a/subscription/upgrade.md +++ b/subscription/upgrade.md @@ -11,7 +11,7 @@ This page contains information on how to purchase a Docker paid subscription. It You can upgrade from Docker Personal to a Pro, Team, or a Business subscription from a Personal subscription. When you upgrade to a paid subscription, you can immediately use all the features and entitlements offered in your new subscription. For detailed information on features available in each subscription, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. -## Upgrade from a Personal to a Pro, Team, or Business subscription +## Upgrade to a Pro, Team, or Business subscription The following section contains information on how to purchase a Docker subscription for new customers. To upgrade from a Personal subscription to a Team or Business subscription, you must first convert your personal namespace to an organization namespace. To learn more, see [convert an account into an organization](../docker-hub/convert-account.md). @@ -19,54 +19,20 @@ To purchase a Pro, Team, or Business subscription: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. -2. Click **Upgrade** and select your Pro, Team, or Business subscription. +2. To upgrade your Personal subscription, click **Upgrade**. To upgrade your Pro or Team subscription, open the drop-down menu next to your username in the top-right corner and select **Billing**. On the **Billing Details** page, click **Change plan** to navigate to the pricing page. > **Note** > - > If you have not created an organization for a Team or Business subscription, select **Create Organization** from the drop-down menu and select your plan. Click **Buy Now** and continue with the on-screen instructions. + > If you have not created an organization for a Team or Business subscription, select **Create Organization** from the drop-down menu and select your plan. If you already have a subscription, you can also add another organization. Click **Buy Now** and continue with the on-screen instructions. -3. On the **Organization Size** page, select your annual or monthly subscription and update the number of users for your organization. For a Business subscription, the only option available is annually. +3. On the **Organization Size** page, select your annual or monthly subscription and update the number of users for your organization. If you are upgrading to a Business subscription, you must choose an annual subscription. > **Note** > > To upgrade to a Business subscription, you must have at least 5 users and at least 40 users through purchase orders. To create a purchase order, specify the number of users and then click the **Contact Sales form**. Then, continue the on-screen instructions for the billing details and click **Purchase**. -4. Click **Continue to Purchase** and update the fields to complete your purchase. - -## Upgrade to a Team or Business subscription - -The following section is for upgrading your current subscription to a Team or Business subscription. You can now use the self-service option to purchase Docker Business seats through a credit card. To upgrade to a Team or Business subscription you must first convert your personal namespace to an organization namespace. To learn more, see [convert an account into an organization](../docker-hub/convert-account.md). - -To upgrade your subscription: - -1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. - -2. Open the drop-down menu next to your username in the top-right corner and select **Billing**. The **Billing Details** page displays billing information about your existing user account. - - >**Note** - > - > Ensure you have selected the correct account on the - left side of the **Billing Details** page. For example, if you want to upgrade to a Docker Pro subscription, you must select your personal account. - -3. Click **Change plan** and navigate the pricing page to upgrade your subscription. - -4. Select your subscription and continue with the on-screen instructions. - - >**Note** - > - > Click **Create Organization** if you want to add another organization to your subscription. Click **Buy Now** to proceed with the on-screen instructions. - - ![Billing personal account](images/billing-personal-account.png) - - -5. On the **Organization Size** page, select your annual or monthly subscription and update the number of users for your organization. For a Business subscription, the only option available is annually. - - > **Note** - > - > To upgrade to a Business subscription, you must have at least 5 users and at least 40 users through purchase orders. To create a purchase order, specify the number of users and then click the **Contact Sales form**. Then, continue the on-screen instructions for the billing details and click **Purchase**. - -6. Click **Continue to Payment** and continue to on-screen instructions and click Purchase to complete your subscription. +4. Click **Continue to Payment** and update the fields to complete your purchase. ## Switch from a monthly subscription to an annual subscription From a1ddd59d85a10778a8db938d8ad2aae94e69d6a4 Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Fri, 26 Nov 2021 17:13:36 +0100 Subject: [PATCH 2/4] Remove hard requirement to install Rosetta 2 for DD 4.3.0 Signed-off-by: Stefan Scherer --- desktop/mac/apple-silicon.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/desktop/mac/apple-silicon.md b/desktop/mac/apple-silicon.md index c7c452dce5..49643b53bd 100644 --- a/desktop/mac/apple-silicon.md +++ b/desktop/mac/apple-silicon.md @@ -24,21 +24,23 @@ Download Docker Desktop for Mac on Apple silicon: ### System requirements -You must install **Rosetta 2** as some binaries are still Darwin/AMD64. To install Rosetta 2 manually from the command line, run the following command: +Beginning with Docker Desktop 4.3.0, we have removed the hard requirement to install **Rosetta 2**. There are a few optional command line tools that still require Rosetta 2 when using Darwin/AMD64. See the Known issues section below. However, to get the best experience, we recommend that you install Rosetta 2. To install Rosetta 2 manually from the command line, run the following command: ```console $ softwareupdate --install-rosetta ``` -We expect to fix this in a future release. - ### Known issues +- Some command line tools do not work when Rosetta 2 is not installed. + - The old version 1.x of `docker-compose`. We recommend that you use Compose V2 instead. Either type `docker compose` or enable the **Use Docker Compose V2** option in the [General preferences tab](./index.md#general). + - The `docker scan` command and the underlying `snyk` binary. + - The `docker-credential-ecr-login` credential helper. - Not all images are available for ARM64 architecture. You can add `--platform linux/amd64` to run an Intel image under emulation. In particular, the [mysql](https://hub.docker.com/_/mysql?tab=tags&page=1&ordering=last_updated) image is not available for ARM64. You can work around this issue by using a [mariadb](https://hub.docker.com/_/mariadb?tab=tags&page=1&ordering=last_updated) image. - However, attempts to run Intel-based containers on Apple Silicon machines under emulation can crash as qemu sometimes fails to run the container. In addition, filesystem change notification APIs (`inotify`) do not work under qemu emulation. Even when the containers do run correctly under emulation, they will be slower and use more memory than the native equivalent. + However, attempts to run Intel-based containers on Apple silicon machines under emulation can crash as qemu sometimes fails to run the container. In addition, filesystem change notification APIs (`inotify`) do not work under qemu emulation. Even when the containers do run correctly under emulation, they will be slower and use more memory than the native equivalent. - In summary, running Intel-based containers on Arm-based machines should be regarded as "best effort" only. We recommend running arm64 containers on Apple Silicon machines whenever possible, and encouraging container authors to produce arm64, or multi-arch, versions of their containers. We expect this issue to become less common over time, as more and more images are rebuilt [supporting multiple architectures](https://www.docker.com/blog/multi-arch-build-and-images-the-simple-way/). + In summary, running Intel-based containers on Arm-based machines should be regarded as "best effort" only. We recommend running arm64 containers on Apple silicon machines whenever possible, and encouraging container authors to produce arm64, or multi-arch, versions of their containers. We expect this issue to become less common over time, as more and more images are rebuilt [supporting multiple architectures](https://www.docker.com/blog/multi-arch-build-and-images-the-simple-way/). - `ping` from inside a container to the Internet does not work as expected. To test the network, we recommend using `curl` or `wget`. See [docker/for-mac#5322](https://github.com/docker/for-mac/issues/5322#issuecomment-809392861). - Users may occasionally experience data drop when a TCP stream is half-closed. From 39d7a57f9c42727c1d62bfe1848066f01b394f7c Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Tue, 30 Nov 2021 18:16:00 +0100 Subject: [PATCH 3/4] Update system requirements for Apple silicon Signed-off-by: Stefan Scherer --- desktop/mac/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/mac/install.md b/desktop/mac/install.md index 325b3bf0f6..c962e1226a 100644 --- a/desktop/mac/install.md +++ b/desktop/mac/install.md @@ -48,7 +48,7 @@ Your Mac must meet the following requirements to install Docker Desktop successf ### Mac with Apple silicon -- You must install **Rosetta 2** as some binaries are still Darwin/AMD64. To install Rosetta 2 manually from the command line, run the following command: +- Beginning with Docker Desktop 4.3.0, we have removed the hard requirement to install **Rosetta 2**. There are a few optional command line tools that still require Rosetta 2 when using Darwin/AMD64. See the [Known issues section](apple-silicon.md#known-issues). However, to get the best experience, we recommend that you install Rosetta 2. To install Rosetta 2 manually from the command line, run the following command: ```console $ softwareupdate --install-rosetta From 8bd2e9c6a7c2c43e9e22158a0f9625a5ac6044e4 Mon Sep 17 00:00:00 2001 From: Trung Nguyen Date: Thu, 2 Dec 2021 14:04:05 +0100 Subject: [PATCH 4/4] Added release notes for 4.3.0 Signed-off-by: Trung Nguyen --- desktop/mac/release-notes/index.md | 36 ++++++++++++++++++++++++-- desktop/windows/release-notes/index.md | 32 ++++++++++++++++++++++- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/desktop/mac/release-notes/index.md b/desktop/mac/release-notes/index.md index 71b0e61bb5..6e5ee37b34 100644 --- a/desktop/mac/release-notes/index.md +++ b/desktop/mac/release-notes/index.md @@ -19,14 +19,46 @@ This page contains information about the new features, improvements, known issue Take a look at the [Docker Public Roadmap](https://github.com/docker/roadmap/projects/1){: target="_blank" rel="noopener" class="_"} to see what's coming next. -## Docker Desktop 4.2.0 -2021-11-09 +## Docker Desktop 4.3.0 +2021-12-02 > Download Docker Desktop > > [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn } > [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn } +### Deprecation +- The following internal DNS names are deprecated and will be removed from a future release: `docker-for-desktop`, `docker-desktop`, `docker.for.mac.host.internal`, `docker.for.mac.localhost`, `docker.for.mac.gateway.internal`. You must now use `host.docker.internal`, `vm.docker.internal`, and `gateway.docker.internal`. +- Custom RBAC rules have been removed from Docker Desktop as it gives `cluster-admin` privileges to all Service Accounts. Fixes [docker/for-mac/#4774](https://github.com/docker/for-mac/issues/4774). + +### Upgrades + +- [Docker Engine v20.10.11](https://docs.docker.com/engine/release-notes/#201011) +- [containerd v1.4.12](https://github.com/containerd/containerd/releases/tag/v1.4.12) +- [Buildx 0.7.1](https://github.com/docker/buildx/releases/tag/v0.7.1) +- [Compose v2.2.1](https://github.com/docker/compose/releases/tag/v2.2.1) +- [Kubernetes 1.22.4](https://github.com/kubernetes/kubernetes/releases/tag/v1.22.4) +- [Docker Hub Tool v0.4.4](https://github.com/docker/hub-tool/releases/tag/v0.4.4) +- [Go 1.17.3](https://golang.org/doc/go1.17) + +### Bug fixes and minor changes + +- Docker Desktop on Apple silicon no longer requires Rosetta 2. +- Fixed an issue which prevented users from saving files from a volume using the Save As option in the Volumes UI. Fixes [docker/for-win#12407](https://github.com/docker/for-win/issues/12407). +- Fixed an issue that sometimes launched the existing version of Docker Desktop even after updating to a newer version. +- Added a self-diagnose warning if the host lacks Internet connectivity. +- Docker Desktop now uses cgroupv2. If you need to run `systemd` in a container then: + - Ensure your version of `systemd` supports cgroupv2. [It must be at least `systemd` 247](https://github.com/systemd/systemd/issues/19760#issuecomment-851565075). Consider upgrading any `centos:7` images to `centos:8`. + - Containers running `systemd` need the following options: [`--privileged --cgroupns=host -v /sys/fs/cgroup:/sys/fs/cgroup:rw`](https://serverfault.com/questions/1053187/systemd-fails-to-run-in-a-docker-container-when-using-cgroupv2-cgroupns-priva). + +## Docker Desktop 4.2.0 +2021-11-09 + +> Download Docker Desktop + +> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/70708/Docker.dmg) | +> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/70708/Docker.dmg) + ### New **Pause/Resume**: You can now pause your Docker Desktop session when you are not actively using it and save CPU resources on your machine. For more information, see [Pause/Resume](../index.md#pauseresume). diff --git a/desktop/windows/release-notes/index.md b/desktop/windows/release-notes/index.md index a52b34480a..be8b67abff 100644 --- a/desktop/windows/release-notes/index.md +++ b/desktop/windows/release-notes/index.md @@ -19,12 +19,42 @@ This page contains information about the new features, improvements, known issue Take a look at the [Docker Public Roadmap](https://github.com/docker/roadmap/projects/1){: target="_blank" rel="noopener" class="_"} to see what's coming next. +## Docker Desktop 4.3.0 +2021-12-02 + +> Download Docker Desktop +> +> [For Windows](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn } + +### Deprecation +- The following internal DNS names are deprecated and will be removed from a future release: `docker-for-desktop`, `docker-desktop`, `docker.for.mac.host.internal`, `docker.for.mac.localhost`, `docker.for.mac.gateway.internal`. You must now use `host.docker.internal`, `vm.docker.internal`, and `gateway.docker.internal`. +- Removed: Custom RBAC rules have been removed from Docker Desktop as it gives `cluster-admin` privileges to all Service Accounts. Fixes [docker/for-mac/#4774](https://github.com/docker/for-mac/issues/4774). + +### Upgrades + +- [Docker Engine v20.10.11](https://docs.docker.com/engine/release-notes/#201011) +- [containerd v1.4.12](https://github.com/containerd/containerd/releases/tag/v1.4.12) +- [Buildx 0.7.1](https://github.com/docker/buildx/releases/tag/v0.7.1) +- [Compose v2.2.1](https://github.com/docker/compose/releases/tag/v2.2.1) +- [Kubernetes 1.22.4](https://github.com/kubernetes/kubernetes/releases/tag/v1.22.4) +- [Docker Hub Tool v0.4.4](https://github.com/docker/hub-tool/releases/tag/v0.4.4) +- [Go 1.17.3](https://golang.org/doc/go1.17) + +### Bug fixes and minor changes + +- Fixed an issue which prevented users from saving files from a volume using the Save As option in the Volumes UI. Fixes [docker/for-win#12407](https://github.com/docker/for-win/issues/12407). +- Fixed an issue that caused Docker Desktop to fail during startup if the home directory path contains a character used in regular expressions. Fixes [docker/for-win#12374](https://github.com/docker/for-win/issues/12374). +- Added a self-diagnose warning if the host lacks Internet connectivity. +- Docker Desktop now uses cgroupv2. If you need to run `systemd` in a container then: + - Ensure your version of `systemd` supports cgroupv2. [It must be at least `systemd` 247](https://github.com/systemd/systemd/issues/19760#issuecomment-851565075). Consider upgrading any `centos:7` images to `centos:8`. + - Containers running `systemd` need the following options: [`--privileged --cgroupns=host -v /sys/fs/cgroup:/sys/fs/cgroup:rw`](https://serverfault.com/questions/1053187/systemd-fails-to-run-in-a-docker-container-when-using-cgroupv2-cgroupns-priva). + ## Docker Desktop 4.2.0 2021-11-09 > Download Docker Desktop > -> [For Windows](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn } +> [For Windows](https://desktop.docker.com/win/main/amd64/70708/Docker%20Desktop%20Installer.exe) ### New