Skip to content

Commit 407ba12

Browse files
committed
Merge branch 'main' of github.com:MicrosoftDocs/azure-docs-pr into 194422-fresh
2 parents 4e5eb53 + bfbe876 commit 407ba12

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

articles/confidential-computing/choose-confidential-containers-offerings.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
title: Choose container offerings for confidential computing
33
description: How to choose the right confidential container offerings to meet your security, isolation and developer needs.
44
author: angarg05
5-
ms.service: container-service
5+
ms.service: virtual-machines
6+
ms.subservice: confidential-computing
67
ms.topic: conceptual
78
ms.date: 11/01/2021
89
ms.author: ananyagarg

articles/container-registry/container-registry-tasks-overview.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ Containers provide new levels of virtualization, isolating application and devel
1616

1717
**ACR Tasks** is a suite of features within Azure Container Registry. It provides cloud-based container image building for [platforms](#image-platforms) including Linux, Windows, and ARM, and can automate [OS and framework patching](#automate-os-and-framework-patching) for your Docker containers. ACR Tasks not only extends your "inner-loop" development cycle to the cloud with on-demand container image builds, but also enables automated builds triggered by source code updates, updates to a container's base image, or timers. For example, with base image update triggers, you can automate your OS and application framework patching workflow, maintaining secure environments while adhering to the principles of immutable containers.
1818

19-
ACR is temporarily pausing ACR Tasks runs from Azure free credits. This may affect existing Tasks runs. If you encounter problems, open a [support case](../azure-portal/supportability/how-to-create-azure-support-request.md) for our team to provide additional guidance. We'll remove this note when this pause is lifted.
19+
>[! IMPORTANT]
20+
> ACR is temporarily pausing ACR Tasks runs from Azure free credits. This may affect existing Tasks runs. If you encounter problems, open a [support case](../azure-portal/supportability/how-to-create-azure-support-request.md) for our team to provide additional guidance. Please note that existing customers will not be affected by this pause. We will update our documentation notice here whenever the pause is lifted.
2021
2122
## Task scenarios
2223

0 commit comments

Comments
 (0)