Skip to content

Commit 65f65e1

Browse files
authored
Merge pull request #114154 from aahill/release-build-cogserv-containers
Anomaly Detector "ungated" preview
2 parents fc2f7ef + 84b2108 commit 65f65e1

9 files changed

+13
-30
lines changed

articles/cognitive-services/Anomaly-Detector/How-to/deploy-anomaly-detection-on-container-instances.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ Learn how to deploy the Cognitive Services [Anomaly Detector](../anomaly-detecto
1818

1919
[!INCLUDE [Prerequisites](../../containers/includes/container-preview-prerequisites.md)]
2020

21-
## Request access to the private container registry
22-
23-
You must first complete and submit the [Anomaly Detector Container request form](https://aka.ms/adcontainer) to request access to the container.
24-
25-
[!INCLUDE [Request access](../../../../includes/cognitive-services-containers-request-access-only.md)]
26-
2721
[!INCLUDE [Create a Cognitive Services Anomaly Detector resource](../includes/create-anomaly-detector-resource.md)]
2822

2923
[!INCLUDE [Create an Anomaly Detector container on Azure Container Instances](../../containers/includes/create-container-instances-resource-from-azure-cli.md)]

articles/cognitive-services/Anomaly-Detector/anomaly-detector-container-configuration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: anomaly-detector
1010
ms.topic: conceptual
11-
ms.date: 04/01/2020
11+
ms.date: 05/07/2020
1212
ms.author: aahi
1313
---
1414

@@ -116,7 +116,7 @@ The following Docker examples are for the Anomaly Detector container.
116116

117117
```Docker
118118
docker run --rm -it -p 5000:5000 --memory 4g --cpus 1 \
119-
containerpreview.azurecr.io/microsoft/cognitive-services-anomaly-detector \
119+
mcr.microsoft.com/azure-cognitive-services/anomaly-detector \
120120
Eula=accept \
121121
Billing={ENDPOINT_URI} \
122122
ApiKey={API_KEY}
@@ -126,7 +126,7 @@ The following Docker examples are for the Anomaly Detector container.
126126

127127
```Docker
128128
docker run --rm -it -p 5000:5000 --memory 4g --cpus 1 \
129-
containerpreview.azurecr.io/microsoft/cognitive-services-anomaly-detector \
129+
mcr.microsoft.com/azure-cognitive-services/anomaly-detector \
130130
Eula=accept \
131131
Billing={ENDPOINT_URI} ApiKey={API_KEY} \
132132
Logging:Console:LogLevel:Default=Information

articles/cognitive-services/Anomaly-Detector/anomaly-detector-container-howto.md

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: anomaly-detector
1010
ms.topic: conceptual
11-
ms.date: 04/01/2020
11+
ms.date: 05/07/2020
1212
ms.author: aahi
1313
---
1414

@@ -37,14 +37,6 @@ You must meet the following prerequisites before using Anomaly Detector containe
3737

3838
[!INCLUDE [Gathering required container parameters](../containers/includes/container-gathering-required-parameters.md)]
3939

40-
## Request access to the container registry
41-
42-
You must first complete and submit the [Anomaly Detector Container Request form](https://aka.ms/adcontainer) to request access to the container.
43-
44-
[!INCLUDE [Request access to the container registry](../../../includes/cognitive-services-containers-request-access-only.md)]
45-
46-
[!INCLUDE [Authenticate to the container registry](../../../includes/cognitive-services-containers-access-registry.md)]
47-
4840
## The host computer
4941

5042
[!INCLUDE [Host Computer requirements](../../../includes/cognitive-services-containers-host-computer.md)]
@@ -70,7 +62,7 @@ Use the [`docker pull`](https://docs.docker.com/engine/reference/commandline/pul
7062

7163
| Container | Repository |
7264
|-----------|------------|
73-
| cognitive-services-anomaly-detector | `containerpreview.azurecr.io/microsoft/cognitive-services-anomaly-detector:latest` |
65+
| cognitive-services-anomaly-detector | `mcr.microsoft.com/azure-cognitive-services/anomaly-detector:latest` |
7466

7567
<!--
7668
For a full description of available tags, such as `latest` used in the preceding command, see [anomaly-detector](https://go.microsoft.com/fwlink/?linkid=2083827&clcid=0x409) on Docker Hub.
@@ -80,7 +72,7 @@ For a full description of available tags, such as `latest` used in the preceding
8072
### Docker pull for the Anomaly Detector container
8173

8274
```Docker
83-
docker pull containerpreview.azurecr.io/microsoft/cognitive-services-anomaly-detector:latest
75+
docker pull mcr.microsoft.com/azure-cognitive-services/anomaly-detector:latest
8476
```
8577

8678
## How to use the container
@@ -98,7 +90,7 @@ Use the [docker run](https://docs.docker.com/engine/reference/commandline/run/)
9890

9991
```bash
10092
docker run --rm -it -p 5000:5000 --memory 4g --cpus 1 \
101-
containerpreview.azurecr.io/microsoft/cognitive-services-anomaly-detector:latest \
93+
mcr.microsoft.com/azure-cognitive-services/anomaly-detector:latest \
10294
Eula=accept \
10395
Billing={ENDPOINT_URI} \
10496
ApiKey={API_KEY}

articles/cognitive-services/cognitive-services-container-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.custom: seodec18
99
ms.service: cognitive-services
1010
ms.topic: article
11-
ms.date: 04/01/2020
11+
ms.date: 05/07/2020
1212
ms.author: aahi
1313
#As a potential customer, I want to know more about how Cognitive Services provides and supports Docker containers for each service.
1414
---

articles/cognitive-services/cognitive-services-gating-process.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ Currently, the services below are offered through the gating process:
4646

4747
| Service | Container(s) |
4848
|-------------------------------------|-------------------------------------------------------------------------------|
49-
| [Anomaly Detector][ad-containers] | Anomaly Detector |
5049
| [Computer Vision][cv-containers] | Read |
5150
| [Face][fa-containers] | Face |
5251
| [Form Recognizer][fr-containers] | Form Recognizer |

articles/cognitive-services/containers/container-image-tags.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@ Azure Cognitive Services offers many container images. The container registries
2020
2121
## Anomaly Detector
2222

23-
The [Anomaly Detector][ad-containers] container image can be found on the `containerpreview.azurecr.io` container registry. It resides within the `microsoft` repository and is named `cognitive-services-anomaly-detector`. The fully qualified container image name is, `containerpreview.azurecr.io/microsoft/cognitive-services-anomaly-detector`.
23+
The [Anomaly Detector][ad-containers] container image can be found on the `mcr.microsoft.com` container registry syndicate. It resides within the `azure-cognitive-services` repository and is named `anomaly-detector`. The fully qualified container image name is, `mcr.microsoft.com/azure-cognitive-services/anomaly-detector`.
2424

2525
This container image has the following tags available:
2626

2727
| Image Tags | Notes |
2828
|-------------------------------|:------|
2929
| `latest` | |
30-
| `1.1.009301-amd64-preview` | |
31-
| `1.1.008500001-amd64-preview` | |
3230

3331
## Computer Vision
3432

articles/cognitive-services/containers/includes/cognitive-services-container-images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ The following preview containers are available publicly. The Microsoft Container
5353
|--|--|--|
5454
| [Text Analytics](../../text-analytics/how-tos/text-analytics-how-to-install-containers.md) | Key Phrase Extraction | `mcr.microsoft.com/azure-cognitive-services/keyphrase` |
5555
| [Text Analytics](../../text-analytics/how-tos/text-analytics-how-to-install-containers.md) | Language Detection | `mcr.microsoft.com/azure-cognitive-services/language` |
56+
| [Anomaly detector](../../anomaly-detector/anomaly-detector-container-howto.md) | Anomaly Detector | `mcr.microsoft.com/azure-cognitive-services/anomaly-detector` |
5657

5758
#### Public "Gated" preview (container registry: `containerpreview.azurecr.io`)
5859

5960
The following gated preview containers are hosted on the Container Preview registry, and require an application to access. See [Cognitive Services gating process](../../cognitive-services-gating-process.md) for more information.
6061

6162
| Service | Container | Container Registry / Repository / Image Name |
6263
|--|--|--|
63-
| [Anomaly detector](../../anomaly-detector/anomaly-detector-container-howto.md) | Anomaly Detector | `containerpreview.azurecr.io/microsoft/cognitive-services-anomaly-detector` |
6464
| [Computer Vision](../../Computer-vision/computer-vision-how-to-install-containers.md) | Read | `containerpreview.azurecr.io/microsoft/cognitive-services-read` |
6565
| [Face](../../face/face-how-to-install-containers.md) | Face | `containerpreview.azurecr.io/microsoft/cognitive-services-face` |
6666
| [Form recognizer](https://go.microsoft.com/fwlink/?linkid=2083826&clcid=0x409) | Form Recognizer | `containerpreview.azurecr.io/microsoft/cognitive-services-form-recognizer` |

articles/cognitive-services/containers/includes/create-container-instances-resource-from-azure-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The YAML below defines the Azure Container Instance resource. Copy and paste the
1919
apiVersion: 2018-10-01
2020
location: # < Valid location >
2121
name: # < Container Group name >
22-
imageRegistryCredentials: # This is required when pulling a non-public image
22+
imageRegistryCredentials: # This is required if you are pulling a non-public image
2323
- server: containerpreview.azurecr.io
2424
username: # < The username for the preview container registry >
2525
password: # < The password for the preview container registry >

articles/cognitive-services/text-analytics/how-tos/text-analytics-how-to-install-containers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.custom: seodec18
99
ms.service: cognitive-services
1010
ms.subservice: text-analytics
1111
ms.topic: conceptual
12-
ms.date: 04/01/2020
12+
ms.date: 05/08/2020
1313
ms.author: aahi
1414
---
1515

@@ -163,7 +163,7 @@ In this article, you learned concepts and workflow for downloading, installing,
163163
* You must specify billing information when instantiating a container.
164164

165165
> [!IMPORTANT]
166-
> Cognitive Services containers are not licensed to run without being connected to Azure for metering. Customers need to enable the containers to communicate billing information with the metering service at all times. Cognitive Services containers do not send customer data (e.g., the image or text that is being analyzed) to Microsoft.
166+
> Cognitive Services containers are not licensed to run without being connected to Azure for metering. Customers need to enable the containers to communicate billing information with the metering service at all times. Cognitive Services containers do not send customer data (e.g. text that is being analyzed) to Microsoft.
167167
168168
## Next steps
169169

0 commit comments

Comments
 (0)