Updated SF Windows manifests

Set single instance per SF service

ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Cloud.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application Name="fabric:/Bus" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
-    <Parameter Name="RabbitMQ_InstanceCount" Value="-1" />
+    <Parameter Name="RabbitMQ_InstanceCount" Value="1" />
   </Parameters>
 </Application>

ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Cloud.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application Name="fabric:/NoSQL" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
-    <Parameter Name="MongoDB_InstanceCount" Value="-1" />
+    <Parameter Name="MongoDB_InstanceCount" Value="1" />
   </Parameters>
 </Application>

ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Cloud.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application Name="fabric:/Redis" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
-    <Parameter Name="BasketData_InstanceCount" Value="-1" />
+    <Parameter Name="BasketData_InstanceCount" Value="1" />
   </Parameters>
 </Application>

ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml

@@ -15,12 +15,12 @@
     <EntryPoint>
       <!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
       <ContainerHost>
-        <ImageName>microsoft/mssql-server-windows-developer:2016-sp1-windowsservercore-10.0.14393.1480</ImageName>
+        <ImageName>microsoft/mssql-server-windows-developer:2017</ImageName>
       </ContainerHost>
     </EntryPoint>
     <!-- Pass environment variables to your container: -->
     <EnvironmentVariables>
-      <EnvironmentVariable Name="MSSQL_SA_PASSWORD" Value="Pass@word"/>
+      <EnvironmentVariable Name="SA_PASSWORD" Value="Pass@word"/>
       <EnvironmentVariable Name="ACCEPT_EULA" Value="Y"/>
     </EnvironmentVariables>
   </CodePackage>

ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Cloud.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application Name="fabric:/Sql" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
-    <Parameter Name="SqlServer_InstanceCount" Value="-1" />
+    <Parameter Name="SqlServer_InstanceCount" Value="1" />
   </Parameters>
 </Application>

ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml

@@ -12,7 +12,8 @@
     <Parameter Name="CatalogApi_InstanceCount" DefaultValue="-1" />
     <Parameter Name="BasketApi_InstanceCount" DefaultValue="-1" />
     <Parameter Name="IdentityUrlExternal" DefaultValue="" />
-    <Parameter Name="PicBaseUrl" DefaultValue="" />
+    <Parameter Name="PicBaseUrlCatalog" DefaultValue="" />
+    <Parameter Name="PicBaseUrlMarketing" DefaultValue="" />
     <Parameter Name="InstrumentationKey" DefaultValue="" />
   </Parameters>
   <!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion 
@@ -25,6 +26,7 @@
     <EnvironmentOverrides CodePackageRef="Code">
       <EnvironmentVariable Name="IdentityUrlExternal" Value="[IdentityUrlExternal]"/>
       <EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value="[InstrumentationKey]"/>
+      <EnvironmentVariable Name="PicBaseUrl" Value="[PicBaseUrlMarketing]"/>
     </EnvironmentOverrides>
     <Policies>
     <ContainerHostPolicies CodePackageRef="Code">
@@ -70,7 +72,7 @@
   <ServiceManifestImport>
     <ServiceManifestRef ServiceManifestName="CatalogApiPkg" ServiceManifestVersion="1.0.0" />
     <EnvironmentOverrides CodePackageRef="Code">
-      <EnvironmentVariable Name="PicBaseUrl" Value="[PicBaseUrl]"/>
+      <EnvironmentVariable Name="PicBaseUrl" Value="[PicBaseUrlCatalog]"/>
       <EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value="[InstrumentationKey]"/>
     </EnvironmentOverrides>
     <Policies>

ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml

@@ -21,7 +21,7 @@
     <!-- Pass environment variables to your container: -->
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
-      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
+      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/> 
       <EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabricsql,5433;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word"/>
       <EnvironmentVariable Name="PicBaseUrl" Value="http://catalogapi.eshoponservicefabric:5101/api/v1/catalog/items/[0]/pic/"/>
       <EnvironmentVariable Name="AzureStorageAccountName" Value=""/>

ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml

