From 38834dc69112fecb93daa5c920be684d6a02b2ab Mon Sep 17 00:00:00 2001 From: JorisDebonnet Date: Tue, 14 Sep 2021 09:22:54 +0200 Subject: [PATCH 1/5] Fix broken github link Fixes #13530 --- desktop/windows/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/windows/release-notes.md b/desktop/windows/release-notes.md index 9ebbaf4983..a53412a252 100644 --- a/desktop/windows/release-notes.md +++ b/desktop/windows/release-notes.md @@ -21,7 +21,7 @@ This page contains information about the new features, improvements, known issue ### Upgrades -- [Compose V2 RC3](https://github.com/docker/compose-cli/releases/tag/v2.0.0-rc.3) +- [Compose V2 RC3](https://github.com/docker/compose/releases/tag/v2.0.0-rc.3) - Compose v2 is now hosted on github.com/docker/compose. - Fixed go panic on downscale using `compose up --scale`. - Fixed a race condition in `compose run --rm` while capturing exit code. From 61823a5a43033ce9ac92d3531221bf25598a8798 Mon Sep 17 00:00:00 2001 From: Jerae Duffin Date: Tue, 14 Sep 2021 07:54:51 -0500 Subject: [PATCH 2/5] fixed Org Permissions --- docker-hub/image-access-management.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-hub/image-access-management.md b/docker-hub/image-access-management.md index 2bb10b1117..1ab28f73d1 100644 --- a/docker-hub/image-access-management.md +++ b/docker-hub/image-access-management.md @@ -12,7 +12,7 @@ For example, a developer, who is part of an organization, building a new contain ## Configure Image Access Management permissions 1. Log into your [Docker Hub](https://hub.docker.com) account as an organization administrator. -2. Select an organization, and navigate to the **Settings** tab on the **Organizations** page and click Org images. +2. Select an organization, and navigate to the **Settings** tab on the **Organizations** page and click Org Permissions. ![Image Access Management](images/image-access-management.png){:width="700px"} From a9d5c1ae7b382b1d5fdaed27dbeb145d0262336b Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Tue, 14 Sep 2021 14:57:04 +0100 Subject: [PATCH 3/5] Update Docs footer Signed-off-by: Usha Mandya --- _includes/footer.html | 82 ++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index bf160a257c..be229ae4e0 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -20,53 +20,63 @@
-
-
- -
-
- +
+
+ +
+
+
From f9f9a8022c871905f7bb7527b65fc5500b25c1fa Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Tue, 14 Sep 2021 17:55:47 +0100 Subject: [PATCH 4/5] Add Desktop installation path to FAQ Signed-off-by: Usha Mandya --- desktop/faqs.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/desktop/faqs.md b/desktop/faqs.md index 86db01438b..8e6fd34fc0 100644 --- a/desktop/faqs.md +++ b/desktop/faqs.md @@ -15,6 +15,13 @@ toc_max: 2 For information about Docker Desktop system requirements, see [Docker Desktop for Mac system requirements](mac/install.md#system-requirements) and [Docker Desktop for Windows system requirements](windows/install.md#system-requirements). +### Where does Docker Desktop get installed on my machine? + +By default, Docker Desktop is installed at the following location: + +- On Mac: `/Applications/Docker.app` +- On Windows: `C:\Program Files\Docker\Docker` + ### Do I need to pay to use Docker Desktop? Docker Desktop remains free for small businesses (fewer than 250 employees AND less than $10 million in revenue), personal use, education, and non-commercial open-source projects. It requires a paid subscription for professional use in larger enterprises. From c4373d5a5f587804903297f213325dc0e9ba322f Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Wed, 15 Sep 2021 11:09:58 +0200 Subject: [PATCH 5/5] Download latest DD from main channel Signed-off-by: Stefan Scherer --- desktop/mac/install.md | 4 ++-- desktop/mac/release-notes.md | 4 ++-- desktop/windows/install.md | 2 +- desktop/windows/release-notes.md | 2 +- get-started/index.md | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/desktop/mac/install.md b/desktop/mac/install.md index 9831bf1594..a1e62027a6 100644 --- a/desktop/mac/install.md +++ b/desktop/mac/install.md @@ -10,8 +10,8 @@ Welcome to Docker Desktop for Mac. This page contains information about Docker D > Download Docker Desktop for Mac > -> [Mac with Intel chip](https://desktop.docker.com/mac/stable/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/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn } +> [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 } ## System requirements diff --git a/desktop/mac/release-notes.md b/desktop/mac/release-notes.md index 47b2bf55ab..42df8f2835 100644 --- a/desktop/mac/release-notes.md +++ b/desktop/mac/release-notes.md @@ -17,8 +17,8 @@ This page contains information about the new features, improvements, known issue > Download Docker Desktop > -> [Mac with Intel chip](https://desktop.docker.com/mac/stable/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/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn } +> [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 } ### Upgrades diff --git a/desktop/windows/install.md b/desktop/windows/install.md index 4f9cb1b8ee..126b775ea4 100644 --- a/desktop/windows/install.md +++ b/desktop/windows/install.md @@ -16,7 +16,7 @@ Welcome to Docker Desktop for Windows. This page contains information about Dock > Download Docker Desktop for Windows > -> [Docker Desktop for Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe){: .button .primary-btn } +> [Docker Desktop for Windows](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe){: .button .primary-btn } ## System requirements diff --git a/desktop/windows/release-notes.md b/desktop/windows/release-notes.md index 6e0fad28c6..73e9a433c9 100644 --- a/desktop/windows/release-notes.md +++ b/desktop/windows/release-notes.md @@ -17,7 +17,7 @@ This page contains information about the new features, improvements, known issue > Download Docker Desktop > -> [For Windows](https://desktop.docker.com/win/stable/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/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn } ### Upgrades diff --git a/get-started/index.md b/get-started/index.md index c9f6abea89..048663a925 100644 --- a/get-started/index.md +++ b/get-started/index.md @@ -80,9 +80,9 @@ We also recommend the video walkthrough from DockerCon 2020. This tutorial assumes you have a current version of Docker installed on your machine. If you do not have Docker installed, choose your preferred operating system below to download Docker: -[Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn .accept-eula } -[Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn .accept-eula } -[Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn .accept-eula } +[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 } +[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 } [Linux](../engine/install/index.md){: .button .primary-btn} For Docker Desktop installation instructions, see [Install Docker Desktop on Mac](../desktop/mac/install.md) and [Install Docker Desktop on Windows](../desktop/windows/install.md).