Skip to content

Commit 7ce33ce

Browse files
authored
Merge pull request #277988 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 2ba21fe + c783cf4 commit 7ce33ce

File tree

4 files changed

+28
-3
lines changed

4 files changed

+28
-3
lines changed

articles/ai-services/openai/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This article provides a summary of the latest releases and major documentation u
2424

2525
* GPT-4o is now also available in:
2626
- Sweden Central for standard regional deployment.
27-
- Korea Central, Sweden Central, Switzerland North, & West US 3 for provisioned deployment.
27+
- Japan East, Korea Central, Sweden Central, Switzerland North, & West US 3 for provisioned deployment.
2828

2929
For the latest information on model availability, see the [models page](./concepts/models.md).
3030

articles/ai-studio/how-to/configure-managed-network.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ __Inbound__ service tag rules:
729729
To allow installation of __Python packages for training and deployment__, add outbound _FQDN_ rules to allow traffic to the following host names:
730730

731731
> [!WARNING]
732-
> FQDN outbound rules are implemented using Azure Firewall. If you use outbound FQDN rules, charges for Azure Firewall are included in your billing.For more information, see [Pricing](#pricing).
732+
> FQDN outbound rules are implemented using Azure Firewall. If you use outbound FQDN rules, charges for Azure Firewall are included in your billing. For more information, see [Pricing](#pricing).
733733

734734
> [!NOTE]
735735
> This is not a complete list of the hosts required for all Python resources on the internet, only the most commonly used. For example, if you need access to a GitHub repository or other host, you must identify and add the required hosts for that scenario.

articles/container-registry/container-registry-authentication.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,25 @@ You can enable the admin user in the Azure portal by navigating your registry, s
170170

171171
![Enable admin user UI in the Azure portal][auth-portal-01]
172172

173+
## Log in with an alternative container tool instead of Docker
174+
In some scenarios, you need to use alternative container tools like `podman` instead of the common container tool `docker`. For example: [Docker is no longer available in RHEL 8 and 9][docker-deprecated-redhat-8-9], so you have to switch your container tool.
175+
176+
The default container tool is set to `docker` for `az acr login` commands. If you don't set the default container tool and the `docker` command is missing in your environment, the following error will be popped:
177+
```bash
178+
az acr login --name <acrName>
179+
2024-03-29 07:30:10.014426 An error occurred: DOCKER_COMMAND_ERROR
180+
Please verify if Docker client is installed and running.
181+
```
182+
183+
To change the default container tool that the `az acr login` command uses, you can set the environment variable `DOCKER_COMMAND`. For example:
184+
```azurecli
185+
DOCKER_COMMAND=podman \
186+
az acr login --name <acrName>
187+
```
188+
189+
> [!NOTE]
190+
> You need the Azure CLI version 2.59.0 or later installed and configured to use this feature. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
191+
173192
## Next steps
174193
175194
* [Push your first image using the Azure CLI](container-registry-get-started-azure-cli.md)
@@ -178,3 +197,9 @@ You can enable the admin user in the Azure portal by navigating your registry, s
178197
179198
<!-- IMAGES -->
180199
[auth-portal-01]: ./media/container-registry-authentication/auth-portal-01.png
200+
201+
<!-- EXTERNAL LINKS -->
202+
[docker-deprecated-redhat-8-9]: https://access.redhat.com/solutions/3696691
203+
204+
<!-- INTERNAL LINKS -->
205+
[install-azure-cli]: /cli/azure/install-azure-cli

articles/data-factory/tutorial-bulk-copy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ This pipeline performs two steps:
407407
"activities":[
408408
{
409409
"name": "LookupTableList",
410-
"description": "Retrieve the table list from Azure SQL dataabse",
410+
"description": "Retrieve the table list from Azure SQL database",
411411
"type": "Lookup",
412412
"typeProperties": {
413413
"source": {

0 commit comments

Comments
 (0)