Skip to content

Commit 136e68d

Browse files
Merge pull request #264371 from tejaswikolli-web/artifactpush
manage-artifacts
2 parents 5848be3 + 0d7131a commit 136e68d

11 files changed

+553
-644
lines changed

.openpublishing.redirection.container-registry.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
{
22
"redirections": [
3+
4+
{
5+
"source_path_from_root": "/articles/container-registry/container-registry-oci-artifacts.md",
6+
"redirect_url": "/azure/container-registry/container-registry-manage-artifact",
7+
"redirect_document_id": false
8+
},
9+
{
10+
"source_path_from_root": "/articles/container-registry/container-registry-oras-artifacts.md",
11+
"redirect_url": "/azure/container-registry/container-registry-manage-artifact",
12+
"redirect_document_id": false
13+
},
314
{
415
"source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth.md",
516
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
617
"redirect_document_id": false
718
},
19+
820
{
921
"source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth-cli.md",
1022
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",

articles/container-registry/TOC.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,10 @@
9898
items:
9999
- name: Push and pull an image
100100
href: container-registry-get-started-docker-cli.md
101-
- name: Push and pull an OCI artifact
102-
href: container-registry-oci-artifacts.md
103101
- name: Push and pull a Helm chart
104102
href: container-registry-helm-repos.md
105-
- name: Push and pull supply chain artifacts (preview)
106-
href: container-registry-oras-artifacts.md
103+
- name: Manage artifacts with ORAS
104+
href: container-registry-manage-artifact.md
107105
- name: View repositories
108106
href: container-registry-repositories.md
109107
- name: Import container images

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ az acr login --name <acrName>
4949
When you log in with `az acr login`, the CLI uses the token created when you executed `az login` to seamlessly authenticate your session with your registry. To complete the authentication flow, the Docker CLI and Docker daemon must be installed and running in your environment. `az acr login` uses the Docker client to set a Microsoft Entra token in the `docker.config` file. Once you've logged in this way, your credentials are cached, and subsequent `docker` commands in your session do not require a username or password.
5050

5151
> [!TIP]
52-
> Also use `az acr login` to authenticate an individual identity when you want to push or pull artifacts other than Docker images to your registry, such as [OCI artifacts](container-registry-oci-artifacts.md).
52+
> Also use `az acr login` to authenticate an individual identity when you want to push or pull artifacts other than Docker images to your registry, such as [OCI artifacts](container-registry-manage-artifact.md).
5353
5454
For registry access, the token used by `az acr login` is valid for **3 hours**, so we recommend that you always log in to the registry before running a `docker` command. If your token expires, you can refresh it by using the `az acr login` command again to reauthenticate.
5555

@@ -104,7 +104,7 @@ Connect-AzContainerRegistry -Name <acrName>
104104
When you log in with `Connect-AzContainerRegistry`, PowerShell uses the token created when you executed `Connect-AzAccount` to seamlessly authenticate your session with your registry. To complete the authentication flow, the Docker CLI and Docker daemon must be installed and running in your environment. `Connect-AzContainerRegistry` uses the Docker client to set a Microsoft Entra token in the `docker.config` file. Once you've logged in this way, your credentials are cached, and subsequent `docker` commands in your session do not require a username or password.
105105

106106
> [!TIP]
107-
> Also use `Connect-AzContainerRegistry` to authenticate an individual identity when you want to push or pull artifacts other than Docker images to your registry, such as [OCI artifacts](container-registry-oci-artifacts.md).
107+
> Also use `Connect-AzContainerRegistry` to authenticate an individual identity when you want to push or pull artifacts other than Docker images to your registry, such as [OCI artifacts](container-registry-manage-artifact.md).
108108
109109
For registry access, the token used by `Connect-AzContainerRegistry` is valid for **3 hours**, so we recommend that you always log in to the registry before running a `docker` command. If your token expires, you can refresh it by using the `Connect-AzContainerRegistry` command again to reauthenticate.
110110

articles/container-registry/container-registry-image-formats.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Azure Container Registry supports images that meet the [Open Container Initiativ
2828

2929
Azure Container Registry supports the [OCI Distribution Specification](https://github.com/opencontainers/distribution-spec), a vendor-neutral, cloud-agnostic spec to store, share, secure, and deploy container images and other content types (artifacts). The specification allows a registry to store a wide range of artifacts in addition to container images. You use tooling appropriate to the artifact to push and pull artifacts. For examples, see:
3030

31-
* [Push and pull an OCI artifact using an Azure container registry](container-registry-oci-artifacts.md)
31+
* [Push and pull an OCI artifact using an Azure container registry](container-registry-manage-artifact.md)
3232
* [Push and pull Helm charts to an Azure container registry](container-registry-helm-repos.md)
3333

3434
To learn more about OCI artifacts, see the [OCI Registry as Storage (ORAS)](https://github.com/deislabs/oras) repo and the [OCI Artifacts](https://github.com/opencontainers/artifacts) repo on GitHub.

0 commit comments

Comments
 (0)