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

fix bug pre deploy

pull/931/head
Erik Pique 6 years ago
parent
3fc0192f25
commit
afa273b723
13 changed files with 25 additions and 22 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml
  2. +1
    -1
      ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml
  3. +1
    -1
      ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Cloud.xml
  4. +1
    -1
      ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Cloud.xml
  5. +1
    -1
      ServiceFabric/Windows/eShopOnServiceFabric/PublishProfiles/Cloud.xml
  6. +1
    -1
      ServiceFabric/Windows/eShopOnServiceFabricApiGateWays/eShopOnServiceFabricApiGW/eShopOnServiceFabricApiGW/PublishProfiles/Cloud.xml
  7. +7
    -1
      ServiceFabric/Windows/eShopOnServiceFabricBFF/PublishProfiles/Cloud.xml
  8. +1
    -1
      ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml
  9. +1
    -1
      ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml
  10. +5
    -11
      ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml
  11. +3
    -0
      ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
  12. +1
    -1
      ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml
  13. +1
    -1
      ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml

+ 1
- 1
ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true"
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" />
</PublishProfile>

+ 1
- 1
ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true"
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" />
</PublishProfile>

+ 1
- 1
ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Cloud.xml View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true"
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" />
</PublishProfile>

+ 1
- 1
ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Cloud.xml View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true"
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" />
</PublishProfile>

+ 1
- 1
ServiceFabric/Windows/eShopOnServiceFabric/PublishProfiles/Cloud.xml View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true"
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" />
</PublishProfile>

+ 1
- 1
ServiceFabric/Windows/eShopOnServiceFabricApiGateWays/eShopOnServiceFabricApiGW/eShopOnServiceFabricApiGW/PublishProfiles/Cloud.xml View File

@ -20,7 +20,7 @@
AzureActiveDirectory="true"
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" />
<CopyPackageParameters CompressPackage="true" />
</PublishProfile>

+ 7
- 1
ServiceFabric/Windows/eShopOnServiceFabricBFF/PublishProfiles/Cloud.xml View File

@ -6,6 +6,12 @@
For a local cluster, you would typically not use any parameters.
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" />
</PublishProfile>

+ 1
- 1
ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true"
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" />
</PublishProfile>

+ 1
- 1
ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true"
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" />
</PublishProfile>

+ 5
- 11
ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml View File

@ -6,15 +6,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameters>
<Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" />
<Parameter Name="CatalogUrl" DefaultValue="" />
<Parameter Name="OrderingUrl" 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="" />
<Parameter Name="CatalogUrl" DefaultValue="" />
<Parameter Name="OrderingUrl" DefaultValue="" />
<Parameter Name="BasketUrl" DefaultValue="" />
</Parameters>
<!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion
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" />
<!-- Override external urls depending on environment -->
<EnvironmentOverrides CodePackageRef="Code">
<EnvironmentVariable Name="MarketingUrl" Value="[MarketingUrl]"/>
<EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/>
<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="IdentityUrl" Value="[IdentityUrl]"/>
<EnvironmentVariable Name="OrderingBackgroundUrl" Value="[OrderingBackgroundUrl]"/>
<EnvironmentVariable Name="OrderingSignalrHubUrl" Value="[OrderingSignalrHubUrl]"/>
<EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value="[InstrumentationKey]"/>
</EnvironmentOverrides>
<Policies>


+ 3
- 0
ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml View File

@ -25,6 +25,9 @@
<EnvironmentVariable Name="IdentityUrl" Value="http://#{your_sf_dns}#:5105"/>
<EnvironmentVariable Name="PurchaseUrl" Value="http://#{your_sf_dns}#:5202"/>
<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="MarketingUrlHC" Value="http://webmarketingapigw/hc"/>
<EnvironmentVariable Name="IdentityUrlHC" Value="http://identity.api/hc"/>


+ 1
- 1
ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true"
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" />
</PublishProfile>

+ 1
- 1
ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml View File

@ -20,6 +20,6 @@
AzureActiveDirectory="true"
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" />
</PublishProfile>

Write Preview
Loading…
Cancel
Save