Update app services

7 years ago · 8e20b82728
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml
@ -5,6 +5,9 @@
                     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <Parameters>
    <Parameter Name="BasketData_InstanceCount" DefaultValue="-1" />
    <Parameter Name="LocationsApi_InstanceCount" DefaultValue="-1" />
    <Parameter Name="PaymentApi_InstanceCount" DefaultValue="-1" />
    <Parameter Name="MarketingApi_InstanceCount" DefaultValue="-1" />
    <Parameter Name="GracePeriodManager_InstanceCount" DefaultValue="-1" />
    <Parameter Name="MongoDb_InstanceCount" DefaultValue="-1" />
@ -12,64 +15,29 @@
    <Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" />
    <Parameter Name="WebMVC_InstanceCount" DefaultValue="-1" />
    <Parameter Name="SqlServer_InstanceCount" DefaultValue="-1" />
    <Parameter Name="Redis_InstanceCount" DefaultValue="-1" />
    <Parameter Name="Rabbit_InstanceCount" DefaultValue="-1" />
    <Parameter Name="OrderingApi_InstanceCount" DefaultValue="-1" />
    <Parameter Name="IdentityApi_InstanceCount" DefaultValue="-1" />
    <Parameter Name="CatalogAPI_InstanceCount" DefaultValue="-1" />
    <Parameter Name="CatalogApi_InstanceCount" DefaultValue="-1" />
    <Parameter Name="BasketApi_InstanceCount" DefaultValue="-1" />
  </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 
       ServiceManifest.xml file. -->
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="MarketingApiPkg" ServiceManifestVersion="1.0.0" />
    <ServiceManifestRef ServiceManifestName="BasketDataPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
    <Policies>
      <ContainerHostPolicies CodePackageRef="Code">
        <PortBinding ContainerPort="6379" EndpointRef="BasketDataTypeEndpoint"/>
      </ContainerHostPolicies>
    </Policies>
  </ServiceManifestImport>

  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="GracePeriodManagerPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="MongoDbPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="WebStatusPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="WebSPAPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="WebMVCPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="SqlServerPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="RedisPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="RabbitPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="OrderingApiPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="IdentityApiPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="CatalogAPIPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="BasketApiPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
@ -97,15 +65,6 @@
      </ContainerHostPolicies>
    </Policies>
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="RedisPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
    <Policies>
      <ContainerHostPolicies CodePackageRef="Code">
        <PortBinding ContainerPort="6379" EndpointRef="RedisTypeEndpoint"/>
      </ContainerHostPolicies>
    </Policies>
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="IdentityApiPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
@ -169,23 +128,65 @@
      </ContainerHostPolicies>
    </Policies>
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="MarketingApiPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
    <Policies>
      <ContainerHostPolicies CodePackageRef="Code">
        <PortBinding ContainerPort="80" EndpointRef="MarketingApiTypeEndpoint"/>
      </ContainerHostPolicies>
    </Policies>
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="PaymentApiPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
    <Policies>
      <ContainerHostPolicies CodePackageRef="Code">
        <PortBinding ContainerPort="80" EndpointRef="PaymentApiTypeEndpoint"/>
      </ContainerHostPolicies>
    </Policies>
  </ServiceManifestImport>
  <ServiceManifestImport>
    <ServiceManifestRef ServiceManifestName="LocationsApiPkg" ServiceManifestVersion="1.0.0" />
    <ConfigOverrides />
    <Policies>
      <ContainerHostPolicies CodePackageRef="Code">
        <PortBinding ContainerPort="80" EndpointRef="LocationsApiTypeEndpoint"/>
      </ContainerHostPolicies>
    </Policies>
  </ServiceManifestImport>
  <DefaultServices>
    <!-- The section below creates instances of service types, when an instance of this 
         application type is created. You can also create one or more instances of service type using the 
         ServiceFabric PowerShell module.
         
         The attribute ServiceTypeName below must match the name defined in the imported ServiceManifest.xml file. -->
    <Service Name="MarketingApi" ServicePackageActivationMode="ExclusiveProcess">
    <Service Name="BasketData">
      <StatelessService ServiceTypeName="BasketDataType" InstanceCount="[BasketData_InstanceCount]">
        <SingletonPartition />
      </StatelessService>
    </Service>
    <Service Name="LocationsApi">
      <StatelessService ServiceTypeName="LocationsApiType" InstanceCount="[LocationsApi_InstanceCount]">
        <SingletonPartition />
      </StatelessService>
    </Service>
    <Service Name="PaymentApi">
      <StatelessService ServiceTypeName="PaymentApiType" InstanceCount="[PaymentApi_InstanceCount]">
        <SingletonPartition />
      </StatelessService>
    </Service>
    <Service Name="MarketingApi">
      <StatelessService ServiceTypeName="MarketingApiType" InstanceCount="[MarketingApi_InstanceCount]">
        <SingletonPartition />
      </StatelessService>
    </Service>
    <Service Name="GracePeriodManager" ServicePackageActivationMode="ExclusiveProcess">
    <Service Name="GracePeriodManager">
      <StatelessService ServiceTypeName="GracePeriodManagerType" InstanceCount="[GracePeriodManager_InstanceCount]">
        <SingletonPartition />
      </StatelessService>
    </Service>
    <Service Name="MongoDb" ServicePackageActivationMode="ExclusiveProcess">
    <Service Name="MongoDb">
      <StatelessService ServiceTypeName="MongoDbType" InstanceCount="[MongoDb_InstanceCount]">
        <SingletonPartition />
      </StatelessService>
