sf-win
This commit is contained in:
parent
a1eca3430d
commit
b19df7753a
@ -5,6 +5,7 @@
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<Parameters>
|
||||
<Parameter Name="OrderingSignalrHub_InstanceCount" DefaultValue="-1" />
|
||||
<Parameter Name="OrderingBackground_InstanceCount" DefaultValue="-1" />
|
||||
<Parameter Name="MarketingApi_InstanceCount" DefaultValue="-1" />
|
||||
<Parameter Name="LocationsApi_InstanceCount" DefaultValue="-1" />
|
||||
@ -20,6 +21,16 @@
|
||||
<!-- 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="OrderingSignalrHubPkg" ServiceManifestVersion="1.0.0" />
|
||||
<ConfigOverrides />
|
||||
<Policies>
|
||||
<ContainerHostPolicies CodePackageRef="Code">
|
||||
<PortBinding ContainerPort="80" EndpointRef="OrderingSignalrHubTypeEndpoint" />
|
||||
</ContainerHostPolicies>
|
||||
</Policies>
|
||||
</ServiceManifestImport>
|
||||
|
||||
<ServiceManifestImport>
|
||||
<ServiceManifestRef ServiceManifestName="OrderingBackgroundPkg" ServiceManifestVersion="1.0.0" />
|
||||
<ConfigOverrides />
|
||||
@ -28,7 +39,7 @@
|
||||
</EnvironmentOverrides>
|
||||
<Policies>
|
||||
<ContainerHostPolicies CodePackageRef="Code">
|
||||
<PortBinding ContainerPort="80" EndpointRef="OrderingBackgroundTasksTypeEndpoint"/>
|
||||
<PortBinding ContainerPort="80" EndpointRef="OrderingBackgroundTypeEndpoint"/>
|
||||
</ContainerHostPolicies>
|
||||
</Policies>
|
||||
</ServiceManifestImport>
|
||||
@ -112,6 +123,11 @@
|
||||
ServiceFabric PowerShell module.
|
||||
|
||||
The attribute ServiceTypeName below must match the name defined in the imported ServiceManifest.xml file. -->
|
||||
<Service Name="OrderingSignalrHub" ServicePackageActivationMode="ExclusiveProcess">
|
||||
<StatelessService ServiceTypeName="OrderingSignalrHubType" InstanceCount="[OrderingSignalrHub_InstanceCount]">
|
||||
<SingletonPartition />
|
||||
</StatelessService>
|
||||
</Service>
|
||||
<Service Name="OrderingBackground" ServicePackageActivationMode="ExclusiveProcess">
|
||||
<StatelessService ServiceTypeName="OrderingBackgroundType" InstanceCount="[OrderingBackground_InstanceCount]">
|
||||
<SingletonPartition />
|
||||
|
@ -15,7 +15,7 @@
|
||||
<EntryPoint>
|
||||
<!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
|
||||
<ContainerHost>
|
||||
<ImageName>eshop/ordering.backgroundtasks-win</ImageName>
|
||||
<ImageName>eshop/ordering.background-win:#{tag}#</ImageName>
|
||||
</ContainerHost>
|
||||
</EntryPoint>
|
||||
<!-- Pass environment variables to your container: -->
|
||||
@ -44,7 +44,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="OrderingBackgroundTasksTypeEndpoint" Port="5111" UriScheme="http" PathSuffix="eShopOnServiceFabric/OrderingBackgroundTasks"/>
|
||||
<Endpoint Name="OrderingBackgroundTypeEndpoint" Port="5111" UriScheme="http" PathSuffix="eShopOnServiceFabric/OrderingBackground"/>
|
||||
</Endpoints>
|
||||
</Resources>
|
||||
</ServiceManifest>
|
@ -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>
|
@ -0,0 +1,46 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ServiceManifest Name="OrderingSignalrHubPkg"
|
||||
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="OrderingSignalrHubType" 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/ordering.signalrhub-win:#{tag}#</ImageName>
|
||||
</ContainerHost>
|
||||
</EntryPoint>
|
||||
<!-- Pass environment variables to your container: -->
|
||||
<EnvironmentVariables>
|
||||
<EnvironmentVariable Name="ASPNETCORE_ENVIRONMEN" Value="Development"/>
|
||||
<EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
|
||||
<EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabricbus"/>
|
||||
<EnvironmentVariable Name="EventBusUserName" Value="admin"/>
|
||||
<EnvironmentVariable Name="EventBusPassword" Value="password"/>
|
||||
<EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
|
||||
<EnvironmentVariable Name="OrchestratorType" Value="SF"/>
|
||||
<EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
|
||||
</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="OrderingSignalrHubTypeEndpoint" Port="5112" UriScheme="http" PathSuffix="eShopOnServiceFabric/OrderingSignalrHub" />
|
||||
</Endpoints>
|
||||
</Resources>
|
||||
</ServiceManifest>
|
@ -1,7 +1,8 @@
|
||||
<?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="OrderingBackground_InstanceCount" Value="-1" />
|
||||
<Parameter Name="OrderingSignalrHub_InstanceCount" Value="1" />
|
||||
<Parameter Name="OrderingBackground_InstanceCount" Value="1" />
|
||||
<Parameter Name="MarketingApi_InstanceCount" Value="1" />
|
||||
<Parameter Name="LocationsApi_InstanceCount" Value="1" />
|
||||
<Parameter Name="PaymentApi_InstanceCount" Value="1" />
|
||||
|
@ -8,4 +8,7 @@
|
||||
-->
|
||||
<ClusterConnectionParameters />
|
||||
<ApplicationParameterFile Path="..\ApplicationParameters\Local.5Node.xml" />
|
||||
<UpgradeDeployment Mode="UnmonitoredAuto" Enabled="false">
|
||||
<Parameters UpgradeReplicaSetCheckTimeoutSec="1" Force="True" />
|
||||
</UpgradeDeployment>
|
||||
</PublishProfile>
|
@ -41,6 +41,8 @@
|
||||
<Content Include="ApplicationPackageRoot\OrderingApiPkg\ServiceManifest.xml" />
|
||||
<Content Include="ApplicationPackageRoot\OrderingBackgroundPkg\Config\Settings.xml" />
|
||||
<Content Include="ApplicationPackageRoot\OrderingBackgroundPkg\ServiceManifest.xml" />
|
||||
<Content Include="ApplicationPackageRoot\OrderingSignalrHubPkg\Config\Settings.xml" />
|
||||
<Content Include="ApplicationPackageRoot\OrderingSignalrHubPkg\ServiceManifest.xml" />
|
||||
<Content Include="ApplicationPackageRoot\PaymentApiPkg\Config\Settings.xml" />
|
||||
<Content Include="ApplicationPackageRoot\PaymentApiPkg\ServiceManifest.xml" />
|
||||
<Content Include="packages.config" />
|
||||
|
@ -22,18 +22,24 @@
|
||||
<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="PaymentUrl" Value="http://paymentapi.eshoponservicefabric:5108"/>
|
||||
<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="OrderingBackgroundUrlHC" Value="http://ordering.background.eshoponservicefabric:5111/hc"/>
|
||||
<EnvironmentVariable Name="OrderingSignalrHubUrlHC" Value="http://ordering.signalrhub.eshoponservicefabric:5112/hc"/>
|
||||
<EnvironmentVariable Name="BasketUrlHC" Value="http://basketapi.eshoponservicefabric:5103/hc"/>
|
||||
<EnvironmentVariable Name="PaymentUrlHC" Value="http://paymentapi.eshoponservicefabric:5108/hc"/>
|
||||
<EnvironmentVariable Name="IdentityUrlHC" Value="http://identityapi.eshoponservicefabric:5105/hc"/>
|
||||
<EnvironmentVariable Name="MarketingUrlHC" Value="http://marketingapi.eshoponservicefabric:5110/hc"/>
|
||||
<EnvironmentVariable Name="LocationsUrlHC" Value="http://locationsapi.eshoponservicefabric:5109/hc"/>
|
||||
<EnvironmentVariable Name="PaymentUrlHC" Value="http://paymentapi.eshoponservicefabric:5108/hc"/>
|
||||
<EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value=""/>
|
||||
<EnvironmentVariable Name="OrchestratorType" Value="SF"/>
|
||||
<EnvironmentVariable Name="UseLoadTest" Value="False"/>
|
||||
|
@ -11,6 +11,9 @@
|
||||
<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>
|
||||
<!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion
|
||||
@ -21,10 +24,13 @@
|
||||
<!-- Override external urls depending on environment -->
|
||||
<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="IdentityUrl" Value="[IdentityUrl]"/>
|
||||
<EnvironmentVariable Name="OrderingBackgroundUrl" Value="[OrderingBackgroundUrl]"/>
|
||||
<EnvironmentVariable Name="OrderingSignalrHubUrl" Value="[OrderingSignalrHubUrl]"/>
|
||||
<EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value="[InstrumentationKey]"/>
|
||||
</EnvironmentOverrides>
|
||||
<Policies>
|
||||
|
@ -26,12 +26,19 @@
|
||||
<EnvironmentVariable Name="OrderingUrl" Value=""/>
|
||||
<EnvironmentVariable Name="BasketUrl" Value=""/>
|
||||
<EnvironmentVariable Name="MarketingUrl" Value=""/>
|
||||
<EnvironmentVariable Name="PaymentUrl" Value=""/>
|
||||
<EnvironmentVariable Name="OrderingBackgroundUrl" Value=""/>
|
||||
<EnvironmentVariable Name="OrderingSignalrHubUrl" Value=""/>
|
||||
<EnvironmentVariable Name="IdentityUrl" Value="http://#{your_sf_dns}#:5105"/>
|
||||
<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="OrderingBackgroundUrlHC" Value="http://ordering.backgroundtasks.eshoponservicefabric:5111/hc"/>
|
||||
<EnvironmentVariable Name="OrderingSignalrHubUrlHC" Value="http://ordering.signalrhub.eshoponservicefabric:5112/hc"/>
|
||||
<EnvironmentVariable Name="BasketUrlHC" Value="http://basketapi.eshoponservicefabric:5103/hc"/>
|
||||
<EnvironmentVariable Name="IdentityUrlHC" Value="http://identityapi.eshoponservicefabric:5105/hc"/>
|
||||
<EnvironmentVariable Name="MarketingUrlHC" Value="http://marketingapi.eshoponservicefabric:5110/hc"/>
|
||||
<EnvironmentVariable Name="LocationsUrlHC" Value="http://locationsapi.eshoponservicefabric:5109/hc"/>
|
||||
<EnvironmentVariable Name="PaymentUrlHC" Value="http://paymentapi.eshoponservicefabric:5108/hc"/>
|
||||
<EnvironmentVariable Name="UseCustomizationData" Value="True"/>
|
||||
<EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value=""/>
|
||||
<EnvironmentVariable Name="OrchestratorType" Value="SF"/>
|
||||
|
@ -19,6 +19,7 @@
|
||||
<Policies>
|
||||
<ContainerHostPolicies CodePackageRef="Code">
|
||||
<PortBinding ContainerPort="80" EndpointRef="WebStatusTypeEndpoint"/>
|
||||
<HealthConfig IncludeDockerHealthStatusInSystemHealthReport="true" RestartContainerOnUnhealthyDockerHealthStatus="false" />
|
||||
</ContainerHostPolicies>
|
||||
</Policies>
|
||||
</ServiceManifestImport>
|
||||
|
@ -24,6 +24,8 @@
|
||||
<EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
|
||||
<EnvironmentVariable Name="CatalogUrl" Value="http://catalogapi.eshoponservicefabric:5101/hc"/>
|
||||
<EnvironmentVariable Name="OrderingUrl" Value="http://orderingapi.eshoponservicefabric:5102/hc"/>
|
||||
<EnvironmentVariable Name="OrderingBackgroundUrl" Value="http://ordering.background.eshoponservicefabric:5111/hc"/>
|
||||
<EnvironmentVariable Name="OrderingSignalrHubUrl" Value="http://ordering.signalrhub.eshoponservicefabric:5112/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"/>
|
||||
|
File diff suppressed because one or more lines are too long
30
src/Web/WebMVC/wwwroot/js/site.min.js
vendored
30
src/Web/WebMVC/wwwroot/js/site.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user