From 79469a16ab5a89d1bd13b06bc50e640458964f8d Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 24 Nov 2021 21:02:33 +0800 Subject: [PATCH 1/6] add lines --- deploy/k8s/helm/allrelated.sh | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/deploy/k8s/helm/allrelated.sh b/deploy/k8s/helm/allrelated.sh index 937fc6803..29d9c0dc2 100644 --- a/deploy/k8s/helm/allrelated.sh +++ b/deploy/k8s/helm/allrelated.sh @@ -214,3 +214,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": ".azurecr.io", + "servicePrincipalId": "", + "tenantId": "", + "serviceprincipalkey": "" + } + }, + "description": "", + "name": "Name of Connection", + "type": "dockerregistry", + "url": "https://.azurecr.io", + "isShared": false, + "owner": "library", + "data": { + "registryId": "/subscriptions//resourceGroups//providers/Microsoft.ContainerRegistry/registries/", + "registrytype": "ACR", + "spnObjectId": "", + "subscriptionId": "", + "subscriptionName": "" + } +} \ No newline at end of file From d80d32752ec7562f507c844c978652e632597842 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 24 Nov 2021 21:22:11 +0800 Subject: [PATCH 2/6] comment out --- build/azure-devops/multiarch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/azure-devops/multiarch.yaml b/build/azure-devops/multiarch.yaml index b281c5a4d..012b23284 100644 --- a/build/azure-devops/multiarch.yaml +++ b/build/azure-devops/multiarch.yaml @@ -20,7 +20,7 @@ jobs: # 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 + #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 From 82fba1607b197068231b2023965313bfad685c2a Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 24 Nov 2021 21:36:54 +0800 Subject: [PATCH 3/6] test again --- build/azure-devops/multiarch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/azure-devops/multiarch.yaml b/build/azure-devops/multiarch.yaml index 012b23284..b71e2e496 100644 --- a/build/azure-devops/multiarch.yaml +++ b/build/azure-devops/multiarch.yaml @@ -19,7 +19,7 @@ jobs: command: login # containerregistrytype: 'Container Registry' #dockerRegistryEndpoint: ${{ parameters.registryEndpoint }} - containerRegistry: heigooRegistry + containerRegistry: 'heigooRegistry' #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 }} From b8b556487be55418eb19ff493cf44a400c0b53ac Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 24 Nov 2021 22:16:12 +0800 Subject: [PATCH 4/6] test again --- build/azure-devops/multiarch.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/azure-devops/multiarch.yaml b/build/azure-devops/multiarch.yaml index b71e2e496..f95b124a6 100644 --- a/build/azure-devops/multiarch.yaml +++ b/build/azure-devops/multiarch.yaml @@ -19,7 +19,8 @@ jobs: command: login # containerregistrytype: 'Container Registry' #dockerRegistryEndpoint: ${{ parameters.registryEndpoint }} - containerRegistry: 'heigooRegistry' + 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 }} From dd21030f78e32179fc2ffdbebe94af7dc9e76c1e Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 24 Nov 2021 23:19:56 +0800 Subject: [PATCH 5/6] test11 --- build/azure-devops/multiarch.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/azure-devops/multiarch.yaml b/build/azure-devops/multiarch.yaml index f95b124a6..0c07998fd 100644 --- a/build/azure-devops/multiarch.yaml +++ b/build/azure-devops/multiarch.yaml @@ -17,8 +17,8 @@ jobs: displayName: Docker Login inputs: command: login - # containerregistrytype: 'Container Registry' - #dockerRegistryEndpoint: ${{ parameters.registryEndpoint }} + 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 From 0d287e2412f574b3f8c7ab14ffd4272766e7ae10 Mon Sep 17 00:00:00 2001 From: uglyscorpio Date: Wed, 24 Nov 2021 23:43:17 +0800 Subject: [PATCH 6/6] Update azure-pipelines.yml for Azure Pipelines --- build/azure-devops/webspa/azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/azure-devops/webspa/azure-pipelines.yml b/build/azure-devops/webspa/azure-pipelines.yml index 442a995ca..a38768012 100644 --- a/build/azure-devops/webspa/azure-pipelines.yml +++ b/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) \ No newline at end of file +# - template: ../multiarch.yaml +# parameters: +# image: webspa +# branch: $(Build.SourceBranchName) +# registryEndpoint: $(registryEndpoint) \ No newline at end of file