From 776af3e9ce95c7a7a412a5a3e5b9c3007c5bdaec Mon Sep 17 00:00:00 2001 From: Chris Tremblay <62187826+chtrembl@users.noreply.github.com> Date: Wed, 17 Jul 2024 16:54:09 -0400 Subject: [PATCH 1/7] Update azure-petstorepetservice-ci-cd-to-aks-pipeline.yml for Azure Pipelines --- manifests/azure-petstorepetservice-ci-cd-to-aks-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/azure-petstorepetservice-ci-cd-to-aks-pipeline.yml b/manifests/azure-petstorepetservice-ci-cd-to-aks-pipeline.yml index bda807d5..9b33889e 100644 --- a/manifests/azure-petstorepetservice-ci-cd-to-aks-pipeline.yml +++ b/manifests/azure-petstorepetservice-ci-cd-to-aks-pipeline.yml @@ -18,7 +18,7 @@ variables: # Container registry service connection established during pipeline creation dockerRegistryServiceConnection: 'azurepetstorecr' imageRepository: 'petstorepetservice' - containerRegistry: 'azurepetstorecontainerregistry.azurecr.io' + containerRegistry: 'azurepetstoremecr.azurecr.io' dockerfilePath: 'petstore/petstorepetservice/Dockerfile' tag: '$(Build.BuildId)' imagePullSecret: '$(crImagePullSecretGlobalV3)' From 9bc138d349b071a1f89367c669fc309bb6ad0438 Mon Sep 17 00:00:00 2001 From: Chris Tremblay <62187826+chtrembl@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:31:47 -0400 Subject: [PATCH 2/7] Update azure-petstorepetservice-ci-cd-to-aks-pipeline.yml for Azure Pipelines --- manifests/azure-petstorepetservice-ci-cd-to-aks-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/azure-petstorepetservice-ci-cd-to-aks-pipeline.yml b/manifests/azure-petstorepetservice-ci-cd-to-aks-pipeline.yml index 9b33889e..61714846 100644 --- a/manifests/azure-petstorepetservice-ci-cd-to-aks-pipeline.yml +++ b/manifests/azure-petstorepetservice-ci-cd-to-aks-pipeline.yml @@ -16,7 +16,7 @@ resources: variables: # Container registry service connection established during pipeline creation - dockerRegistryServiceConnection: 'azurepetstorecr' + dockerRegistryServiceConnection: 'azurepetstoremecr' imageRepository: 'petstorepetservice' containerRegistry: 'azurepetstoremecr.azurecr.io' dockerfilePath: 'petstore/petstorepetservice/Dockerfile' From ccf72f079cb2d2743a02ef73cf6d0aec6a4ec115 Mon Sep 17 00:00:00 2001 From: Chris Tremblay <62187826+chtrembl@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:32:39 -0400 Subject: [PATCH 3/7] Update azure-petstoreproductservice-ci-cd-to-aks-pipeline.yml for Azure Pipelines --- .../azure-petstoreproductservice-ci-cd-to-aks-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/azure-petstoreproductservice-ci-cd-to-aks-pipeline.yml b/manifests/azure-petstoreproductservice-ci-cd-to-aks-pipeline.yml index 23be6527..bfca9e99 100644 --- a/manifests/azure-petstoreproductservice-ci-cd-to-aks-pipeline.yml +++ b/manifests/azure-petstoreproductservice-ci-cd-to-aks-pipeline.yml @@ -18,7 +18,7 @@ variables: # Container registry service connection established during pipeline creation dockerRegistryServiceConnection: 'azurepetstorecr' imageRepository: 'petstoreproductservice' - containerRegistry: 'azurepetstorecontainerregistry.azurecr.io' + containerRegistry: 'azurepetstoremecr.azurecr.io' dockerfilePath: 'petstore/petstoreproductservice/Dockerfile' tag: '$(Build.BuildId)' imagePullSecret: '$(crImagePullSecretGlobalV2)' From 3b2b867549c6e577ccb5f27f6ad7c4382be0d9f4 Mon Sep 17 00:00:00 2001 From: Chris Tremblay <62187826+chtrembl@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:33:10 -0400 Subject: [PATCH 4/7] Update azure-petstoreorderservice-ci-cd-to-aks-pipeline.yml for Azure Pipelines --- manifests/azure-petstoreorderservice-ci-cd-to-aks-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/azure-petstoreorderservice-ci-cd-to-aks-pipeline.yml b/manifests/azure-petstoreorderservice-ci-cd-to-aks-pipeline.yml index 6b77721b..083038ef 100644 --- a/manifests/azure-petstoreorderservice-ci-cd-to-aks-pipeline.yml +++ b/manifests/azure-petstoreorderservice-ci-cd-to-aks-pipeline.yml @@ -18,7 +18,7 @@ variables: # Container registry service connection established during pipeline creation dockerRegistryServiceConnection: 'azurepetstorecr' imageRepository: 'petstoreorderservice' - containerRegistry: 'azurepetstorecontainerregistry.azurecr.io' + containerRegistry: 'azurepetstoremecr.azurecr.io' dockerfilePath: 'petstore/petstoreorderservice/Dockerfile' tag: '$(Build.BuildId)' imagePullSecret: '$(crImagePullSecretGlobalV2)' From 8988a76932c72451706e4ed43492e2f513766c13 Mon Sep 17 00:00:00 2001 From: Chris Tremblay <62187826+chtrembl@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:40:55 -0400 Subject: [PATCH 5/7] Update azure-petstoreproductservice-ci-cd-to-aks-pipeline.yml for Azure Pipelines --- .../azure-petstoreproductservice-ci-cd-to-aks-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/azure-petstoreproductservice-ci-cd-to-aks-pipeline.yml b/manifests/azure-petstoreproductservice-ci-cd-to-aks-pipeline.yml index bfca9e99..8def5630 100644 --- a/manifests/azure-petstoreproductservice-ci-cd-to-aks-pipeline.yml +++ b/manifests/azure-petstoreproductservice-ci-cd-to-aks-pipeline.yml @@ -16,7 +16,7 @@ resources: variables: # Container registry service connection established during pipeline creation - dockerRegistryServiceConnection: 'azurepetstorecr' + dockerRegistryServiceConnection: 'azurepetstoremecr' imageRepository: 'petstoreproductservice' containerRegistry: 'azurepetstoremecr.azurecr.io' dockerfilePath: 'petstore/petstoreproductservice/Dockerfile' From eda128f6168d1b66f37c0580a2b40bfa98dd6877 Mon Sep 17 00:00:00 2001 From: Chris Tremblay <62187826+chtrembl@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:41:20 -0400 Subject: [PATCH 6/7] Update azure-petstoreorderservice-ci-cd-to-aks-pipeline.yml for Azure Pipelines --- manifests/azure-petstoreorderservice-ci-cd-to-aks-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/azure-petstoreorderservice-ci-cd-to-aks-pipeline.yml b/manifests/azure-petstoreorderservice-ci-cd-to-aks-pipeline.yml index 083038ef..aeca4420 100644 --- a/manifests/azure-petstoreorderservice-ci-cd-to-aks-pipeline.yml +++ b/manifests/azure-petstoreorderservice-ci-cd-to-aks-pipeline.yml @@ -16,7 +16,7 @@ resources: variables: # Container registry service connection established during pipeline creation - dockerRegistryServiceConnection: 'azurepetstorecr' + dockerRegistryServiceConnection: 'azurepetstoremecr' imageRepository: 'petstoreorderservice' containerRegistry: 'azurepetstoremecr.azurecr.io' dockerfilePath: 'petstore/petstoreorderservice/Dockerfile' From 54f5c17befcfa8aa4c68c3e4369cd7e8d6a1d534 Mon Sep 17 00:00:00 2001 From: Chris Tremblay <62187826+chtrembl@users.noreply.github.com> Date: Thu, 18 Jul 2024 16:22:52 -0400 Subject: [PATCH 7/7] Update petstoreassistant_ci_cd_to_appservice.yml --- .github/workflows/petstoreassistant_ci_cd_to_appservice.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/petstoreassistant_ci_cd_to_appservice.yml b/.github/workflows/petstoreassistant_ci_cd_to_appservice.yml index 38537789..baf5e980 100644 --- a/.github/workflows/petstoreassistant_ci_cd_to_appservice.yml +++ b/.github/workflows/petstoreassistant_ci_cd_to_appservice.yml @@ -1,8 +1,8 @@ name: Pet Store Assistant CI/CD to Azure App Service env: - AZURE_CONTAINER_REGISTRY: azurepetstorecontainerregistry.azurecr.io - AZURE_CONTAINER_REGISTRY_USERNAME: azurepetstorecontainerregistry + AZURE_CONTAINER_REGISTRY: azurepetstoremecr.azurecr.io + AZURE_CONTAINER_REGISTRY_USERNAME: azurepetstoremecr on: push: