Skip to content

Commit 1f9ea03

Browse files
authored
Merge pull request #13852 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch main)
2 parents 907deb0 + 7950166 commit 1f9ea03

6 files changed

+14
-14
lines changed

docs/azure/azure-deployment-using-github-actions.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ These steps are appropriate if you have more than one project that uses Docker c
9898

9999
If you choose to create a new one, you see this screen. Provide the resource group, SKU, and choose the same region, if possible, as before. For information about the SKUs for Azure Container Registry, see [Azure Container Registry service tiers](/azure/container-registry/container-registry-skus).
100100

101-
![Screenshot showing a new Azure container registry that was just created.](./media/azure-deployment-using-github-actions/github-actions-create-azure-container-registry.png)
101+
![Screenshot showing a new Azure Container Registry that was just created.](./media/azure-deployment-using-github-actions/github-actions-create-azure-container-registry.png)
102102

103103
Once created, the new registry shows on the screen.
104104

105-
![Screenshot showing creating a new Azure container registry.](./media/azure-deployment-using-github-actions/github-actions-created-azure-container-registry.png)
105+
![Screenshot showing creating a new Azure Container Registry.](./media/azure-deployment-using-github-actions/github-actions-created-azure-container-registry.png)
106106

107107
1. The deployable projects in your solution are displayed; choose the projects you want to deploy together in the same Azure Container Apps instance.
108108

@@ -140,7 +140,7 @@ WebApi_buildImageAndDeploy:
140140
registry: ${{ env.CONTAINER_REGISTRY_LOGIN_SERVER }}
141141
username: ${{ secrets.registry20230810121555_USERNAME_6891 }}
142142
password: ${{ secrets.registry20230810121555_PASSWORD_6891 }}
143-
- name: Build and push Docker image to Azure container registry
143+
- name: Build and push Docker image to Azure Container Registry
144144
uses: docker/build-push-action@v4
145145
with:
146146
push: true
@@ -173,7 +173,7 @@ WebFrontEnd_buildImageAndDeploy:
173173
registry: ${{ env.CONTAINER_REGISTRY_LOGIN_SERVER }}
174174
username: ${{ secrets.registry20230810121555_USERNAME_2047 }}
175175
password: ${{ secrets.registry20230810121555_PASSWORD_2047 }}
176-
- name: Build and push Docker image to Azure container registry
176+
- name: Build and push Docker image to Azure Container Registry
177177
uses: docker/build-push-action@v4
178178
with:
179179
push: true
@@ -210,7 +210,7 @@ DOCKER_FILEPATH_WEBFRONTEND: docker/ComposeSample/WebFrontend/Dockerfile
210210
Use the values of these environment variables for the `file` parameter as follows:
211211