@ -210,11 +211,6 @@
        <SingletonPartition />
      </StatelessService>
    </Service>
    <Service Name="Redis">
      <StatelessService ServiceTypeName="RedisType" InstanceCount="[Redis_InstanceCount]">
        <SingletonPartition />
      </StatelessService>
    </Service>
    <Service Name="Rabbit">
      <StatelessService ServiceTypeName="RabbitType" InstanceCount="[Rabbit_InstanceCount]">
        <SingletonPartition />
@ -230,8 +226,8 @@
        <SingletonPartition />
      </StatelessService>
    </Service>
    <Service Name="CatalogAPI">
      <StatelessService ServiceTypeName="CatalogAPIType" InstanceCount="[CatalogAPI_InstanceCount]">
    <Service Name="CatalogApi">
      <StatelessService ServiceTypeName="CatalogApiType" InstanceCount="[CatalogApi_InstanceCount]">
        <SingletonPartition />
      </StatelessService>
    </Service>
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml
@ -22,13 +22,12 @@
    <EnvironmentVariables>
      <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
      <EnvironmentVariable Name="ConnectionString" Value=""/>
      <EnvironmentVariable Name="identityUrl" Value=""/>
      <EnvironmentVariable Name="EventBusConnection" Value=""/>
      <EnvironmentVariable Name="ConnectionString" Value="basket.data"/>
      <EnvironmentVariable Name="identityUrl" Value="http://identity.api"/>
      <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq"/>
    </EnvironmentVariables>

  </CodePackage>

  </CodePackage>  
  
  <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
       independently-updateable and versioned set of custom configuration settings for your service. -->
  <ConfigPackage Name="Config" Version="1.0.0" />
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketDataPkg/Config/Settings.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketDataPkg/Config/Settings.xml
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketDataPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketDataPkg/ServiceManifest.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceManifest Name="RedisPkg"
 <ServiceManifest Name="BasketDataPkg"
                 Version="1.0.0"
                 xmlns="http://schemas.microsoft.com/2011/01/fabric"
                 xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@ -7,7 +7,7 @@
  <ServiceTypes>
    <!-- This is the name of your ServiceType.
         The UseImplicitHost attribute indicates this is a guest service. -->
    <StatelessServiceType ServiceTypeName="RedisType" UseImplicitHost="true" />
    <StatelessServiceType ServiceTypeName="BasketDataType" UseImplicitHost="true" />
  </ServiceTypes>

  <!-- Code package is your service executable. -->
@ -15,8 +15,7 @@
    <EntryPoint>
      <!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
      <ContainerHost>
        <ImageName>redis:latest</ImageName>
        <Commands></Commands>
        <ImageName>redis</ImageName>
      </ContainerHost>
    </EntryPoint>
    <!-- Pass environment variables to your container: -->
@ -36,7 +35,7 @@
      <!-- This endpoint is used by the communication listener to obtain the port on which to 
           listen. Please note that if your service is partitioned, this port is shared with 
           replicas of different partitions that are placed in your code. -->
      <Endpoint Name="RedisTypeEndpoint" Port="6379" UriScheme="http" />
      <Endpoint Name="BasketDataTypeEndpoint" Port="6379" UriScheme="http" />
    </Endpoints>
  </Resources>
 </ServiceManifest>
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/CatalogAPIPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/CatalogAPIPkg/ServiceManifest.xml
@ -23,9 +23,9 @@
    <EnvironmentVariables>
      <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
      <EnvironmentVariable Name="ConnectionString" Value=""/>
      <EnvironmentVariable Name="ConnectionString" Value="Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word"/>
      <EnvironmentVariable Name="ExternalCatalogBaseUrl" Value=""/>
      <EnvironmentVariable Name="EventBusConnection" Value=""/>
      <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq"/>
    </EnvironmentVariables>
  </CodePackage>

