Skip to content

Commit

Permalink
Merge pull request #576 from v-susbo/March
Browse files Browse the repository at this point in the history
March
  • Loading branch information
femila committed Mar 30, 2021
2 parents 8955443 + b3ec48d commit 92f443d
Show file tree
Hide file tree
Showing 27 changed files with 18 additions and 149 deletions.
2 changes: 1 addition & 1 deletion virtualization/windowscontainers/about/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Containers are a technology for packaging and running Windows and Linux applicat

![Graphic showing how containers can run in the cloud or on-premises, supporting monolithic apps or microservices written in nearly any language.](media/about-3-box.png)

To view a roadmap of planned and currently available features, see the [Windows Server containers roadmap](https://github.com/microsoft/Windows-Containers/projects/1).
To view a roadmap of planned and currently available features, see the [Windows Server containers roadmap](https://github.com/microsoft/Windows-Containers/projects/1). Also, see [Events](../deploy-containers/events.md) to view recent video presentations and blog posts for Windows Containers.

## The Microsoft container ecosystem

Expand Down

This file was deleted.

2 changes: 2 additions & 0 deletions virtualization/windowscontainers/deploy-containers/events.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ This page contains links to videos, slideshows, and other information from Windo
<!-- start tab view -->
# [100 Beginner](#tab/100-beginner)

[2021 highlights for Windows Containers](https://techcommunity.microsoft.com/t5/containers/new-year-new-resolution-and-new-era-of-windows-containers/ba-p/2169761) Read this blog for recent new about Windows Containers!

[Microsoft Build 2020: Modernizing your Windows Server apps](https://channel9.msdn.com/Events/Build/2020/INT143) Get started on your modernization journey with Windows containers and Azure Kubernetes Service to lift and shift Windows Server applications to the cloud.

[Microsoft Ignite 2019: Windows container and the Azure Kubernetes Service](https://azure.microsoft.com/resources/videos/ignite-2019-windows-container-and-the-azure-kubernetes-service/) View this video to learn how to leverage Windows containers and Azure Kubernetes Service.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ You need Docker in order to work with Windows Containers. Docker consists of the

- [Install Docker](../quick-start/set-up-environment.md)

For scripted installations, see [Use a script to install Docker EE](https://docs.docker.com/install/windows/docker-ee/#use-a-script-to-install-docker-ee).
For scripted installations, see [Use a script to install Docker EE](https://docs.mirantis.com/docker-enterprise/v3.1/dockeree-products/mcr/mcr-windows.html).

Before you can use Docker, you'll need to install the container images. For more information, see [docs for our container base images](../manage-containers/container-base-images.md).

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified virtualization/windowscontainers/wac-tooling/media/WAC-ACI.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified virtualization/windowscontainers/wac-tooling/media/WAC-ACR.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified virtualization/windowscontainers/wac-tooling/media/WAC-Images.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified virtualization/windowscontainers/wac-tooling/media/WAC-Pull.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified virtualization/windowscontainers/wac-tooling/media/WAC-Push.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion virtualization/windowscontainers/wac-tooling/wac-aci.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This topic describes how to manage Azure Container Instances (ACI) using Windows
Windows Admin Center allows you to perform basic management of Azure Container Instances, which includes listing existing container instances, starting and stopping an instance, removing instances, and opening the Azure Portal for advanced management.

![Azure container instance](./media/WAC-ACI.png)
![Azure container instance](./media/wac-aci.png)

With the container instance, you can perform the following actions:

Expand Down
8 changes: 4 additions & 4 deletions virtualization/windowscontainers/wac-tooling/wac-acr.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@ Using Windows Admin Center to manage ACR, you can prepare the Azure location to
2. Under **Tools** in the left pane, scroll down and select the **Containers** extension.
3. Open the **Azure Container Registry** tab under **Azure**.

![Azure Container Registry tab](./media/WAC-ACR.png)
![Azure Container Registry tab](./media/wac-acr.png)

## Manage registries and images

To create a new registry, under **Azure Container Registry**, select **Create New Registry**.

![Create new registry](./media/WAC-ACRNew.png)
![Create new registry](./media/wac-acr-new.png)

Under **Create a new registry**, select the subscription you want to use to create a new registry and the Resource Group you want to allocate the registry. Next, provide a registry name, location and SKU. For more information on pricing and features on each SKU, see [ACR documentation](https://docs.microsoft.com/azure/container-registry/). Click **Create** to create the new registry. Once completed, Windows Admin Center will notify you if the operation is completed successfully, and then you'll see the new registry listed.

Once registries and images are listed, you can remove an existing image or pull it to the container host for local use. To pull an image, select the image you want to pull and click **Pull Image**:

![Pull image](./media/WAC-ACRPull.png)
![Pull image](./media/wac-acr-pull.png)

After the pull process completes, Windows Admin Center will notify you, and the image will be available for use on the **Images** tab under **Container host**.

Finally, you can run a new container that's based on an image hosted on ACR. To get started, select the image you want to run and click **Run Instance**:

![Run instance](./media/WAC-ACRRun.png)
![Run instance](./media/wac-acr-run.png)

Under **Run Instance**, you need to provide a container name, which subscription to use, and the resource group and location you want to run this instance.

Expand Down
10 changes: 5 additions & 5 deletions virtualization/windowscontainers/wac-tooling/wac-containers.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ ms.assetid: bb9bfbe0-5bdc-4984-912f-9c93ea67105f

Windows Admin Center helps you run containers locally on your container host.

1. Using Windows Admin Center with the Containers extension installed, open the container host you want to manage.
2. Under **Tools** on the left side, select the **Containers** extension.
1. In Windows Admin Center with the **Containers** extension installed, open the container host you want to manage.
2. Under **Tools** in the left pane, select the **Containers** extension.
3. Select the **Images** tab under Container host.

![Images tab](./media/WAC-Images.png)
![Images tab](./media/wac-images.png)

4. Select the image you want to run and click **Run**.

![Run image](./media/WAC-RunContainers.png)
![Run image](./media/wac-ru-containers.png)

5. Under **Run image**, you can specify the container-related configuration:

Expand All @@ -32,7 +32,7 @@ Windows Admin Center helps you run containers locally on your container host.

6. Once you've finished configuring the container, select **Run**. You can view the status of the running containers on the **Containers** tab:

![Containers tab](./media/WAC-Containers.png)
![Containers tab](./media/wac-containers.png)

## Next steps

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This topic describes how to configure the Containers extension on Windows Admin
2. On the **Available extensions** tab, select the **Containers** extension from the list.
3. Click **Install** to install the extension.

![Containers extension](./media/WAC-Extension.png)
![Containers extension](./media/wac-extension.png)

Windows Admin Center will refresh and, once completed, the extension will appear under the **Installed extensions** tab.

Expand Down
2 changes: 1 addition & 1 deletion virtualization/windowscontainers/wac-tooling/wac-images.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ When working with containers, you'll write instructions to Docker on how your co

Windows Admin Center can considerably reduce the overhead of writing Dockerfiles or even remove the need to write these files entirely. To get started, on the **Containers** extension, select the **Create New** option on the **Images** tab.

![Create a new container](./media/WAC-CreateNew.png)
![Create a new container](./media/wac-create-new.png)

When creating a new container image, you have different options to choose from:

Expand Down
4 changes: 2 additions & 2 deletions virtualization/windowscontainers/wac-tooling/wac-manage.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This topic describes how to manage container images on Windows Admin Center. Con

After deploying a container host, the next step is to pull (or download) container images so new containers can be created from the images. You can use Windows Admin Center to pull new container images by selecting the Containers extension on your targeted container host. Then, select the **Images** tab inside the **Container** extension under **Container host** and select the **Pull** option.

![Pull container images](./media/WAC-Pull.png)
![Pull container images](./media/wac-pull.png)

In the **Pull Container Image** settings, provide the image URL and the tag for the image you want to pull. You can also select the option to pull all tagged images on that repository.

Expand All @@ -30,7 +30,7 @@ Once you have your container image created, it's a good practice to push that im

On the **Images** tab in the **Containers** extension of Windows Admin Center, select the image you wan to push and click **Push**.

![Push container images](./media/WAC-Push.png)
![Push container images](./media/wac-push.png)

In the **Push Container Image** settings, you can change the image name and tag before pushing (uploading) it. You can also choose whether to push it to either a generic repository or a repository on Azure Container Registry. For a generic repository, you will need to provide a username and password. For Azure Container Registry, you can use the integrated authentication on Windows Admin Center. For Azure, you can also select which subscription and registry you want to push the image to.

Expand Down

0 comments on commit 92f443d

Please sign in to comment.