Skip to content

Commit 175e4a1

Browse files
committed
remove beta from oat
1 parent 8d57252 commit 175e4a1

File tree

7 files changed

+83
-147
lines changed

7 files changed

+83
-147
lines changed

content/manuals/desktop/_index.md

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@ grid:
1515
[Windows](/desktop/setup/install/windows-install/), or
1616
[Linux](/desktop/setup/install/linux/).
1717
icon: download
18-
- title: Explore Docker Desktop
18+
- title: Learn about Docker Desktop
1919
description: Navigate Docker Desktop and learn about its key features.
2020
icon: feature_search
2121
link: /desktop/use-desktop/
22+
- title: Explore its key features
23+
description: |
24+
Find information about [Docker VMM](/desktop/features/vmm/), [WSL](/desktop/features/wsl/), [deploying on Kubernetes](/desktop/features/kubernetes/), and more.
25+
icon: category
2226
- title: View the release notes
2327
description: Find out about new features, improvements, and bug fixes.
2428
icon: note_add
@@ -27,11 +31,6 @@ grid:
2731
description: Explore general FAQs or FAQs for specific platforms.
2832
icon: help
2933
link: /desktop/troubleshoot-and-support/faqs/general/
30-
- title: Find additional resources
31-
description: |
32-
Find information on networking features, deploying on Kubernetes, and more.
33-
icon: category
34-
link: /desktop/features/kubernetes/
3534
- title: Give feedback
3635
description: Provide feedback on Docker Desktop or Docker Desktop features.
3736
icon: sms
@@ -51,15 +50,18 @@ It provides a straightforward GUI (Graphical User Interface) that lets you manag
5150

5251
Docker Desktop reduces the time spent on complex setups so you can focus on writing code. It takes care of port mappings, file system concerns, and other default settings, and is regularly updated with bug fixes and security updates.
5352

53+
Docker Desktop integrates with your preferred development tools and languages, and gives you access to a vast ecosystem of trusted images and templates via Docker Hub. This empowers teams to accelerate development, automate builds, enable CI/CD workflows, and collaborate securely through shared repositories.
54+
5455
{{< tabs >}}
5556
{{< tab name="What's included in Docker Desktop?" >}}
5657