--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml
@ -23,12 +23,13 @@
    <EnvironmentVariables>
      <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
      <EnvironmentVariable Name="SpaClient" Value=""/>
      <EnvironmentVariable Name="ConnectionStrings" Value=""/>
      <EnvironmentVariable Name="MvcClient" Value=""/>
      <EnvironmentVariable Name="SpaClient" Value="http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104"/>
      <EnvironmentVariable Name="ConnectionStrings" Value="Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word"/>
      <EnvironmentVariable Name="MvcClient" Value="http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100"/>
      <EnvironmentVariable Name="XamarinCallback" Value="http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback"/>
    </EnvironmentVariables>
  </CodePackage>

  
  <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
       independently-updateable and versioned set of custom configuration settings for your service. -->
  <ConfigPackage Name="Config" Version="1.0.0" />
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/Config/Settings.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/Config/Settings.xml
@ -0,0 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Settings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/2011/01/fabric">
  <!-- Add your custom configuration sections and parameters here -->
  <!--
  <Section Name="MyConfigSection">
    <Parameter Name="MyParameter" Value="Value1" />
  </Section>
  -->
 </Settings>
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml
@ -0,0 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceManifest Name="LocationsApiPkg"
                 Version="1.0.0"
                 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">
  <ServiceTypes>
    <!-- This is the name of your ServiceType.
         The UseImplicitHost attribute indicates this is a guest service. -->
    <StatelessServiceType ServiceTypeName="LocationsApiType" UseImplicitHost="true" />
  </ServiceTypes>

  <!-- Code package is your service executable. -->
  <CodePackage Name="Code" Version="1.0.0">
    <EntryPoint>
      <!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
      <ContainerHost>
        <ImageName>eshop/locations.api:latest</ImageName>
      </ContainerHost>
    </EntryPoint>
    <!-- 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="ConnectionString" Value="mongodb://nosql.data"/>
      <EnvironmentVariable Name="Database" Value="LocationsDb"/>
      <EnvironmentVariable Name="identityUrl" Value="http://identity.api"/>
      <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq"/>
    </EnvironmentVariables>
  </CodePackage>

  <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
       independently-updateable and versioned set of custom configuration settings for your service. -->
  <ConfigPackage Name="Config" Version="1.0.0" />

  <Resources>
    <Endpoints>
      <!-- This endpoint is used by the communication listener to obtain the port on which to 
           listen. Please note that if your service is partitioned, this port is shared with 
           replicas of different partitions that are placed in your code. -->
      <Endpoint Name="LocationsApiTypeEndpoint" Port="5109" UriScheme="http" />
    </Endpoints>
  </Resources>
 </ServiceManifest>
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml
@ -23,14 +23,12 @@
      <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
      <EnvironmentVariable Name="ConnectionString" Value="Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word"/>
      <EnvironmentVariable Name="OrderingUrl" Value=""/>
      <EnvironmentVariable Name="IdentityUrl" Value=""/>
      <EnvironmentVariable Name="BasketUrl" Value=""/>
    </EnvironmentVariables>
    - ASPNETCORE_ENVIRONMENT=Development
    - ASPNETCORE_URLS=http://0.0.0.0:80
    - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
    - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105.
      <EnvironmentVariable Name="MongoConnectionString" Value="mongodb://nosql.data"/>
      <EnvironmentVariable Name="MongoDatabase" Value="MarketingDb"/>
      <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq"/>
      <EnvironmentVariable Name="ExternalCatalogBaseUrl" Value="http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110"/>
      <EnvironmentVariable Name="identityUrl" Value="http://identity.api"/>
    </EnvironmentVariables>   
  </CodePackage>

  <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MongoDbPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MongoDbPkg/ServiceManifest.xml
