Skip to content

Commit 8e50bda

Browse files
authored
Merge pull request #270942 from JnHs/jh-acr-redirect
remove topic and redirect
2 parents 78d90ac + e4a8068 commit 8e50bda

6 files changed

+12
-71
lines changed

.openpublishing.redirection.container-service.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/container-service/container-registry-auth-aci.md",
5+
"redirect_url": "/azure/container-service/container-registry-authentication",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/container-service/dcos-swarm/container-service-application-specific-marathon.md",
510
"redirect_url": "/previous-versions/azure/container-service/dcos-swarm/container-service-application-specific-marathon",

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3909,6 +3909,11 @@
39093909
"redirect_url": "/azure/batch/monitor-batch",
39103910
"redirect_document_id": false
39113911
},
3912+
{
3913+
"source_path_from_root": "/articles/container-registry/container-registry-auth-aci.md",
3914+
"redirect_url": "/azure/container-registry/container-registry-authentication",
3915+
"redirect_document_id": false
3916+
},
39123917
{
39133918
"source_path_from_root": "/articles/event-hubs/move-cluster-across-regions.md",
39143919
"redirect_url": "/azure/operational-excellence/relocation-event-hub-cluster",

articles/container-instances/container-instances-tutorial-deploy-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ In this section, you use the Azure CLI to deploy the image built in the [first t
3333

3434
When you deploy an image that's hosted in a private Azure container registry like the one created in the [second tutorial](container-instances-tutorial-prepare-acr.md), you must supply credentials to access the registry.
3535

36-
A best practice for many scenarios is to create and configure a Microsoft Entra service principal with *pull* permissions to your registry. See [Authenticate with Azure Container Registry from Azure Container Instances](../container-registry/container-registry-auth-aci.md) for sample scripts to create a service principal with the necessary permissions. Take note of the *service principal ID* and *service principal password*. You use these credentials to access the registry when you deploy the container.
36+
A best practice for many scenarios is to create and configure a Microsoft Entra service principal with *pull* permissions to your registry. Take note of the *service principal ID* and *service principal password*. You use these credentials to access the registry when you deploy the container.
3737

3838
You also need the full name of the container registry login server (replace `<acrName>` with the name of your registry):
3939

articles/container-registry/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,6 @@
178178
href: container-registry-authentication-managed-identity.md
179179
- name: Authenticate with token
180180
href: container-registry-repository-scoped-permissions.md
181-
- name: Authenticate from Azure Container Instances
182-
href: container-registry-auth-aci.md
183181
- name: Authenticate from Kubernetes
184182
items:
185183
- name: Kubernetes scenarios

articles/container-registry/container-registry-auth-aci.md

Lines changed: 0 additions & 65 deletions
This file was deleted.

articles/container-registry/container-registry-auth-service-principal.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ For example, configure your web application to use a service principal that prov
2929

3030
You should use a service principal to provide registry access in **headless scenarios**. That is, an application, service, or script that must push or pull container images in an automated or otherwise unattended manner. For example:
3131

32-
* *Pull*: Deploy containers from a registry to orchestration systems including Kubernetes, DC/OS, and Docker Swarm. You can also pull from container registries to related Azure services such as [Azure Container Instances](container-registry-auth-aci.md), [App Service](../app-service/index.yml), [Batch](../batch/index.yml), [Service Fabric](../service-fabric/index.yml), and others.
32+
* *Pull*: Deploy containers from a registry to orchestration systems including Kubernetes, DC/OS, and Docker Swarm. You can also pull from container registries to related Azure services such as [App Service](../app-service/index.yml), [Batch](../batch/index.yml), [Service Fabric](../service-fabric/index.yml), and others.
3333

3434
> [!TIP]
3535
> A service principal is recommended in several [Kubernetes scenarios](authenticate-kubernetes-options.md) to pull images from an Azure container registry. With Azure Kubernetes Service (AKS), you can also use an automated mechanism to authenticate with a target registry by enabling the cluster's [managed identity](../aks/cluster-container-registry-integration.md).
@@ -63,8 +63,6 @@ The **Username** value has the format `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`.
6363

6464
You can use service principal credentials from any Azure service that authenticates with an Azure container registry. Use service principal credentials in place of the registry's admin credentials for a variety of scenarios.
6565

66-
For example, use the credentials to pull an image from an Azure container registry to [Azure Container Instances](container-registry-auth-aci.md).
67-
6866
### Use with docker login
6967

7068
You can run `docker login` using a service principal. In the following example, the service principal application ID is passed in the environment variable `$SP_APP_ID`, and the password in the variable `$SP_PASSWD`. For recommended practices to manage Docker credentials, see the [docker login](https://docs.docker.com/engine/reference/commandline/login/) command reference.

0 commit comments

Comments
 (0)