fix bug pre deploy

This commit is contained in:
Erik Pique 2019-01-31 13:23:16 +01:00
parent 3fc0192f25
commit afa273b723
13 changed files with 26 additions and 23 deletions

View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-win.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" FindType="FindByThumbprint" FindValue="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-win.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" FindType="FindByThumbprint" FindValue="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-win.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" FindType="FindByThumbprint" FindValue="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-win.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" FindType="FindByThumbprint" FindValue="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-win.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" FindType="FindByThumbprint" FindValue="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

View File

@ -20,7 +20,7 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-win.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" FindType="FindByThumbprint" FindValue="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
<CopyPackageParameters CompressPackage="true" /> <CopyPackageParameters CompressPackage="true" />
</PublishProfile> </PublishProfile>

View File

@ -6,6 +6,12 @@
For a local cluster, you would typically not use any parameters. For a local cluster, you would typically not use any parameters.
For example: <ClusterConnectionParameters /> For example: <ClusterConnectionParameters />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="eshopsflin.westeurope.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="31CF80FDFB8F64D379E3DCF9185032581B8FC080" FindType="FindByThumbprint" FindValue="31CF80FDFB8F64D379E3DCF9185032581B8FC080" StoreLocation="CurrentUser" StoreName="My" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-win.southcentralus.cloudapp.azure.com:19000"
X509Credential="true"
ServerCertThumbprint="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8"
FindType="FindByThumbprint"
FindValue="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8"
StoreLocation="CurrentUser"
StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-win.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" FindType="FindByThumbprint" FindValue="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-win.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" FindType="FindByThumbprint" FindValue="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

View File

@ -6,15 +6,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameters> <Parameters>
<Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" /> <Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" />
<Parameter Name="MarketingUrl" DefaultValue="" />
<Parameter Name="IdentityUrl" DefaultValue="" />
<Parameter Name="InstrumentationKey" DefaultValue="" />
<Parameter Name="CatalogUrl" DefaultValue="" /> <Parameter Name="CatalogUrl" DefaultValue="" />
<Parameter Name="OrderingUrl" DefaultValue="" /> <Parameter Name="OrderingUrl" DefaultValue="" />
<Parameter Name="BasketUrl" DefaultValue="" /> <Parameter Name="BasketUrl" DefaultValue="" />
<Parameter Name="MarketingUrl" DefaultValue="" />
<Parameter Name="IdentityUrl" DefaultValue="" />
<Parameter Name="OrderingBackgroundUrl" DefaultValue=""/>
<Parameter Name="OrderingSignalrHubUrl" DefaultValue=""/>
<Parameter Name="PaymentUrl" DefaultValue=""/>
<Parameter Name="InstrumentationKey" DefaultValue="" />
</Parameters> </Parameters>
<!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion <!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion
should match the Name and Version attributes of the ServiceManifest element defined in the should match the Name and Version attributes of the ServiceManifest element defined in the
@ -23,14 +20,11 @@
<ServiceManifestRef ServiceManifestName="WebSPAPkg" ServiceManifestVersion="1.0.0" /> <ServiceManifestRef ServiceManifestName="WebSPAPkg" ServiceManifestVersion="1.0.0" />
<!-- Override external urls depending on environment --> <!-- Override external urls depending on environment -->
<EnvironmentOverrides CodePackageRef="Code"> <EnvironmentOverrides CodePackageRef="Code">
<EnvironmentVariable Name="CatalogUrl" Value="[CatalogUrl]"/>
<EnvironmentVariable Name="PaymentUrl" Value="[PaymentUrl]"/>
<EnvironmentVariable Name="OrderingUrl" Value="[OrderingUrl]"/>
<EnvironmentVariable Name="BasketUrl" Value="[BasketUrl]"/>
<EnvironmentVariable Name="MarketingUrl" Value="[MarketingUrl]"/> <EnvironmentVariable Name="MarketingUrl" Value="[MarketingUrl]"/>
<EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/> <EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/>
<EnvironmentVariable Name="OrderingBackgroundUrl" Value="[OrderingBackgroundUrl]"/> <EnvironmentVariable Name="CatalogUrl" Value="[CatalogUrl]"/>
<EnvironmentVariable Name="OrderingSignalrHubUrl" Value="[OrderingSignalrHubUrl]"/> <EnvironmentVariable Name="OrderingUrl" Value="[OrderingUrl]"/>
<EnvironmentVariable Name="BasketUrl" Value="[BasketUrl]"/>
<EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value="[InstrumentationKey]"/> <EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value="[InstrumentationKey]"/>
</EnvironmentOverrides> </EnvironmentOverrides>
<Policies> <Policies>

View File

@ -25,6 +25,9 @@
<EnvironmentVariable Name="IdentityUrl" Value="http://#{your_sf_dns}#:5105"/> <EnvironmentVariable Name="IdentityUrl" Value="http://#{your_sf_dns}#:5105"/>
<EnvironmentVariable Name="PurchaseUrl" Value="http://#{your_sf_dns}#:5202"/> <EnvironmentVariable Name="PurchaseUrl" Value="http://#{your_sf_dns}#:5202"/>
<EnvironmentVariable Name="MarketingUrl" Value="http://#{your_sf_dns}#:5203"/> <EnvironmentVariable Name="MarketingUrl" Value="http://#{your_sf_dns}#:5203"/>
<EnvironmentVariable Name="CatalogUrl" Value="http://#{your_sf_dns}#:5101" />
<EnvironmentVariable Name="OrderingUrl" Value="http://#{your_sf_dns}#:5102" />
<EnvironmentVariable Name="BasketUrl" Value="http://#{your_sf_dns}#:5103" />
<EnvironmentVariable Name="PurchaseUrlHC" Value="http://webshoppingapigw/hc"/> <EnvironmentVariable Name="PurchaseUrlHC" Value="http://webshoppingapigw/hc"/>
<EnvironmentVariable Name="MarketingUrlHC" Value="http://webmarketingapigw/hc"/> <EnvironmentVariable Name="MarketingUrlHC" Value="http://webmarketingapigw/hc"/>
<EnvironmentVariable Name="IdentityUrlHC" Value="http://identity.api/hc"/> <EnvironmentVariable Name="IdentityUrlHC" Value="http://identity.api/hc"/>

View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-win.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" FindType="FindByThumbprint" FindValue="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-win.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" FindType="FindByThumbprint" FindValue="8CB7FD2C7578F51710D4A15A38AB2CDE59103AE8" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>