Skip to content

Commit

Permalink
Merge pull request #20078 from docker/published-update
Browse files Browse the repository at this point in the history
publish updates from main
  • Loading branch information
craig-osterhout committed May 22, 2024
2 parents 695cffe + f856b30 commit 457caab
Show file tree
Hide file tree
Showing 57 changed files with 53 additions and 802 deletions.
2 changes: 1 addition & 1 deletion content/desktop/install/debian.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ $ sudo apt-get install ./docker-desktop-<version>-<arch>.deb

## Next steps

- Take a look at the [Get started](../../guides/get-started/_index.md) training modules to learn how to build an image and run it as a containerized application.
- Take a look at the [Get started](../../get-started/_index.md) training modules to learn how to build an image and run it as a containerized application.
- [Explore Docker Desktop](../use-desktop/index.md) and all its features.
- Review the topics in [Develop with Docker](../../develop/index.md) to learn how to build new applications using Docker.
2 changes: 1 addition & 1 deletion content/desktop/install/fedora.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ $ sudo dnf install ./docker-desktop-<version>-<arch>.rpm

## Next steps

- Take a look at the [Get started](../../guides/get-started/_index.md) training modules to learn how to build an image and run it as a containerized application.
- Take a look at the [Get started](../../get-started/_index.md) training modules to learn how to build an image and run it as a containerized application.
- [Explore Docker Desktop](../use-desktop/index.md) and all its features.
- Review the topics in [Develop with Docker](../../develop/index.md) to learn how to build new applications using Docker.
2 changes: 1 addition & 1 deletion content/desktop/install/linux-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ Sign out and sign back in so that your group membership is re-evaluated.
## Where to go next

- Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you.
- [Get started with Docker](../../guides/get-started/_index.md).
- [Get started with Docker](../../get-started/_index.md).
- [Explore Docker Desktop](../use-desktop/index.md) and all its features.
- [Troubleshooting](../troubleshoot/overview.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues.
- [FAQs](../faqs/general.md) provide answers to frequently asked questions.
Expand Down
2 changes: 1 addition & 1 deletion content/desktop/install/mac-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ The `install` command accepts the following flags:
## Where to go next

- Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you.
- [Get started with Docker](../../guides/get-started/_index.md).
- [Get started with Docker](../../get-started/_index.md).
- [Explore Docker Desktop](../use-desktop/index.md) and all its features.
- [Troubleshooting](../troubleshoot/overview.md) describes common problems, workarounds, how
to run and submit diagnostics, and submit issues.
Expand Down
2 changes: 1 addition & 1 deletion content/desktop/install/rhel.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@ $ sudo dnf install ./docker-desktop-<version>-<arch>-rhel.rpm

## Next steps

- Take a look at the [Get started](../../guides/get-started/_index.md) training modules to learn how to build an image and run it as a containerized application.
- Take a look at the [Get started](../../get-started/_index.md) training modules to learn how to build an image and run it as a containerized application.
- [Explore Docker Desktop](../use-desktop/index.md) and all its features.
- Review the topics in [Develop with Docker](../../develop/index.md) to learn how to build new applications using Docker.
2 changes: 1 addition & 1 deletion content/desktop/install/ubuntu.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@ $ sudo apt-get install ./docker-desktop-<version>-<arch>.deb

## Next steps

- Take a look at the [Get started](../../guides/get-started/_index.md) training modules to learn how to build an image and run it as a containerized application.
- Take a look at the [Get started](../../get-started/_index.md) training modules to learn how to build an image and run it as a containerized application.
- [Explore Docker Desktop](../use-desktop/index.md) and all its features.
- Review the topics in [Develop with Docker](../../develop/index.md) to learn how to build new applications using Docker.
4 changes: 2 additions & 2 deletions content/desktop/install/windows-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ For more information on setting up WSL 2 with Docker Desktop, see [WSL](../wsl/_

> **Note**
>
> Docker only supports Docker Desktop on Windows for those versions of Windows that are still within [Microsoft’s servicing timeline](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet).
> Docker only supports Docker Desktop on Windows for those versions of Windows that are still within [Microsoft’s servicing timeline](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet). Docker Desktop is not supported on server versions of Windows, such as Windows Server 2019 or Windows Server 2022. For more information on how to run containers on Windows Server, see [Microsoft's official documentation](https://learn.microsoft.com/virtualization/windowscontainers/quick-start/set-up-environment).
> **Should I use Hyper-V or WSL?**
>
Expand Down Expand Up @@ -255,7 +255,7 @@ Docker Desktop does not start automatically after installation. To start Docker
## Where to go next

- Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you.
- [Get started with Docker](../../guides/get-started/_index.md).
- [Get started with Docker](../../get-started/_index.md).
- [Explore Docker Desktop](../use-desktop/index.md) and all its features.
- [Troubleshooting](../troubleshoot/overview.md) describes common problems, workarounds, and
how to get support.
Expand Down
5 changes: 2 additions & 3 deletions content/desktop/use-desktop/container.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,5 @@ can also:

## Additional resources

- [What is a container](../../guides/walkthroughs/what-is-a-container.md)
- [Run a container](../../guides/walkthroughs/run-a-container.md)
- [Run multi-container applications](../../guides/walkthroughs/multi-container-apps.md)
- [What is a container](../../guides/docker-concepts/the-basics/what-is-a-container.md)
- [Run multi-container applications](../../guides/docker-concepts/running-containers/multi-container-applications.md)
3 changes: 1 addition & 2 deletions content/desktop/use-desktop/images.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,5 +102,4 @@ Hovering over an image tag reveals two options:

## Additional resources

- [Run Docker Hub images](../../guides/walkthroughs/run-hub-images.md)
- [Publish your image](../../guides/walkthroughs/publish-your-image.md)
- [What is an image?](../../guides/docker-concepts/the-basics/what-is-an-image.md)
2 changes: 1 addition & 1 deletion content/desktop/use-desktop/volumes.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,5 +174,5 @@ to confirm.

## Additional resources

- [Persist container data](../../guides/walkthroughs/persist-data.md)
- [Persisting container data](../../guides/docker-concepts/running-containers/persisting-container-data.md)
- [Use volumes](../../storage/volumes.md)
4 changes: 2 additions & 2 deletions content/desktop/vm-vdi.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ Nested virtualization of other hypervisors like Hyper-V inside a vSphere VM [is
For steps on how to expose hardware-assisted virtualization to the guest OS, [see VMware's documentation](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-2A98801C-68E8-47AF-99ED-00C63E4857F6.html).


### Turn on nested virtualization on Microsoft Hyper-V
### Turn on nested virtualization on an Azure Virtual Machine

Nested virtualization is supported by Microsoft for running Hyper-V inside an Azure VM.

For Azure virtual machines, [check that the VM size chosen supports nested virtualization](https://docs.microsoft.com/en-us/azure/virtual-machines/sizes). Microsoft provides [a helpful list on Azure VM sizes](https://docs.microsoft.com/en-us/azure/virtual-machines/acu) and highlights the sizes that currently support nested virtualization. For internal testing, we used D4s_v5 machines. We recommend this specification or above for optimal performance of Docker Desktop.
For Azure virtual machines, [check that the VM size chosen supports nested virtualization](https://docs.microsoft.com/en-us/azure/virtual-machines/sizes). Microsoft provides [a helpful list on Azure VM sizes](https://docs.microsoft.com/en-us/azure/virtual-machines/acu) and highlights the sizes that currently support nested virtualization. For internal testing, we used D4s_v5 machines. We recommend this specification or above for optimal performance of Docker Desktop.
2 changes: 2 additions & 0 deletions content/get-started/06_bind_mounts.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
title: Use bind mounts
keywords: 'get started, setup, orientation, quickstart, intro, concepts, containers, docker desktop'
description: Using bind mounts in our application
aliases:
- /guides/walkthroughs/access-local-folder/
---

In [part 5](./05_persisting_data.md), you used a volume mount to persist the
Expand Down
1 change: 1 addition & 0 deletions content/get-started/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ aliases:
- /windows/step_six/
- /windows/step_three/
- /windows/step_two/
- /guides/get-started/
---

This guide contains step-by-step instructions on how to get started with Docker. This guide shows you how to:
Expand Down
2 changes: 1 addition & 1 deletion content/guides/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ get-started:
icon: summarize
- title: Get started
description: Get started with the basics and the benefits of containerizing your applications.
link: /guides/get-started/
link: /get-started/
icon: rocket
- title: Docker concepts
description: Gain a better understanding of foundational Docker concepts.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,5 @@ In this guide, you learned how easy it is to use Docker Compose to start and sto
## Additional resources

* [`docker container run` CLI reference](reference/cli/docker/container/run/)
* [Run multi-container applications](/guides/walkthroughs/multi-container-apps/)
* [What is Docker Compose](/guides/docker-concepts/the-basics/what-is-docker-compose/)

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
title: Persisting container data
keywords: concepts, build, images, container, docker desktop
description: This concept page will teach you the significance of data persistence in Docker
aliases:
- /guides/walkthroughs/persist-data/
---

{{< youtube-embed 10_2BjqB_Ls >}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
title: What is a container?
keywords: concepts, build, images, container, docker desktop
description: What is a container? This concept page will teach you about containers and provide a quick hands-on where you will run your first container.
aliases:
- /guides/walkthroughs/what-is-a-container/
- /guides/walkthroughs/run-a-container/
- /guides/walkthroughs/
---

{{< youtube-embed W1kWqFkiu7k >}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
title: What is a registry?
keywords: concepts, build, images, container, docker desktop
description: What is a registry? This Docker Concept will explain what a registry is, explore their interoperability, and have you interact with registries.
aliases:
- /guides/walkthroughs/run-hub-images/
- /guides/walkthroughs/publish-your-image/
---

{{< youtube-embed 2WDl10Wv5rs >}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
title: What is Docker Compose?
keywords: concepts, build, images, container, docker desktop
description: What is Docker Compose?
aliases:
- /guides/walkthroughs/multi-container-apps/
---

{{< youtube-embed xhcUIK4fGtY >}}
Expand Down
57 changes: 0 additions & 57 deletions content/guides/get-started/_index.md

This file was deleted.

2 changes: 1 addition & 1 deletion content/guides/use-case/genai-video-bot/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ The following image shows the application's high-level service architecture, whi
The application uses Docker to run the application in containers, providing a
consistent and isolated environment for running it. This means the application
will operate as intended within its Docker containers, regardless of the
underlying system differences. To learn more about Docker, see the [Getting started overview](../../get-started/_index.md).
underlying system differences. To learn more about Docker, see the [Getting started overview](../../../get-started/_index.md).

Docker Compose is a tool for defining and running multi-container applications.
Compose makes it easy to run this application with a single command, `docker
Expand Down
91 changes: 0 additions & 91 deletions content/guides/walkthroughs/access-local-folder.md

This file was deleted.

58 changes: 0 additions & 58 deletions content/guides/walkthroughs/containerize-your-app.md

This file was deleted.

Binary file removed content/guides/walkthroughs/images/bind-mounts.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed content/guides/walkthroughs/images/persist-data.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 457caab

Please sign in to comment.