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

Updated ARM SF templates

Browse Source
This commit is contained in:
Ramón Tomás 2017-09-12 18:19:31 +02:00
parent c24b25c306
commit 5ac3df9943
4 changed files with 111 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
deploy/az/servicefabric/WindowsContainers/servicefabricdeploy.json
View File

@ -39,10 +39,26 @@
"type": "int",
"defaultValue": 19080
},
"nt0reverseProxyEndpointPort": {
"nt0reverseProxyEndpointPort": {
"type": "int",
"defaultValue": 19081
},
"webMvcHttpPort": {
"type": "int",
"defaultValue": 5100
},
"webSpaHttpPort": {
"type": "int",
"defaultValue": 5104
},
"webStatusHttpPort": {
"type": "int",
"defaultValue": 5107
},
"IdSrvHttpRule": {
"type": "int",
"defaultValue": 5105
},
"subnet0Name": {
"type": "string",
"defaultValue": "Subnet-0"
@ -350,6 +366,82 @@
},
"protocol": "tcp"
}
},
{
"name": "WebMVCHttpRule",
"properties": {
"backendAddressPool": {
"id": "[variables('lbPoolID0')]"
},
"backendPort": "[parameters('webMvcHttpPort')]",
"enableFloatingIP": "false",
"frontendIPConfiguration": {
"id": "[variables('lbIPConfig0')]"
},
"frontendPort": "[parameters('webMvcHttpPort')]",
"idleTimeoutInMinutes": "5",
"probe": {
"id": "[variables('lbHttpProbeID0')]"
},
"protocol": "tcp"
}
},
{
"name": "WebSPAHttpRule",
"properties": {
"backendAddressPool": {
"id": "[variables('lbPoolID0')]"
},
"backendPort": "[parameters('webSpaHttpPort')]",
"enableFloatingIP": "false",
"frontendIPConfiguration": {
"id": "[variables('lbIPConfig0')]"
},
"frontendPort": "[parameters('webSpaHttpPort')]",
"idleTimeoutInMinutes": "5",
"probe": {
"id": "[variables('lbHttpProbeID0')]"
},
"protocol": "tcp"
}
},
{
"name": "WebStatusHttpRule",
"properties": {
"backendAddressPool": {
"id": "[variables('lbPoolID0')]"
},
"backendPort": "[parameters('webStatusHttpPort')]",
"enableFloatingIP": "false",
"frontendIPConfiguration": {
"id": "[variables('lbIPConfig0')]"
},
"frontendPort": "[parameters('webStatusHttpPort')]",
"idleTimeoutInMinutes": "5",
"probe": {
"id": "[variables('lbHttpProbeID0')]"
},
"protocol": "tcp"
}
},
{
"name": "IdSrvHttpRule",
"properties": {
"backendAddressPool": {
"id": "[variables('lbPoolID0')]"
},
"backendPort": "[parameters('IdSrvHttpRule')]",
"enableFloatingIP": "false",
"frontendIPConfiguration": {
"id": "[variables('lbIPConfig0')]"
},
"frontendPort": "[parameters('IdSrvHttpRule')]",
"idleTimeoutInMinutes": "5",
"probe": {
"id": "[variables('lbHttpProbeID0')]"
},
"protocol": "tcp"
}
}
],
"probes": [

19
deploy/az/servicefabric/WindowsContainers/servicefabricdeploy.parameters.json
View File

@ -15,7 +15,7 @@
"value": "eshop"
},
"adminPassword": {
"value": "YourPassword"
"value": "your_password"
},
"nicName": {
"value": "NIC-eshopsfwin"
@ -24,7 +24,7 @@
"value": "eshopsfwin-PubIP"
},
"dnsName": {
"value": "eshopsfwin"
"value": "eshoponservicefabric"
},
"virtualNetworkName": {
"value": "VNet-eshopsfwin"
@ -64,6 +64,19 @@
},
"nt0reverseProxyEndpointPort": {
"value": 19081
},
"webMvcHttpPort": {
"value": 5100
},
"webSpaHttpPort": {
"value": 5104
},
"webStatusHttpPort": {
"value": 5107
},
"IdSrvHttpRule": {
"value": 5105
}
}
}
}

2
docker-compose.dcproj
View File

@ -5,7 +5,7 @@
<DockerLaunchBrowser>True</DockerLaunchBrowser>
<DockerServiceUrl>http://localhost:5100</DockerServiceUrl>
<DockerServiceName>webmvc</DockerServiceName>
<DockerTargetOS>Linux</DockerTargetOS>
<DockerTargetOS>Windows</DockerTargetOS>
<ProjectVersion>2.0</ProjectVersion>
</PropertyGroup>
<ItemGroup>

2
src/Services/Ordering/Ordering.API/Startup.cs
View File

@ -204,7 +204,7 @@
app.UseSwagger()
.UseSwaggerUI(c =>
{
c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "My API V1");
c.ConfigureOAuth2("orderingswaggerui", "", "", "Ordering Swagger UI");
});