@ -15,7 +15,7 @@
    <EntryPoint>
      <!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
      <ContainerHost>
        <ImageName>mongo</ImageName>
        <ImageName>mongo:latest</ImageName>
      </ContainerHost>
    </EntryPoint>
    <!-- Pass environment variables to your container: -->
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml
@ -23,12 +23,12 @@
    <EnvironmentVariables>
      <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
      <EnvironmentVariable Name="ConnectionString" Value=""/>
      <EnvironmentVariable Name="identityUrl" Value=""/>
      <EnvironmentVariable Name="EventBusConnection" Value=""/>
      <EnvironmentVariable Name="ConnectionString" Value="Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word"/>
      <EnvironmentVariable Name="identityUrl" Value="http://identity.api"/>
      <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq"/>
    </EnvironmentVariables>
  </CodePackage>

 
  <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
       independently-updateable and versioned set of custom configuration settings for your service. -->
  <ConfigPackage Name="Config" Version="1.0.0" />
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/Config/Settings.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/Config/Settings.xml
@ -0,0 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Settings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/2011/01/fabric">
  <!-- Add your custom configuration sections and parameters here -->
  <!--
  <Section Name="MyConfigSection">
    <Parameter Name="MyParameter" Value="Value1" />
  </Section>
  -->
 </Settings>
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml
@ -0,0 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceManifest Name="PaymentApiPkg"
                 Version="1.0.0"
                 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">
  <ServiceTypes>
    <!-- This is the name of your ServiceType.
         The UseImplicitHost attribute indicates this is a guest service. -->
    <StatelessServiceType ServiceTypeName="PaymentApiType" UseImplicitHost="true" />
  </ServiceTypes>

  <!-- Code package is your service executable. -->
  <CodePackage Name="Code" Version="1.0.0">
    <EntryPoint>
      <!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
      <ContainerHost>
        <ImageName>eshop/payment.api:latest</ImageName>
      </ContainerHost>
    </EntryPoint>
    <!-- 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="EventBusConnection" Value="rabbitmq"/>     
    </EnvironmentVariables>
  </CodePackage>
  <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
       independently-updateable and versioned set of custom configuration settings for your service. -->
  <ConfigPackage Name="Config" Version="1.0.0" />

  <Resources>
    <Endpoints>
      <!-- This endpoint is used by the communication listener to obtain the port on which to 
           listen. Please note that if your service is partitioned, this port is shared with 
           replicas of different partitions that are placed in your code. -->
      <Endpoint Name="PaymentApiTypeEndpoint" Port="5108" UriScheme="http" />
    </Endpoints>
  </Resources>
 </ServiceManifest>
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
@ -23,10 +23,11 @@
    <EnvironmentVariables>
      <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
      <EnvironmentVariable Name="CatalogUrl" Value=""/>
      <EnvironmentVariable Name="OrderingUrl" Value=""/>
      <EnvironmentVariable Name="IdentityUrl" Value=""/>
      <EnvironmentVariable Name="BasketUrl" Value=""/>
      <EnvironmentVariable Name="CatalogUrl" Value="http://catalog.api"/>
      <EnvironmentVariable Name="OrderingUrl" Value="http://ordering.api"/>
      <EnvironmentVariable Name="BasketUrl" Value="http://basket.api"/>
      <EnvironmentVariable Name="IdentityUrl" Value="http://10.0.75.1:5105"/>
      <EnvironmentVariable Name="MarketingUrl" Value="http://marketing.api"/>
    </EnvironmentVariables>
  </CodePackage>

--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
@ -23,10 +23,11 @@
    <EnvironmentVariables>
      <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
      <EnvironmentVariable Name="CatalogUrl" Value=""/>
      <EnvironmentVariable Name="OrderingUrl" Value=""/>
      <EnvironmentVariable Name="IdentityUrl" Value=""/>
      <EnvironmentVariable Name="BasketUrl" Value=""/>
      <EnvironmentVariable Name="CatalogUrl" Value="http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101"/>
      <EnvironmentVariable Name="OrderingUrl" Value="http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102"/>
      <EnvironmentVariable Name="IdentityUrl" Value="http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105"/>
      <EnvironmentVariable Name="BasketUrl" Value="http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103"/>
      <EnvironmentVariable Name="MarketingUrl" Value="http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110"/>
    </EnvironmentVariables>
  </CodePackage>

--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
@ -23,12 +23,12 @@
    <EnvironmentVariables>
      <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
      <EnvironmentVariable Name="CatalogUrl" Value=""/>
      <EnvironmentVariable Name="OrderingUrl" Value=""/>
      <EnvironmentVariable Name="BasketUrl" Value=""/>
      <EnvironmentVariable Name="IdentityUrl" Value=""/>
      <EnvironmentVariable Name="mvc" Value=""/>
      <EnvironmentVariable Name="spa" Value=""/>
      <EnvironmentVariable Name="CatalogUrl" Value="http://catalog.api/hc"/>
      <EnvironmentVariable Name="OrderingUrl" Value="http://ordering.api/hc"/>
      <EnvironmentVariable Name="BasketUrl" Value="http://basket.api/hc"/>
      <EnvironmentVariable Name="IdentityUrl" Value="http://identity.api/hc"/>
      <EnvironmentVariable Name="mvc" Value="http://webmvc/hc"/>
      <EnvironmentVariable Name="spa" Value="http://webspa/hc"/>
    </EnvironmentVariables>
  </CodePackage>

--- a/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml
@ -1,6 +1,9 @@
 <?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="BasketData_InstanceCount" Value="-1" />
    <Parameter Name="LocationsApi_InstanceCount" Value="-1" />
    <Parameter Name="PaymentApi_InstanceCount" Value="-1" />
    <Parameter Name="MarketingApi_InstanceCount" Value="-1" />
    <Parameter Name="GracePeriodManager_InstanceCount" Value="-1" />
    <Parameter Name="MongoDb_InstanceCount" Value="-1" />
@ -8,11 +11,10 @@
    <Parameter Name="WebSPA_InstanceCount" Value="-1" />
    <Parameter Name="WebMVC_InstanceCount" Value="-1" />
    <Parameter Name="SqlServer_InstanceCount" Value="-1" />
    <Parameter Name="Redis_InstanceCount" Value="-1" />
    <Parameter Name="Rabbit_InstanceCount" Value="-1" />
    <Parameter Name="OrderingApi_InstanceCount" Value="-1" />
    <Parameter Name="IdentityApi_InstanceCount" Value="-1" />
    <Parameter Name="CatalogAPI_InstanceCount" Value="-1" />
    <Parameter Name="CatalogApi_InstanceCount" Value="-1" />
    <Parameter Name="BasketApi_InstanceCount" Value="-1" />
  </Parameters>
 </Application>
--- a/ServiceFabric/eShopOnServiceFabric/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabric/PublishProfiles/Cloud.xml
@ -20,6 +20,6 @@
                                    AzureActiveDirectory="true"
                                    ServerCertThumbprint="0123456789012345678901234567890123456789" />
  -->
  <ClusterConnectionParameters ConnectionEndpoint="" />
  <ClusterConnectionParameters ConnectionEndpoint="eshoponsf-test.westus.cloudapp.azure.com:19000" />
  <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
--- a/ServiceFabric/eShopOnServiceFabric/eShopOnServiceFabric.sfproj
+++ b/ServiceFabric/eShopOnServiceFabric/eShopOnServiceFabric.sfproj
@ -29,22 +29,26 @@
  <ItemGroup>
    <Content Include="ApplicationPackageRoot\BasketApiPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\BasketApiPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\CatalogAPIPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\CatalogAPIPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\BasketDataPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\BasketDataPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\CatalogApiPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\CatalogApiPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\GracePeriodManagerPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\GracePeriodManagerPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\IdentityApiPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\IdentityApiPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\LocationsApiPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\LocationsApiPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\MarketingApiPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\MarketingApiPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\MongoDbPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\MongoDbPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\OrderingApiPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\OrderingApiPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\PaymentApiPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\PaymentApiPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\RabbitPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\RabbitPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\RedisPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\RedisPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\SqlServerPkg\Config\Settings.xml" />
    <Content Include="ApplicationPackageRoot\SqlServerPkg\ServiceManifest.xml" />
    <Content Include="ApplicationPackageRoot\WebMVCPkg\Config\Settings.xml" />
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@ -122,7 +122,7 @@ services:
  payment.api:
    environment:
      - ASPNETCORE_ENVIRONMENT=Development
      - ASPNETCORE_URLS=http://0.0.0.0:5108
      - ASPNETCORE_URLS=http://0.0.0.0:80
      - EventBusConnection=rabbitmq
    ports:
      - "5108:80"
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -109,7 +109,7 @@ services:
      - rabbitmq    
    
  locations.api:
    image: locations.api
    image: eshop/locations.api
    build:
      context: ./src/Services/Location/Locations.API
      dockerfile: Dockerfile
--- a/src/Web/WebMVC/wwwroot/css/site.min.css
+++ b/src/Web/WebMVC/wwwroot/css/site.min.css