5758
- [Docker Engine](/manuals/engine/_index.md)
5859
- Docker CLI client
5960
- [Docker Scout](../scout/_index.md) (additional subscription may apply)
6061
- [Docker Build](/manuals/build/_index.md)
61-
- [Docker Extensions](../extensions/_index.md)
6262
- [Docker Compose](/manuals/compose/_index.md)
63+
- [Ask Gordon](/manuals/desktop/features/gordon/_index.md)
64+
- [Docker Extensions](../extensions/_index.md)
6365
- [Docker Content Trust](/manuals/engine/security/trust/_index.md)
6466
- [Kubernetes](https://github.com/kubernetes/kubernetes/)
6567
- [Credential Helper](https://github.com/docker/docker-credential-helpers/)
@@ -78,10 +80,4 @@ Docker Desktop reduces the time spent on complex setups so you can focus on writ
7880
{{< /tab >}}
7981
{{< /tabs >}}
8082

81-
Docker Desktop works with your choice of development tools and languages and
82-
gives you access to a vast library of certified images and templates in
83-
[Docker Hub](https://hub.docker.com/). This allows development teams to extend
84-
their environment to rapidly auto-build, continuously integrate, and collaborate
85-
using a secure repository.
86-
8783
{{< grid >}}

content/manuals/desktop/setup/install/mac-install.md

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
description: Install Docker for Mac to get started. This guide covers system requirements,
2+
description: Install Docker Desktop for Mac to get started. This guide covers system requirements,
33
where to download, and instructions on how to install and update.
4-
keywords: docker for mac, install docker macos, docker mac, docker mac install, docker
4+
keywords: docker desktop for mac, install docker macos, docker mac, docker mac install, docker
55
install macos, install docker on mac, install docker macbook, docker desktop for
66
mac, how to install docker on mac, setup docker on mac
77
title: Install Docker Desktop on Mac
@@ -21,10 +21,10 @@ aliases:
2121
> **Docker Desktop terms**
2222
>
2323
> Commercial use of Docker Desktop in larger enterprises (more than 250
24-
> employees OR more than $10 million USD in annual revenue) requires a [paid
24+
> employees or more than $10 million USD in annual revenue) requires a [paid
2525
> subscription](https://www.docker.com/pricing/).
2626
27-
This page contains download URLs, information about system requirements, and instructions on how to install Docker Desktop for Mac.
27+
This page provides download links, system requirements, and step-by-step installation instructions for Docker Desktop on Mac.
2828

2929
{{< button text="Docker Desktop for Mac with Apple silicon" url="https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64" >}}
3030
{{< button text="Docker Desktop for Mac with Intel chip" url="https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64" >}}
@@ -44,7 +44,7 @@ This page contains download URLs, information about system requirements, and ins
4444

4545
> [!IMPORTANT]
4646
>
47-
> Docker supports Docker Desktop on the most recent versions of macOS. That is, the current release of macOS and the previous two releases. As new major versions of macOS are made generally available, Docker stops supporting the oldest version and supports the newest version of macOS (in addition to the previous two releases).
47+
> Docker Desktop is supported on the current and two previous major macOS releases. As new major versions of macOS are made generally available, Docker stops supporting the oldest version and supports the newest version of macOS (in addition to the previous two releases).
4848
4949
- At least 4 GB of RAM.
5050

@@ -55,10 +55,10 @@ This page contains download URLs, information about system requirements, and ins
5555

5656
> [!IMPORTANT]
5757
>
58-
> Docker supports Docker Desktop on the most recent versions of macOS. That is, the current release of macOS and the previous two releases. As new major versions of macOS are made generally available, Docker stops supporting the oldest version and supports the newest version of macOS (in addition to the previous two releases).
58+
> Docker Desktop is supported on the current and two previous major macOS releases. As new major versions of macOS are made generally available, Docker stops supporting the oldest version and supports the newest version of macOS (in addition to the previous two releases).
5959
6060
- At least 4 GB of RAM.
61-
- For the best experience, it's recommended that you install Rosetta 2. There is no longer a hard requirement to install Rosetta 2, however there are a few optional command line tools that still require Rosetta 2 when using Darwin/AMD64. See [Known issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). To install Rosetta 2 manually from the command line, run the following command:
61+
- For the best experience, it's recommended that you install Rosetta 2. Rosetta 2 is no longer strictly required, however there are a few optional command line tools that still require Rosetta 2 when using Darwin/AMD64. See [Known issues](/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md). To install Rosetta 2 manually from the command line, run the following command:
6262

6363
```console
6464
$ softwareupdate --install-rosetta
@@ -96,7 +96,7 @@ This page contains download URLs, information about system requirements, and ins
9696

9797
6. From the installation window, select either:
9898
- **Use recommended settings (Requires password)**. This lets Docker Desktop automatically set the necessary configuration settings.
99-
- **Use advanced settings**. You can then set the location of the Docker CLI tools either in the system or user directory, enable the default Docker socket, and enable privileged port mapping. See [Settings](/manuals/desktop/settings-and-maintenance/settings.md#advanced), for more information and how to set the location of the Docker CLI tools.
99+
- **Use advanced settings**. You can then set the location of the Docker CLI tools either in the system or user directory, enable the default Docker socket, and enable privileged port mapping. For more information and how to set the location of the Docker CLI tools, see [Settings](/manuals/desktop/settings-and-maintenance/settings.md#advanced).
100100
7. Select **Finish**. If you have applied any of the previous configurations that require a password in step 6, enter your password to confirm your choice.
101101

102102
### Install from the command line
@@ -111,13 +111,24 @@ $ sudo hdiutil detach /Volumes/Docker
111111

112112
By default, Docker Desktop is installed at `/Applications/Docker.app`. As macOS typically performs security checks the first time an application is used, the `install` command can take several minutes to run.
113113

114+
#### Installer flags
115+
114116
The `install` command accepts the following flags:
117+
118+
##### Installation behavior
119+
115120
- `--accept-license`: Accepts the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement) now, rather than requiring it to be accepted when the application is first run.
116-
- `--allowed-org=<org name>`: Requires the user to sign in and be part of the specified Docker Hub organization when running the application
117121
- `--user=<username>`: Performs the privileged configurations once during installation. This removes the need for the user to grant root privileges on first run. For more information, see [Privileged helper permission requirements](/manuals/desktop/setup/install/mac-permission-requirements.md#permission-requirements). To find the username, enter `ls /Users` in the CLI.
122+
123+
##### Security and access
124+
125+
- `--allowed-org=<org name>`: Requires the user to sign in and be part of the specified Docker Hub organization when running the application
118126
- `--admin-settings`: Automatically creates an `admin-settings.json` file which is used by administrators to control certain Docker Desktop settings on client machines within their organization. For more information, see [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md).
119127
- It must be used together with the `--allowed-org=<org name>` flag.
120128
- For example: `--allowed-org=<org name> --admin-settings="{'configurationFileVersion': 2, 'enhancedContainerIsolation': {'value': true, 'locked': false}}"`
129+
130+
##### Proxy configuration
131+
121132
- `--proxy-http-mode=<mode>`: Sets the HTTP Proxy mode. The two modes are `system` (default) or `manual`.
122133
- `--override-proxy-http=<URL>`: Sets the URL of the HTTP proxy that must be used for outgoing HTTP requests. It requires `--proxy-http-mode` to be `manual`.
123134
- `--override-proxy-https=<URL>`: Sets the URL of the HTTP proxy that must be used for outgoing HTTPS requests, requires `--proxy-http-mode` to be `manual`

0 commit comments

Comments
 (0)