Browse Source

Merge branch 'test-devspaces' of https://github.com/erikpique/eShopOnContainers into test-devspaces

pull/868/head
Erik Pique 6 years ago
parent
commit
4c69bf89ea
3 changed files with 30 additions and 30 deletions
  1. +3
    -3
      k8s/helm/deploy-all.ps1
  2. +24
    -24
      src/Services/Basket/Basket.API/Properties/launchSettings.json
  3. +3
    -3
      src/Services/Catalog/Catalog.API/Properties/launchSettings.json

+ 3
- 3
k8s/helm/deploy-all.ps1 View File

@ -6,9 +6,9 @@ Param(
[parameter(Mandatory=$false)][string]$appName="eshop", [parameter(Mandatory=$false)][string]$appName="eshop",
[parameter(Mandatory=$false)][bool]$deployInfrastructure=$true, [parameter(Mandatory=$false)][bool]$deployInfrastructure=$true,
[parameter(Mandatory=$false)][bool]$clean=$true, [parameter(Mandatory=$false)][bool]$clean=$true,
[parameter(Mandatory=$false)][string]$aksName="",
[parameter(Mandatory=$false)][string]$aksRg="",
[parameter(Mandatory=$false)][string]$imageTag="latest"
[parameter(Mandatory=$false)][string]$aksName="eshop-test-aks",
[parameter(Mandatory=$false)][string]$aksRg="eshop-test",
[parameter(Mandatory=$false)][string]$imageTag="dev"
) )
$dns = $externalDns $dns = $externalDns


+ 24
- 24
src/Services/Basket/Basket.API/Properties/launchSettings.json View File

@ -7,29 +7,29 @@
"sslPort": 0 "sslPort": 0
} }
}, },
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"Microsoft.eShopOnContainers.Services.Basket.API": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:55103/",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"Azure Dev Spaces": {
"commandName": "AzureDevSpaces",
"launchBrowser": true,
"resourceGroup": "shopErikRG",
"aksName": "shopErik",
"subscriptionId": "c9138ae8-a61d-4ac9-82ab-d827f6182575"
}
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"Microsoft.eShopOnContainers.Services.Basket.API": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:55103/",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"Azure Dev Spaces": {
"commandName": "AzureDevSpaces",
"launchBrowser": true,
"resourceGroup": "eshop-test",
"aksName": "eshop-test-aks",
"subscriptionId": "6c22bb55-0221-4ce4-9bf1-3c4a10a7294c"
} }
}
} }

+ 3
- 3
src/Services/Catalog/Catalog.API/Properties/launchSettings.json View File

@ -27,9 +27,9 @@
"Azure Dev Spaces": { "Azure Dev Spaces": {
"commandName": "AzureDevSpaces", "commandName": "AzureDevSpaces",
"launchBrowser": true, "launchBrowser": true,
"resourceGroup": "edu-devspaces3",
"aksName": "edu-devspaces3",
"subscriptionId": "e3035ac1-c06c-4daf-8939-57b3c5f1f759"
"resourceGroup": "eshop-test",
"aksName": "eshop-test-aks",
"subscriptionId": "6c22bb55-0221-4ce4-9bf1-3c4a10a7294c"
} }
} }
} }

Loading…
Cancel
Save