@@ -27,7 +27,7 @@
       <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabricbus"/>
       <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
       <EnvironmentVariable Name="CampaignDetailFunctionUri" Value=""/>
-      <EnvironmentVariable Name="PicBaseUrl" Value="http://marketingapi.eshoponservicefabric:5110/api/v1/campaigns/[0]/pic/"/>
+      <EnvironmentVariable Name="PicBaseUrl" Value=""/>
       <EnvironmentVariable Name="AzureStorageAccountName" Value=""/>
       <EnvironmentVariable Name="AzureStorageAccountKey" Value=""/>
       <EnvironmentVariable Name="AzureStorageEnabled" Value="False"/>

ServiceFabric/Windows/eShopOnServiceFabric/ApplicationParameters/Cloud.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application Name="fabric:/eShopOnServiceFabric" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
-    <Parameter Name="MarketingApi_InstanceCount" Value="-1" />
-    <Parameter Name="LocationsApi_InstanceCount" Value="-1" />
-    <Parameter Name="PaymentApi_InstanceCount" Value="-1" />
-    <Parameter Name="OrderingApi_InstanceCount" Value="-1" />
-    <Parameter Name="CatalogApi_InstanceCount" Value="-1" />
-    <Parameter Name="BasketApi_InstanceCount" Value="-1" />
+    <Parameter Name="MarketingApi_InstanceCount" Value="1" />
+    <Parameter Name="LocationsApi_InstanceCount" Value="1" />
+    <Parameter Name="PaymentApi_InstanceCount" Value="1" />
+    <Parameter Name="OrderingApi_InstanceCount" Value="1" />
+    <Parameter Name="CatalogApi_InstanceCount" Value="1" />
+    <Parameter Name="BasketApi_InstanceCount" Value="1" />
     <Parameter Name="IdentityUrlExternal" Value="http://#{your_sf_dns}#:5105" />
-    <Parameter Name="PicBaseUrl" Value="http://#{your_sf_dns}#:5101/api/v1/catalog/items/[0]/pic/" />
+    <Parameter Name="PicBaseUrlCatalog" Value="http://#{your_sf_dns}#:5101/api/v1/catalog/items/[0]/pic/" />
+    <Parameter Name="PicBaseUrlMarketing" Value="http://#{your_sf_dns}#:5110/api/v1/campaigns/[0]/pic/" />
     <Parameter Name="InstrumentationKey" Value="" />
   </Parameters>
 </Application>

ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application Name="fabric:/eShopOnServiceFabricIdSrv" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
-    <Parameter Name="IdentityApi_InstanceCount" Value="-1" />
+    <Parameter Name="IdentityApi_InstanceCount" Value="1" />
     <Parameter Name="SpaClient" Value="http://#{your_sf_dns}#:5104" />
     <Parameter Name="XamarinCallback" Value="http://#{your_sf_dns}#:5105/xamarincallback" />
     <Parameter Name="MvcClient" Value="http://#{your_sf_dns}#:5100" />

ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml

@@ -28,6 +28,12 @@
       <EnvironmentVariable Name="IdentityUrl" Value=""/>
       <EnvironmentVariable Name="MarketingUrl" Value="http://marketingapi.eshoponservicefabric:5110"/>
       <EnvironmentVariable Name="LocationsUrl" Value="http://locationsapi.eshoponservicefabric:5109"/>
