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

Added CallbackUrl value to Web MVC deploy pipeline and deploy template

Browse Source
This commit is contained in:
Tim McCarthy 2020-03-02 20:31:36 -08:00
parent 6d5fd99985
commit b4640c9ea5
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/aro/web-mvc/azure-pipelines.yml
View File

@ -40,7 +40,7 @@ stages:
- script: 'oc project $(OpenShiftProject)' - script: 'oc project $(OpenShiftProject)'
failOnStderr: true failOnStderr: true
displayName: 'Set OpenShift Project Context' displayName: 'Set OpenShift Project Context'
- script: 'oc process -f ./deploy/aro/web-mvc/webmvc-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-' - script: 'oc process -f ./deploy/aro/web-mvc/webmvc-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_MVC_URL=$(WebMvcUrl) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-'
failOnStderr: true failOnStderr: true
displayName: 'Ensure Web MVC OpenShift DeploymentConfig and Service' displayName: 'Ensure Web MVC OpenShift DeploymentConfig and Service'
- script: 'oc apply -f ./deploy/aro/web-mvc/webmvc-public-route.json' - script: 'oc apply -f ./deploy/aro/web-mvc/webmvc-public-route.json'

2
deploy/aro/web-mvc/webmvc-deploy-template.yml
View File

@ -28,6 +28,8 @@ objects:
- env: - env:
- name: IdentityUrl - name: IdentityUrl
value: ${IDENTITY_URL_EXTERNAL} value: ${IDENTITY_URL_EXTERNAL}
- name: CallbackUrl
value: ${WEB_MVC_URL}
- name: PurchaseUrl - name: PurchaseUrl
value: ${WEB_SHOPPING_API_GATEWAY_URL} value: ${WEB_SHOPPING_API_GATEWAY_URL}
- name: MarketingUrl - name: MarketingUrl