Skip to content

Commit 7367a5b

Browse files
Merge branch 'MicrosoftDocs:main' into anonymouspulls
2 parents afd0083 + 16bb371 commit 7367a5b

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

articles/container-registry/container-registry-import-images.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ ms.custom: devx-track-azurepowershell, devx-track-azurecli
1313

1414
You can easily import (copy) container images to an Azure container registry, without using Docker commands. For example, import images from a development registry to a production registry, or copy base images from a public registry.
1515

16-
Azure Container Registry handles a number of common scenarios to copy images and other artifacts from an existing registry:
16+
Azure Container Registry handles many common scenarios to copy images and other artifacts from an existing registry:
1717

1818
* Import images from a public registry
1919

20-
* Import images or OCI artifacts including Helm 3 charts from another Azure container registry, in the same or a different Azure subscription or tenant
20+
* Import images or OCI artifacts including Helm 3 charts from another Azure container registry, in the same, or a different Azure subscription or tenant
2121

2222
* Import from a non-Azure private container registry
2323

2424
Image import into an Azure container registry has the following benefits over using Docker CLI commands:
2525

26-
* Because your client environment doesn't need a local Docker installation, import any container image, regardless of the supported OS type.
26+
* If your client environment doesn't need a local Docker installation, you can Import any container image, regardless of the supported OS type.
2727

28-
* When you import multi-architecture images (such as official Docker images), images for all architectures and platforms specified in the manifest list get copied.
28+
* If you import multi-architecture images (such as official Docker images), images for all architectures and platforms specified in the manifest list get copied.
2929

30-
* Access to the target registry doesn't have to use the registry's public endpoint.
30+
* If you access to the target registry, it doesn't have to use the registry's public endpoint.
3131

3232
> [!IMPORTANT]
3333
>* Importing images requires the external registry support [RFC 7233](https://www.rfc-editor.org/rfc/rfc7233#section-2.3). We recommend using a registry that supports RFC 7233 ranges while using az acr import command with the registry URI to avoid failures.
@@ -167,7 +167,7 @@ You can import an image from an Azure container registry in the same AD tenant u
167167

168168
* [Public access](container-registry-access-selected-networks.md#disable-public-network-access) to the source registry may be disabled. If public access is disabled, specify the source registry by resource ID instead of by registry login server name.
169169

170-
* If the source registry and/or the target registry has a private endpoint or registry firewall rules are applied, ensure that the restricted registry [allows trusted services](allow-access-trusted-services.md) to access the network.
170+
* The source registry and/or the target registry with a private endpoint or registry firewall rules must ensure the restricted registry [allows trusted services](allow-access-trusted-services.md) to access the network.
171171

172172
### Import from a registry in the same subscription
173173

@@ -312,7 +312,7 @@ az login --identity --username <identity_ID>
312312
az account get-access-token
313313
```
314314

315-
In the target tenant, pass the access token as a password to the `az acr import` command. The source registry is specified by login server name. Notice that no username is needed in this command:
315+
In the target tenant, pass the access token as a password to the `az acr import` command. The source registry specifies the login server name. Notice that no username is needed in this command:
316316

317317
```azurecli
318318
az acr import \
@@ -332,7 +332,7 @@ Connect-AzAccount -Identity -AccountId <identity_ID>
332332
Get-AzAccessToken
333333
```
334334

335-
In the target tenant, pass the access token as a password to the `Import-AzContainerRegistryImage` cmdlet. The source registry is specified by login server name. Notice that no username is needed in this command:
335+
In the target tenant, pass the access token as a password to the `Import-AzContainerRegistryImage` cmdlet. The source registry specifies login server name. Notice that no username is needed in this command:
336336

337337
```azurepowershell
338338
Import-AzContainerRegistryImage -RegistryName myregistry -ResourceGroupName myResourceGroup -SourceRegistryUri sourceregistry.azurecr.io -SourceImage sourcerrepo:tag -Password <access-token>
@@ -363,6 +363,8 @@ az acr import \
363363
```azurepowershell
364364
Import-AzContainerRegistryImage -RegistryName myregistry -ResourceGroupName myResourceGroup -SourceRegistryUri docker.io/sourcerepo -SourceImage sourcerrepo:tag -Username <username> -Password <password>
365365
```
366+
> [!NOTE]
367+
> If you're importing from a non-Azure private registry with IP rules, [follow these steps.](container-registry-access-selected-networks.md)
366368
367369
### Troubleshoot Import Container Images
368370
#### Symptoms and Causes
@@ -391,7 +393,7 @@ In this article, you learned about importing container images to an Azure contai
391393

392394
* Image import can help you move content to a container registry in a different Azure region, subscription, or Microsoft Entra tenant. For more information, see [Manually move a container registry to another region](manual-regional-move.md).
393395

394-
* Learn how to [disable artifact export](data-loss-prevention.md) from a network-restricted container registry.
396+
* [Disable artifact export](data-loss-prevention.md) from a network-restricted container registry.
395397

396398

397399
<!-- LINKS - Internal -->

articles/virtual-machines/disks-redundancy.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Redundancy options for Azure managed disks
33
description: Learn about zone-redundant storage and locally redundant storage for Azure managed disks.
44
author: roygara
55
ms.author: rogarana
6-
ms.date: 12/15/2023
6+
ms.date: 04/23/2024
77
ms.topic: how-to
88
ms.service: azure-disk-storage
99
ms.custom: references_regions
@@ -54,3 +54,4 @@ Except for more write latency, disks using ZRS are identical to disks using LRS,
5454
## Next steps
5555

5656
- To learn how to create a ZRS disk, see [Deploy a ZRS managed disk](disks-deploy-zrs.md).
57+
- To convert an LRS disk to ZRS, see [Convert a disk from LRS to ZRS](disks-migrate-lrs-zrs.md).

includes/azure-healthcare-api-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Health Data Services is a set of managed API services based on open standards an
1414

1515
FHIR service is an implementation of the FHIR specification within Health Data Services. It enables you to combine in a single workspace one or more FHIR service instances with optional DICOM and MedTech service instances. Azure API for FHIR is generally available as a stand-alone service offering.
1616

17-
FHIR service in Azure Health Data Services has a limit of 4 TB for structured storage.
17+
Each FHIR service instance in Azure Health Data Services has a storage limit of 4 TB by default. If you have more data, you can ask Microsoft to increase storage up to 100 TB for your FHIR service. To request storage greater than 4 TB, [create a support request](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview) on the Azure portal and use the issue type Service and Subscription limit (quotas).
1818

1919
| **Quota Name** | **Default Limit**| **Maximum Limit** | **Notes** |
2020
|---|---|---|---|

0 commit comments

Comments
 (0)