+      <EnvironmentVariable Name="CatalogUrlHC" Value="http://catalogapi.eshoponservicefabric:5101/hc"/>
+      <EnvironmentVariable Name="OrderingUrlHC" Value="http://orderingapi.eshoponservicefabric:5102/hc"/>
+      <EnvironmentVariable Name="IdentityUrlHC" Value="http://identityapi.eshoponservicefabric:5105/hc"/>
+      <EnvironmentVariable Name="BasketUrlHC" Value="http://basketapi.eshoponservicefabric:5103/hc"/>
+      <EnvironmentVariable Name="PaymentUrlHC" Value="http://paymentapi.eshoponservicefabric:5108/hc"/>
+      <EnvironmentVariable Name="MarketingUrlHC" Value="http://marketingapi.eshoponservicefabric:5110/hc"/>
       <EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value=""/>
       <EnvironmentVariable Name="OrchestratorType" Value="SF"/>
     </EnvironmentVariables>

ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application Name="fabric:/eShopOnServiceFabricWebMVC" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
-    <Parameter Name="WebMVC_InstanceCount" Value="-1" />
+    <Parameter Name="WebMVC_InstanceCount" Value="1" />
     <Parameter Name="IdentityUrl" Value="http://#{your_sf_dns}#:5105" />
     <Parameter Name="InstrumentationKey" Value="" />
   </Parameters>

ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application Name="fabric:/eShopOnServiceFabricWebSPA" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
-    <Parameter Name="WebSPA_InstanceCount" Value="-1" />
+    <Parameter Name="WebSPA_InstanceCount" Value="1" />
     <Parameter Name="CatalogUrl" Value="http://#{your_sf_dns}#:5101" />
     <Parameter Name="OrderingUrl" Value="http://#{your_sf_dns}#:5102" />
     <Parameter Name="BasketUrl" Value="http://#{your_sf_dns}#:5103" />

ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml

@@ -22,14 +22,15 @@
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <EnvironmentVariable Name="CatalogUrl" Value="http://catalogapi.eshoponservicefabric:5101"/>
-      <EnvironmentVariable Name="OrderingUrl" Value="http://orderingapi.eshoponservicefabric:5102"/>
-      <EnvironmentVariable Name="BasketUrl" Value="http://basketapi.eshoponservicefabric:5103"/>
-      <EnvironmentVariable Name="IdentityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
-      <EnvironmentVariable Name="MarketingUrl" Value="http://marketingapi.eshoponservicefabric:5110"/>
-      <EnvironmentVariable Name="LocationsUrl" Value="http://locationsapi.eshoponservicefabric:5109"/>
-      <EnvironmentVariable Name="mvc" Value="http://webmvc.eshoponservicefabric:5100"/>
-      <EnvironmentVariable Name="spa" Value="http://webspa.eshoponservicefabric:5104"/>
+      <EnvironmentVariable Name="CatalogUrl" Value="http://catalogapi.eshoponservicefabric:5101/hc"/>
+      <EnvironmentVariable Name="OrderingUrl" Value="http://orderingapi.eshoponservicefabric:5102/hc"/>
+      <EnvironmentVariable Name="BasketUrl" Value="http://basketapi.eshoponservicefabric:5103/hc"/>
+      <EnvironmentVariable Name="IdentityUrl" Value="http://identityapi.eshoponservicefabric:5105/hc"/>
+      <EnvironmentVariable Name="MarketingUrl" Value="http://marketingapi.eshoponservicefabric:5110/hc"/>
+      <EnvironmentVariable Name="LocationsUrl" Value="http://locationsapi.eshoponservicefabric:5109/hc"/>
+      <EnvironmentVariable Name="PaymentUrl" Value="http://paymentapi.eshoponservicefabric:5108/hc"/>
+      <EnvironmentVariable Name="mvc" Value="http://webmvc.eshoponservicefabric:5100/hc"/>
+      <EnvironmentVariable Name="spa" Value="http://webspa.eshoponservicefabric:5104/hc"/>
       <EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value=""/>
       <EnvironmentVariable Name="OrchestratorType" Value="SF"/>
     </EnvironmentVariables>

ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Cloud.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application Name="fabric:/eShopOnServiceFabricWebStatus" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
-    <Parameter Name="WebStatus_InstanceCount" Value="-1" />
+    <Parameter Name="WebStatus_InstanceCount" Value="1" />
     <Parameter Name="InstrumentationKey" Value="" />
   </Parameters>
 </Application>