ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Deli Liu 2021-11-25 09:12:51 +08:00
commit 3f16c982c2
3 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/azure-devops/multiarch.yaml
View File

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

10
build/azure-devops/webspa/azure-pipelines.yml
View File

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

28
deploy/k8s/helm/allrelated.sh
View File

@ -245,3 +245,31 @@ az acr login --name $ACR_NAME
echo "Completed AKS Setup" echo "Completed AKS Setup"
date 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>"
}
}