Skip to content

Commit

Permalink
ENGDOCS-2283 (#21329)
Browse files Browse the repository at this point in the history
<!--Delete sections as needed -->

## Description

Tidy up of DD IA. Creates a 'setup' folder and moves relevant pages
within it. First PR of a few

## Related issues or tickets

<!-- Related issues, pull requests, or Jira tickets -->

## Reviews

<!-- Notes for reviewers here -->
<!-- List applicable reviews (optionally @tag reviewers) -->

- [ ] Technical review
- [ ] Editorial review
- [ ] Product review
  • Loading branch information
aevesdocker authored Nov 5, 2024
1 parent 48f3bcc commit 3ea0cd7
Show file tree
Hide file tree
Showing 44 changed files with 116 additions and 84 deletions.
4 changes: 2 additions & 2 deletions content/get-started/get-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ section and choose the best installation path for you.
{{< card
title="Docker Desktop for Mac"
description="A native application using the macOS sandbox security model that delivers all Docker tools to your Mac."
link="/desktop/install/mac-install/"
link="/desktop/setup/install/mac-install/"
icon="/assets/images/apple_48.svg" >}}

<br>

{{< card
title="Docker Desktop for Windows"
description="A native Windows application that delivers all Docker tools to your Windows computer."
link="/desktop/install/windows-install/"
link="/desktop/setup/install/windows-install/"
icon="/assets/images/windows_48.svg" >}}

<br>
Expand Down
4 changes: 2 additions & 2 deletions content/get-started/introduction/get-docker-desktop.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ This guide will walk you through the installation process, enabling you to exper
{{< card
title="Docker Desktop for Mac"
description="[Download (Apple Silicon)](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64) | [Download (Intel)](https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64) | [Install instructions](/desktop/install/mac-install)"
description="[Download (Apple Silicon)](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64) | [Download (Intel)](https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64) | [Install instructions](/desktop/setup/install/mac-install)"
icon="/assets/images/apple_48.svg" >}}

<br>

{{< card
title="Docker Desktop for Windows"
description="[Download](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-windows) | [Install instructions](/desktop/install/windows-install)"
description="[Download](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-windows) | [Install instructions](/desktop/setup/install/windows-install)"
icon="/assets/images/windows_48.svg" >}}

<br>
Expand Down
2 changes: 1 addition & 1 deletion content/guides/rust/develop.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ aliases:
## Prerequisites

- You have installed the latest version of [Docker Desktop](/get-started/get-docker.md).
- You have completed the walkthroughs in the Docker Desktop [Learning Center](/manuals/desktop/get-started.md) to learn about Docker concepts.
- You have completed the walkthroughs in the Docker Desktop [Learning Center](/manuals/desktop/use-desktop/_index.md) to learn about Docker concepts.
- You have a [git client](https://git-scm.com/downloads). The examples in this section use a command-line based git client, but you can use any client.

## Overview
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/compose/install/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ The easiest and recommended way to get Docker Compose is to install Docker Deskt
includes Docker Compose along with Docker Engine and Docker CLI which are Compose prerequisites.

Docker Desktop is available on:
- [Linux](/manuals/desktop/install/linux/_index.md)
- [Mac](/manuals/desktop/install/mac-install.md)
- [Windows](/manuals/desktop/install/windows-install.md)
- [Linux](/manuals/desktop/setup/install/linux/_index.md)
- [Mac](/manuals/desktop/setup/install/mac-install.md)
- [Windows](/manuals/desktop/setup/install/windows-install.md)

If you have already installed Docker Desktop, you can check which version of Compose you have by selecting **About Docker Desktop** from the Docker menu {{< inline-image src="../../desktop/images/whale-x.svg" alt="whale menu" >}}.

Expand Down
2 changes: 1 addition & 1 deletion content/manuals/compose/releases/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -3848,7 +3848,7 @@ The highlights:

This means the GitHub repository has moved to [https://github.com/docker/fig](https://github.com/docker/fig) and our IRC channel is now #docker-fig on Freenode.

- Fig can be used with the [official Docker OS X installer](/manuals/desktop/install/mac-install.md). Boot2Docker will mount the home directory from your host machine so volumes work as expected.
- Fig can be used with the [official Docker OS X installer](/manuals/desktop/setup/install/mac-install.md). Boot2Docker will mount the home directory from your host machine so volumes work as expected.

- Fig supports Docker 1.3.

Expand Down
4 changes: 2 additions & 2 deletions content/manuals/desktop/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ grid:
- title: Install Docker Desktop
description: |
Install Docker Desktop on
[Mac](/desktop/install/mac-install/),
[Windows](/desktop/install/windows-install/), or
[Mac](/desktop/setup/install/mac-install/),
[Windows](/desktop/setup/install/windows-install/), or
[Linux](/desktop/install/linux/).
icon: download
- title: Explore Docker Desktop
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/desktop/previous-versions/2.x-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus

### New

- Windows 10 Home users can now use Docker Desktop through WSL 2. This requires Windows 10, version 2004 or higher. For more information, see [Install Docker Desktop on Windows](../install/windows-install.md).
- Windows 10 Home users can now use Docker Desktop through WSL 2. This requires Windows 10, version 2004 or higher. For more information, see [Install Docker Desktop on Windows](/manuals/desktop/setup/install/windows-install.md).
- Docker Desktop introduces a new onboarding tutorial upon first startup. The Quick Start tutorial guides users to get started with Docker in a few easy steps. It includes a simple exercise to build an example Docker image, run it as a container, push and save the image to Docker Hub.
- Docker Desktop now allows sharing individual folders, rather than whole drives, giving more control to users over what is being shared.

Expand Down
2 changes: 1 addition & 1 deletion content/manuals/desktop/previous-versions/3.x-mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ This page contains release notes for Docker Desktop for Mac 3.x.

### New

Docker Desktop is now available for Apple silicon as well as Intel chips. This enables developers with their choice of local development environments, and extends development pipelines for ARM-based applications. For more information, see [Docker Desktop for Apple silicon](../install/mac-install.md).
Docker Desktop is now available for Apple silicon as well as Intel chips. This enables developers with their choice of local development environments, and extends development pipelines for ARM-based applications. For more information, see [Docker Desktop for Apple silicon](/manuals/desktop/setup/install/mac-install.md).

### Bug fixes and minor changes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sitemap: false
This page contains information about Docker Desktop Edge releases. Edge releases give you early access to our newest features. Note that some of the features may be experimental, and some of them may not ever reach the Stable release.

For Docker Desktop system requirements, see
[What to know before you install](../install/mac-install.md#system-requirements).
[What to know before you install](/manuals/desktop/setup/install/mac-install.md#system-requirements).

## Docker Desktop Community 2.5.4
2020-12-07
Expand Down Expand Up @@ -1855,7 +1855,7 @@ events or unexpected unmounts.

**New**

* Docker for Mac is now available from 2 channels: **stable** and **beta**. New features and bug fixes will go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see the [installation guide](../install/mac-install.md).
* Docker for Mac is now available from 2 channels: **stable** and **beta**. New features and bug fixes will go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker Engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see the [installation guide](/manuals/desktop/setup/install/mac-install.md).

**Upgrades**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sitemap: false
This page contains information about Docker Desktop Edge releases. Edge releases give you early access to our newest features. Note that some of the features may be experimental, and some of them may not ever reach the Stable release.

For Docker Desktop system requirements, see
[What to know before you install](../install/windows-install.md#system-requirements).
[What to know before you install](/manuals/desktop/setup/install/windows-install.md#system-requirements).

## Docker Desktop Community 2.5.4
2020-12-07
Expand Down Expand Up @@ -2006,7 +2006,7 @@ Unreleased. See Beta 23 for changes.

**New**

* Docker for Windows is now available from two channels: **stable** and **beta**. New features and bug fixes go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see [Install Docker Desktop on Windows](../install/windows-install.md).
* Docker for Windows is now available from two channels: **stable** and **beta**. New features and bug fixes go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker Engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see [Install Docker Desktop on Windows](/manuals/desktop/setup/install/windows-install.md).

* Removed the docker host name. Containers with exported ports are reachable via localhost.

Expand Down
14 changes: 7 additions & 7 deletions content/manuals/desktop/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec

### New

- Support for [Docker Desktop on Red Hat Enterprise Linux](/manuals/desktop/install/linux/rhel.md) is now generally available.
- Support for [Docker Desktop on Red Hat Enterprise Linux](/manuals/desktop/setup/install/linux/rhel.md) is now generally available.
- Volume Backup and Share is now generally available and can be found in the **Volumes** view.
- Terminal support within Docker Desktop using system shells is now generally available.
- Beta release of Docker VMM - the more performant alternative to Apple Virtualization Framework on macOS (requires Apple Silicon and macOS 12.5 or later).
Expand Down Expand Up @@ -165,7 +165,7 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec
- [Host networking](/manuals/engine/network/drivers/host.md#docker-desktop) support on Docker Desktop is now generally available.
- If you authenticate via the CLI, you can now authenticate through a browser-based flow, removing the need for manual PAT generation.
- Windows now supports automatic reclamation of disk space in Docker Desktop for WSL2 installations [using a managed virtual hard disk](/manuals/desktop/wsl/best-practices.md).
- Deploying Docker Desktop via the [MSI installer](/manuals/desktop/install/msi/_index.md) is now generally available.
- Deploying Docker Desktop via the [MSI installer](/manuals/desktop/setup/install/msi/_index.md) is now generally available.
- Two new methods to [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) (windows registry key and `.plist` file) are now generally available.
- Fresh installations of Docker Desktop now use the containerd image store by default.
- [Compose Bridge](/manuals/compose/bridge/_index.md) (Experimental) is now available from the Compose file viewer. Easily convert and deploy your Compose project to a Kubernetes cluster.
Expand Down Expand Up @@ -347,7 +347,7 @@ For more information, see [microsoft/WSL#11794](https://github.com/microsoft/WSL
#### For Windows

- Fixed an issue on the WSL 2 engine where Docker Desktop would not detect the existence of the `docker-desktop-data` distribution if it had been manually moved by the user.
- The Windows on ARM installer and the [privileged service](/manuals/desktop/install/windows-permission-requirements.md#privileged-helper) are now built for ARM64.
- The Windows on ARM installer and the [privileged service](/manuals/desktop/setup/install/windows-permission-requirements.md#privileged-helper) are now built for ARM64.

#### For Mac

Expand Down Expand Up @@ -1406,7 +1406,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st

- Improved `docker scout compare` command to compare two images, now also aliased under `docker scout diff`.
- Added more details to dashboard errors when a `docker-compose` action fails ([docker/for-win#13378](https://github.com/docker/for-win/issues/13378)).
- Added support for setting HTTP proxy configuration during installation. This can be done via the `--proxy-http-mode`, `--overrider-proxy-http`, `--override-proxy-https` and `--override-proxy-exclude` installer flags in the case of installation from the CLI on [Mac](install/mac-install.md#install-from-the-command-line) and [Windows](install/windows-install.md#install-from-the-command-line), or alternatively by setting the values in the `install-settings.json` file.
- Added support for setting HTTP proxy configuration during installation. This can be done via the `--proxy-http-mode`, `--overrider-proxy-http`, `--override-proxy-https` and `--override-proxy-exclude` installer flags in the case of installation from the CLI on [Mac](/manuals/desktop/setup/install/mac-install.md#install-from-the-command-line) and [Windows](/manuals/desktop/setup/install/windows-install.md#install-from-the-command-line), or alternatively by setting the values in the `install-settings.json` file.
- Docker Desktop now stops overriding .docker/config.json `credsStore` keys on application start. Note that if you use a custom credential helper then the CLI `docker login` and `docker logout` does not affect whether the UI is signed in to Docker or not. In general, it is better to sign into Docker via the UI since the UI supports multi-factor authentication.
- Added a warning about the [forthcoming removal of Compose V1 from Docker Desktop](/manuals/compose/releases/migrate.md). Can be suppressed with `COMPOSE_V1_EOL_SILENT=1`.
- In the Compose config, boolean fields in YAML should be either `true` or `false`. Deprecated YAML 1.1 values such as “on” or “no” now produce a warning.
Expand Down Expand Up @@ -2020,7 +2020,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st

### New

- Docker Desktop is now fully supported for Docker Business customers inside VMware ESXi and Azure VMs. For more information, see [Run Docker Desktop inside a VM or VDI environment](/manuals/desktop/vm-vdi.md)
- Docker Desktop is now fully supported for Docker Business customers inside VMware ESXi and Azure VMs. For more information, see [Run Docker Desktop inside a VM or VDI environment](/manuals/desktop/setup/vm-vdi.md)
- Added two new extensions ([vcluster](https://hub.docker.com/extensions/loftsh/vcluster-dd-extension) and [PGAdmin4](https://hub.docker.com/extensions/mochoa/pgadmin4-docker-extension)) to the Extensions Marketplace.
- The ability to sort extensions has been added to the Extensions Marketplace.
- Fixed a bug that caused some users to be asked for feedback too frequently. You'll now only be asked for feedback twice a year.
Expand Down Expand Up @@ -2238,7 +2238,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st

### New

- Released [Docker Desktop for Linux](/manuals/desktop/install/linux/_index.md).
- Released [Docker Desktop for Linux](/manuals/desktop/setup/install/linux/_index.md).
- Beta release of [Docker Extensions](/manuals/extensions/_index.md) and Extensions SDK.
- Created a Docker Homepage where you can run popular images and discover how to use them.
- [Compose V2 is now GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/)
Expand All @@ -2259,7 +2259,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st

### New

- Released [Docker Desktop for Linux](/manuals/desktop/install/linux/_index.md).
- Released [Docker Desktop for Linux](/manuals/desktop/setup/install/linux/_index.md).
- Beta release of [Docker Extensions](/manuals/extensions/_index.md) and Extensions SDK.
- Created a Docker Homepage where you can run popular images and discover how to use them.
- [Compose V2 is now GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/)
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/desktop/settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,8 @@ On Mac, you can reconfigure your initial installation settings on the **Advance
```
3. Save and the close the file. Restart your shell to apply the changes to the PATH variable.

- **Enable default Docker socket (Requires password)**. Creates `/var/run/docker.sock` which some third party clients may use to communicate with Docker Desktop. For more information, see [permission requirements for macOS](/manuals/desktop/install/mac-permission-requirements.md#installing-symlinks).
- **Enable default Docker socket (Requires password)**. Creates `/var/run/docker.sock` which some third party clients may use to communicate with Docker Desktop. For more information, see [permission requirements for macOS](/manuals/desktop/setup/install/mac-permission-requirements.md#installing-symlinks).

- **Enable privileged port mapping (Requires password)**. Starts the privileged helper process which binds the ports that are between 1 and 1024. For more information, see [permission requirements for macOS](/manuals/desktop/install/mac-permission-requirements.md#binding-privileged-ports).
- **Enable privileged port mapping (Requires password)**. Starts the privileged helper process which binds the ports that are between 1 and 1024. For more information, see [permission requirements for macOS](/manuals/desktop/setup/install/mac-permission-requirements.md#binding-privileged-ports).

For more information on each configuration and use case, see [Permission requirements](/manuals/desktop/install/mac-permission-requirements.md).
For more information on each configuration and use case, see [Permission requirements](/manuals/desktop/setup/install/mac-permission-requirements.md).
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
build:
render: never
title: Install
title: Setup
weight: 10
---
---
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
description: Allowlist for Docker Desktop for Business customers
keywords: Docker Desktop, allowlist, allow list, firewall
title: Allowlist for Docker Desktop
linkTitle: Allowlist
weight: 100
aliases:
- /desktop/allow-list/
---

This page contains the domain URLs that you need to add to a firewall allowlist to ensure Docker Desktop works properly within your organization.
Expand Down
8 changes: 8 additions & 0 deletions content/manuals/desktop/setup/install/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
build:
render: never
title: Install
weight: 10
aliases:
- /desktop/install/
---
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ weight: 60
aliases:
- /desktop/linux/install/
- /desktop/install/linux-install/
- /desktop/install/linux/
---

> **Docker Desktop terms**
Expand Down Expand Up @@ -140,7 +141,7 @@ To install Docker Desktop successfully, your Linux host must meet the following
- For many Linux distros, the Gnome environment does not support tray icons. To add support for tray icons, you need to install a Gnome extension. For example, [AppIndicator](https://extensions.gnome.org/extension/615/appindicator-support/).
- At least 4 GB of RAM.
- Enable configuring ID mapping in user namespaces, see [File sharing](/manuals/desktop/faqs/linuxfaqs.md#how-do-i-enable-file-sharing). Note that for Docker Desktop version 4.35 and later, this is not required anymore.
- Recommended: [Initialize `pass`](/manuals/desktop/get-started.md#credentials-management-for-linux-users) for credentials management.
- Recommended: [Initialize `pass`](/manuals/desktop/setup/sign-in.md#credentials-management-for-linux-users) for credentials management.

Docker Desktop for Linux runs a Virtual Machine (VM). For more information on why, see [Why Docker Desktop for Linux runs a VM](/manuals/desktop/faqs/linuxfaqs.md#why-does-docker-desktop-for-linux-run-a-vm).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ linkTitle: Arch
aliases:
- /desktop/linux/install/archlinux/
- /desktop/install/archlinux/
- /desktop/install/linux/archlinux/
---

> **Docker Desktop terms**
Expand Down
Loading

0 comments on commit 3ea0cd7

Please sign in to comment.