Container tools august (#8515)

* Toc and seo changes

* seo work

* Add CTW to overview

* link to Containers window

* start stubbing out sections

* CTW work

* fix image link

* Continued improvements in CTW and linkage

* Fix link

* add Dockerfile and link to CTW in Container Build

* fix link

* change link wording

* remove Kubernetes support

* incorporate feedback

* more feedback changes

* Fix warning and suggestion

* add gray border

* add image and fix table

* small fixes

* fix typo

* Add missing table entry

* add link

Author: ghogen

docs/containers/container-build.md

@@ -97,7 +97,9 @@ Warmup will only happen in **Fast** mode, so the running container will have the
 
 ## Volume mapping
 
-For debugging to work in containers, Visual Studio uses volume mapping to map the debugger and NuGet folders from the host machine. Volume mapping is described in the Docker documentation [here](https://docs.docker.com/storage/volumes/). Here are the volumes that are mounted in your container:
+For debugging to work in containers, Visual Studio uses volume mapping to map the debugger and NuGet folders from the host machine. Volume mapping is described in the Docker documentation [here](https://docs.docker.com/storage/volumes/). You can view the volume mappings for a container by using the [Containers window in Visual Studio](view-and-diagnose-containers.md).
+
+Here are the volumes that are mounted in your container:
 
 |Volume|Description|
 |-|-|

docs/containers/container-tools-configure.md

@@ -56,8 +56,24 @@ The following table describes **Single Project** and **Docker Compose** settings
 | Name | Default Setting | Applies To | Description |
 | -----|:---------------:|:----------:| ----------- |
 | Pull required Docker images on project open | True | Single Project, Docker Compose | For increased performance when loading projects, Visual Studio will start a Docker pull operation in the background so that when you're ready to run your code, the image is already downloaded or in the process of downloading. If you're just loading projects and browsing code, you can set to **False** to avoid downloading container images you don't need. |
+| Pull updated Docker images on project open | .NET Core projects | Single Project, Docker Compose | When you open a project, check for updates to images and download if available. |
 | Run containers on project open | True | Single Project, Docker Compose | Again for increased performance, Visual Studio creates a container ahead of time so that it's ready for when you build and run your container. If you want to control when your container is created, set to **False**. |
-| Stop containers on project close | True | Single Project and Docker Compose | Set to **False** if you would like containers for your solution to continue to run after closing the solution or closing Visual Studio. |
+| Remove containers on project close | True | Single Project, Docker Compose | Set to **False** if you would like containers for your solution to be retained after closing the solution or closing Visual Studio. |
+
+The **Containers Tool Window** settings control the settings that apply to the **Containers** tool window, which shows information about Docker containers and images. See [Use the Containers window](view-and-diagnose-containers.md)
+
+![Visual Studio Container Tools Options, showing the settings available for the Containers tool window](media/configure-container-tools/tools-options-3.png)
+
+The following table describes the **Containers** window settings:
+
+
+| Name | Default Setting | Description |
+| -----|:---------------:| ----------- |
+| Confirm before pruning containers | Always | Controls whether you are prompted when pruning unused containers. |
+| Confirm before pruning images | Always | Controls whether you are prompted when pruning unused images. |
+| Confirm before removing a container | Always | Controls whether you are prompted when removing a container. |
+| Confirm before removing an image | Always | Controls whether you are prompted when removing an image. |
+| Confirm before running large number of images | Always | Controls whether you are prompted before starting containers from more than 10 images at a time. |
 
 ::: moniker-end
 > [!WARNING]

docs/containers/includes/vs-2017/container-tools.md

@@ -1,5 +1,5 @@
 ---
-title: Visual Studio Container Tools with ASP.NET Core
+title: Visual Studio Container Tools for Docker with ASP.NET on Windows
 author: ghogen
 description: Learn how to use Visual Studio 2017 tooling and Docker for Windows
 ms.author: ghogen

docs/containers/includes/vs-2019/container-tools.md

@@ -1,5 +1,5 @@
 ---
-title: Visual Studio Tools for Docker with ASP.NET
+title: Visual Studio Container Tools for Docker with ASP.NET on Windows
 author: ghogen
 description: Learn how to use Visual Studio 2019 tooling and Docker for Windows
 ms.author: ghogen
@@ -84,7 +84,7 @@ In the window, find your container and step through each tab to view the environ
 
 ![Screenshot of Containers window](../../media/overview/vs-2019/container-tools-window.png)
 
-For more information, see [View and diagnose containers and images in Visual Studio](../../view-and-diagnose-containers.md).
+For more information, see [Use the Containers window](../../view-and-diagnose-containers.md).
 
 ## Publish Docker images
 

docs/containers/index.yml

@@ -58,11 +58,13 @@ landingContent:
     linkLists:
       - linkListType: how-to-guide
         links:
-          - text: 'How to: Configure the build and debug environment'
-            url: container-build.md
-          - text: 'How to: View and diagnose containers'
+          - text: 'Use the Containers window'
             url: view-and-diagnose-containers.md
-          - text: 'How to: Troubleshoot container development tools'
+          - text: 'Launch a subset of your Compose services'
+            url: launch-profiles.md
+          - text: 'Configure the build and debug environment'
+            url: container-build.md
+          - text: 'Troubleshoot container development tools'
             url: troubleshooting-docker-errors.md
 
   - title: Container tools settings

docs/containers/launch-profiles.md

@@ -10,7 +10,7 @@ ms.date: 05/10/2021
 ms.author: ghogen
 monikerRange: ">=vs-2019"
 ---
-# Manage launch profiles for Docker Compose
+# Launch a subset of Compose services
 
 If you have an application that consists of multiple services and uses Docker Compose, you can configure which services run and debug by creating or editing an existing launch profile in Docker Compose launch settings. Launch profiles allow you to dynamically run only the services that matter to your current scenario. You can create and select from launch profiles in order to customize your debugging experience and set specific launch actions such as `Browser Launch URL`. You will also have the option of either choosing each service individually or by choosing a Docker Compose profile, which also looks at your Compose file to determine the group of services to run.
 
@@ -19,7 +19,7 @@ For information about Docker Compose profiles, see [Using profiles with Compose]
 ## Prerequisites
 
 - [Visual Studio 2019 version 16.10](https://visualstudio.microsoft.com/vs/) or later
-- A solution with [Container Orchestration with Docker Compose](tutorial-multicontainer.md)
+- A .NET solution with [Container Orchestration with Docker Compose](tutorial-multicontainer.md)
 
 ## Manage launch settings
 

docs/containers/media/configure-container-tools/tools-options-1.png

@@ -1,15 +1,15 @@
 ---
-title: Visual Studio Container Tools on Windows
+title: Visual Studio Container Tools for Docker on Windows
 description: Get to know the tools available in Visual Studio for working with Docker
 author: ghogen
 ms.author: ghogen
 ms.topic: overview
-ms.date: 03/20/2019
+ms.date: 08/24/2021
 ms.technology: vs-container-tools
 ---
-# Container Tools in Visual Studio
+# Visual Studio Container Tools for Docker
 
-The tools included in Visual Studio for developing with containers are easy to use, and greatly simplify building, debugging, and deployment for containerized applications. You can work with a container for a single project, or use container orchestration with Docker Compose, Service Fabric, or Kubernetes to work with multiple services in containers.
+The tools included in Visual Studio for developing with Docker containers are easy to use, and greatly simplify building, debugging, and deployment for containerized applications. You can work with a container for a single project, or use container orchestration with Docker Compose or Service Fabric to work with multiple services in containers.
 
 ::: moniker range="vs-2017"
 
@@ -21,14 +21,14 @@ The tools included in Visual Studio for developing with containers are easy to u
 
 ## Docker support in Visual Studio
 
-Docker support is available for ASP.NET projects, ASP.NET Core projects, and .NET Core and .NET Framework console projects.
+Docker support is available for ASP.NET projects, ASP.NET Core projects, Azure Functions, and .NET Core and .NET Framework console projects.
 
 The support for Docker in Visual Studio has changed over a number of releases in response to customer needs. There are two levels of Docker support you can add to a project, and the supported options vary by the type of project and the version of Visual Studio. With some supported project types, if you just want a container for a single project, without using orchestration, you can do that by adding Docker support.  The next level is container orchestration support, which adds appropriate support files for the particular orchestrator you choose.
 
-With Visual Studio 2017, you can use Docker Compose and Service Fabric as container orchestration services.  You can also use Kubernetes if you install the [Visual Studio Tools for Kubernetes](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vs-tools-for-kubernetes).
+With Visual Studio 2017, you can use Docker Compose and Service Fabric as container orchestration services.
 
 > [!NOTE]
-> If you are using a version of Visual Studio 2017 prior to 15.8, or you are using the .NET Framework project template (not .NET Core), when you add Docker support, orchestration support using Docker Compose is added automatically. Container orchestration support, via Docker Compose, is added automatically in Visual Studio 2017 versions 15.0 to 15.7 and for .NET Framework projects.
+> If you are using a version of Visual Studio 2017 prior to 15.8, or you are using the .NET Framework project template (not .NET Core), when you add Docker support, orchestration support using Docker Compose is added automatically. 
 
 ::: moniker-end
 
@@ -52,7 +52,7 @@ With Visual Studio 2019, you can use Docker Compose, Kubernetes, and Service Fab
 > [!NOTE]
 > If you are using the full .NET Framework console project template, the supported option is **Add Container Orchestrator support** after project creation, with options to use Service Fabric or Docker Compose. Adding support at project creation and **Add Docker support** for a single project without orchestration are not available options.
 
-In Visual Studio 2019 version 16.4 and later, the **Containers** window is available, which lets you view running containers, browse available images, view environment variables, logs, and port mappings, inspect the filesystem, attach a debugger, or open a terminal window inside the container environment. See [View and diagnose containers and images in Visual Studio](view-and-diagnose-containers.md).
+In Visual Studio 2019 version 16.4 and later, the **Containers** window is available, which lets you view running containers, browse available images, view environment variables, logs, and port mappings, inspect the filesystem, attach a debugger, or open a terminal window inside the container environment. See [Use the Containers window](view-and-diagnose-containers.md).
 
 ::: moniker-end
 
@@ -80,11 +80,32 @@ When you add or enable Docker support, Visual Studio adds the following to the p
 - a .dockerignore file
 - a NuGet package reference to the Microsoft.VisualStudio.Azure.Containers.Tools.Targets
 
-::: moniker range=">=vs-2019"
-The solution looks like this once you add Docker support:
+The Dockerfile you add will resemble the following code. In this example, the project was named `WebApplication-Docker`.
 
-![Screenshot of solution explorer with Dockerfile and .dockerignore file](media/overview/vs-2019/dockerfile-dockerignore.png)
-::: moniker-end
+```Dockerfile
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:3.1 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
+WORKDIR /src
+COPY ["WebApplication-Docker/WebApplication-Docker.csproj", "WebApplication-Docker/"]
+RUN dotnet restore "WebApplication-Docker/WebApplication-Docker.csproj"
+COPY . .
+WORKDIR "/src/WebApplication-Docker"
+RUN dotnet build "WebApplication-Docker.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "WebApplication-Docker.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "WebApplication-Docker.dll"]
+```
 
 ::: moniker range="vs-2017"
 > [!NOTE]
@@ -93,6 +114,18 @@ The solution looks like this once you add Docker support:
 ![Enable Docker compose support for an ASP.NET project](media/overview/enable-docker-compose-support.png)
 ::: moniker-end
 
+## Use the Containers window
+
+The **Containers** window lets you view containers and images on your machine and see what's going on with them. You can view the filesystem, volumes mounted, environment variables, ports used, and examine log files.
+
+Open the **Containers** window by using the quick launch (**Ctrl**+**Q**) and typing `containers`. You can use the docking controls to put the window somewhere. Because of the width of the window, it works best when docked at the bottom of the screen.
+
+Select a container, and use the tabs to view the information that's available. To check it out, run your Docker-enabled app, open the **Files** tab, and expand the **app** folder to see your deployed app on the container.
+
+![Screenshot of Containers window](media/overview/vs-2019/container-tools-window-2.png)
+
+For more information, see [Use the Containers window](view-and-diagnose-containers.md).
+
 ## Docker Compose support
 
 When you want to compose a multi-container solution using Docker Compose, add container orchestration support to your projects. This lets you run and debug a group of containers (a whole solution or group of projects) at the same time if they're defined in the same *docker-compose.yml* file.
@@ -107,13 +140,7 @@ If *docker-compose.yml* already exists, Visual Studio just adds the required lin
 
 Repeat the process with the other projects that you want to control using Docker Compose.
 
-## Kubernetes support
-
-::: moniker range="vs-2017"
-To add Kubernetes support, install the [Visual Studio Tools for Kubernetes](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vs-tools-for-kubernetes).
-::: moniker-end
-
-With Kubernetes support, you can enable a connection between your local project and a Kubernetes cluster running in [Azure Kubernetes Service (AKS)](/azure/aks), and thereby modify and debug your services running using Visual Studio.  This service is provided by [Bridge to Kubernetes](/visualstudio/bridge/overview-bridge-to-kubernetes).
+If you work with a large number of services, you can save time and computing resources by selecting which subset of services you want to start in your debugging session. See [Start a subset of Compose services](launch-profiles.md).
 
 ## Service Fabric support
 

docs/containers/media/configure-container-tools/tools-options-2.png

@@ -17,21 +17,22 @@
     - name: Multi-container app with Docker Compose
       href: tutorial-multicontainer.md
   - name: How to
+    expanded: true
     items:
     - name: Debug app in a local Docker container
       href: edit-and-refresh.md
+    - name: Use the Containers window
+      href: view-and-diagnose-containers.md
+    - name: Launch a subset of Compose services
+      href: launch-profiles.md
+    - name: Configure Container Tools
+      href: container-tools-configure.md
     - name: Deploy to a container registry
       href: hosting-web-apps-in-docker.md
     - name: Deploy to Azure App Service
       href: deploy-app-service.md
     - name: Deploy to Docker Hub
       href: deploy-docker-hub.md
-    - name: Manage launch profiles
-      href: launch-profiles.md
-    - name: View and diagnose containers and images
-      href: view-and-diagnose-containers.md
-    - name: Configure Container Tools
-      href: container-tools-configure.md
   - name: Concepts
     items:
     - name: How Visual Studio builds containerized apps

docs/containers/media/configure-container-tools/tools-options-3.png

@@ -197,7 +197,7 @@ Add a project to the same solution and call it *MyWebAPI*. Select **API** as the
 
 Look at the options for deploying your [containers to Azure](/azure/containers).
 
-For greater control over which services are started during a debug session, learn how to use Docker Compose launch profiles to configure which services run when debugging. See [Manage launch profiles for Docker Compose](launch-profiles.md)
+If you work with a large number of microservices, many of which aren't needed for a every debugging task, you can use Docker Compose launch profiles for greater control over which services are started during a debug session. See [Manage launch profiles for Docker Compose](launch-profiles.md).
 
 ## See also