Merge branch 'local' of https://github.com/uglyscorpio/eShopOnContainers into local

build/azure-devops/multiarch.yaml

@@ -17,10 +17,11 @@ jobs:
     displayName: Docker Login
     inputs:
       command: login
-      # containerregistrytype: 'Container Registry'
-      #dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
-      containerRegistry: heigooRegistry
-      arguments: --secret username=7a304605-08fa-47e2-adea-49d529dcabc4,password=7a304605-08fa-47e2-adea-49d529dcabc4/kv59J2RHiknv-v_uLzQIj37_zHjvX4QgZ
+      containerregistrytype: 'Container Registry'
+      dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
+      azureContainerRegistry: ${{ parameters.registryEndpoint }}
+      containerRegistry: ${{ parameters.registryEndpoint }}
+      #arguments: --secret username=7a304605-08fa-47e2-adea-49d529dcabc4,password=7a304605-08fa-47e2-adea-49d529dcabc4/kv59J2RHiknv-v_uLzQIj37_zHjvX4QgZ
       # Disabled windows deploy
       # docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:linux-${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:win-${{ parameters.branch }}
       # docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:latest ${{ parameters.registry }}/${{ parameters.image }}:linux-latest ${{ parameters.registry }}/${{ parameters.image }}:win-latest

build/azure-devops/webspa/azure-pipelines.yml

@@ -19,8 +19,8 @@ jobs:
     registryEndpoint: $(registryEndpoint)
     helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm
     helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm
-- template: ../multiarch.yaml
-  parameters:
-    image: webspa
-    branch: $(Build.SourceBranchName)
-    registryEndpoint: $(registryEndpoint)
+# - template: ../multiarch.yaml
+#   parameters:
+#     image: webspa
+#     branch: $(Build.SourceBranchName)
+#     registryEndpoint: $(registryEndpoint)

deploy/k8s/helm/allrelated.sh

@@ -245,3 +245,31 @@ az acr login --name $ACR_NAME
 
 echo "Completed AKS Setup"
 date
+#######################
+# Post the following JSON payload to the endpoint, sending a valid Basic Access Token
+# https://dev.azure.com/{organization}/{project}/_apis/serviceendpoint/endpoints?api-version=5.1-preview.2
+
+{
+    "authorization": {
+        "scheme": "ServicePrincipal",
+        "parameters": {
+            "loginServer": "<ACRSERVER>.azurecr.io",
+            "servicePrincipalId": "<APPLICATIONid OF SPN>",
+            "tenantId": "<TENANTID>",
+            "serviceprincipalkey": "<SPN kEY>"
+        }
+    },
+    "description": "",
+    "name": "Name of Connection",
+    "type": "dockerregistry",
+    "url": "https://<ACRSERVER>.azurecr.io",
+    "isShared": false,
+    "owner": "library",
+    "data": {
+        "registryId": "/subscriptions/<SUBSCRIPTIONID>/resourceGroups/<RESOURCEGROUP>/providers/Microsoft.ContainerRegistry/registries/<ACRSERVER>",
+        "registrytype": "ACR",
+        "spnObjectId": "",
+        "subscriptionId": "<SUBSCRIPTIONID>",
+        "subscriptionName": "<SUBSCRIPTIONNAME>"
+    }
+}