212212
```yml
213-
- name: Build and push Docker image to Azure container registry
213+
- name: Build and push Docker image to Azure Container Registry
214214
uses: docker/build-push-action@v4
215215
with:
216216
push: true

docs/azure/end-to-end-deployment-entity-framework-core-github-actions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ The publishing features of Visual Studio can handle creating these resources for
115115
- Select **Ok** to close the container apps environment dialog.
116116
- Select **Create** to close the original container apps dialog. Visual Studio creates the container app resource in Azure.
117117
1. Once the resource is created, make sure it's selected in the list of container apps, and then select **Next**.
118-
1. You'll need to create an Azure container registry to store the published image artifact for your app. Select the green **+** icon on the **Container Registry** screen.
118+
1. You'll need to create an Azure Container Registry to store the published image artifact for your app. Select the green **+** icon on the **Container Registry** screen.
119119

120120
:::image type="content" source="./media/end-to-end-deployment-entity-framework-core-github-actions/visual-studio-container-registry.png" lightbox="./media/end-to-end-deployment-entity-framework-core-github-actions/visual-studio-container-registry-large.png" alt-text="A screenshot showing how to create a new container registry.":::
121121

docs/containers/container-tools-react.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ Once the develop and debug cycle of the app is completed, you can create a produ
384384

385385
1. Select **Create**, and then select **Finish**.
386386

387-
![Screenshot showing Select or create a new Azure container registry.](media/container-tools-react/vs-2019/publish-dialog2.png)
387+
![Screenshot showing Select or create a new Azure Container Registry.](media/container-tools-react/vs-2019/publish-dialog2.png)
388388

389389
When the publish process ends, you can review the publish settings, and edit them, when needed, or publish the image again using the **Publish** button.
390390

@@ -420,7 +420,7 @@ Once the develop and debug cycle of the app is completed, you can create a produ
420420

421421
1. Select **Create**, and then select **Finish**.
422422

423-
![Screenshot showing Select or create a new Azure container registry.](media/container-tools-react/vs-2022/publish-dialog-2.png)
423+
![Screenshot showing Select or create a new Azure Container Registry.](media/container-tools-react/vs-2022/publish-dialog-2.png)
424424

425425
When the publish process ends, you can review the publish settings, and edit them, when needed, or publish the image again using the **Publish** button.
426426

docs/containers/container-tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Once the develop and debug cycle of the app is completed, you can create a produ
134134

135135
1. Choose **Create New Azure Container Registry**.
136136

137-
![Screenshot of Publish dialog - choose Create a new Azure container registry.](media/container-tools/vs-2022/select-existing-or-create-new-azure-container-registry.png)
137+
![Screenshot of Publish dialog - choose Create a new Azure Container Registry.](media/container-tools/vs-2022/select-existing-or-create-new-azure-container-registry.png)
138138

139139
1. Fill in your desired values in the **Create a new Azure Container Registry**.
140140

docs/containers/hosting-web-apps-in-docker.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ The following steps guide you through creating a basic ASP.NET Core app that you
6363

6464
1. On the **Container Registry** tab, select the **Create a new Azure Container Registry** option at the bottom:
6565

66-
:::image type="content" source="media/container-tools/vs-2019/select-existing-or-create-new-azure-container-registry.png" border="false" alt-text="Screenshot of the Publish dialog that shows how to choose Create New Azure container registry.":::
66+
:::image type="content" source="media/container-tools/vs-2019/select-existing-or-create-new-azure-container-registry.png" border="false" alt-text="Screenshot of the Publish dialog that shows how to choose Create New Azure Container Registry.":::
6767

6868
1. On the **Azure Container Registry** page, enter your values for the new resource:
6969

@@ -75,7 +75,7 @@ The following steps guide you through creating a basic ASP.NET Core app that you
7575
| **[SKU](/azure/container-registry/container-registry-skus)** | "Standard" | Select the service tier of the container registry. |
7676
| **Registry Location** | A nearby location | Choose a location in a [region](https://azure.microsoft.com/explore/global-infrastructure/geographies/) close to you or close to other services that you expect to use the container registry. |
7777

78-
:::image type="content" source="media/hosting-web-apps-in-docker/vs-azure-container-registry-provisioning-dialog-2019.png" border="false" alt-text="Screenshot that shows how to enter values in the dialog to create a new Azure container registry.":::
78+
:::image type="content" source="media/hosting-web-apps-in-docker/vs-azure-container-registry-provisioning-dialog-2019.png" border="false" alt-text="Screenshot that shows how to enter values in the dialog to create a new Azure Container Registry.":::
7979

8080
1. After you enter the resource values, select **Create**.
8181

@@ -97,7 +97,7 @@ The following steps guide you through creating a basic ASP.NET Core app that you
9797

9898
1. On the **Registry** tab, select the **Create new** (+) option at the right:
9999

100-
:::image type="content" source="media/container-tools/vs-2022/select-existing-or-create-new-azure-container-registry.png" border="false" alt-text="Screenshot of the Publish dialog that shows how to choose Create New Azure container registry.":::
100+
:::image type="content" source="media/container-tools/vs-2022/select-existing-or-create-new-azure-container-registry.png" border="false" alt-text="Screenshot of the Publish dialog that shows how to choose Create New Azure Container Registry.":::
101101

102102
1. Fill in your desired values in the **Azure Container Registry** screen.
103103

@@ -109,7 +109,7 @@ The following steps guide you through creating a basic ASP.NET Core app that you
109109
| **[SKU](/azure/container-registry/container-registry-skus)** | "Standard" | Select the service tier of the container registry. |
110110
| **Registry Location** | A nearby location | Choose a location in a [region](https://azure.microsoft.com/explore/global-infrastructure/geographies/) close to you or close to other services that you expect to use the container registry. |
111111

112-
:::image type="content" source="media/container-tools/vs-2022/vs-azure-container-registry-provisioning-dialog.png" border="false" alt-text="Screenshot that shows how to enter values in the dialog to create a new Azure container registry.":::
112+
:::image type="content" source="media/container-tools/vs-2022/vs-azure-container-registry-provisioning-dialog.png" border="false" alt-text="Screenshot that shows how to enter values in the dialog to create a new Azure Container Registry.":::
113113

114114
1. After you enter the resource values, select **Create**.
115115

docs/containers/includes/vs-2019/container-tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Once the develop and debug cycle of the app is completed, you can create a produ
9898

9999
1. Choose **Create New Azure Container Registry**.
100100

101-
![Screenshot of Publish dialog - choose Create a new Azure container registry.](../../media/container-tools/vs-2019/select-existing-or-create-new-azure-container-registry.png)
101+
![Screenshot of Publish dialog - choose Create a new Azure Container Registry.](../../media/container-tools/vs-2019/select-existing-or-create-new-azure-container-registry.png)
102102

103103
1. Fill in your desired values in the **Create a new Azure Container Registry**.
104104

0 commit comments

Comments
 (0)