From 3df4f3a206b09d97635eceb6ea57a650c4cbf527 Mon Sep 17 00:00:00 2001 From: Charles Lowell Date: Thu, 23 Feb 2017 09:34:00 -0800 Subject: [PATCH] Configure service URLs via environment variables --- docker-compose.override.yml | 6 ++++++ src/Services/Basket/Basket.API/Program.cs | 9 ++------- src/Services/Catalog/Catalog.API/Program.cs | 9 ++------- src/Services/Identity/Identity.API/Program.cs | 7 +------ src/Services/Ordering/Ordering.API/Program.cs | 9 ++------- src/Web/WebMVC/Program.cs | 7 +------ src/Web/WebSPA/Program.cs | 6 ++---- 7 files changed, 16 insertions(+), 37 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 909cf4172..4ec82286e 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -5,6 +5,7 @@ services: basket.api: environment: - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_URLS=http://0.0.0.0:5103 - ConnectionString=basket.data #- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. - identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. @@ -14,6 +15,7 @@ services: catalog.api: environment: - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_URLS=http://0.0.0.0:5101 - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word #- ExternalCatalogBaseUrl=http://13.88.8.119:5101 #Remote: VM Needs to have public access at 5105. - ExternalCatalogBaseUrl=http://localhost:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. @@ -23,6 +25,7 @@ services: identity.api: environment: - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_URLS=http://0.0.0.0:5105 - SpaClient=http://localhost:5104 - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word #- MvcClient=http://13.88.8.119:5100 #Remote: VM Needs to have public access at 5105. @@ -33,6 +36,7 @@ services: ordering.api: environment: - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_URLS=http://0.0.0.0:5102 - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word #- identityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. - identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. @@ -42,6 +46,7 @@ services: webspa: environment: - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_URLS=http://0.0.0.0:5104 - CatalogUrl=http://localhost:5101 - OrderingUrl=http://localhost:5102 #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. @@ -53,6 +58,7 @@ services: webmvc: environment: - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_URLS=http://0.0.0.0:5100 - CatalogUrl=http://catalog.api:5101 - OrderingUrl=http://ordering.api:5102 #- IdentityUrl=http://13.88.8.119:5105 #Remote: VM Needs to have public access at 5105. diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs index a3ac96b49..d2b305ce8 100644 --- a/src/Services/Basket/Basket.API/Program.cs +++ b/src/Services/Basket/Basket.API/Program.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Builder; +using System.IO; namespace Microsoft.eShopOnContainers.Services.Basket.API { @@ -15,7 +11,6 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API var host = new WebHostBuilder() .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseUrls("http://0.0.0.0:5103") .UseIISIntegration() .UseStartup() .Build(); diff --git a/src/Services/Catalog/Catalog.API/Program.cs b/src/Services/Catalog/Catalog.API/Program.cs index 6226dc389..b2e338b8c 100644 --- a/src/Services/Catalog/Catalog.API/Program.cs +++ b/src/Services/Catalog/Catalog.API/Program.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Builder; +using System.IO; namespace Microsoft.eShopOnContainers.Services.Catalog.API { @@ -14,7 +10,6 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API { var host = new WebHostBuilder() .UseKestrel() - .UseUrls("http://0.0.0.0:5101") .UseIISIntegration() .UseContentRoot(Directory.GetCurrentDirectory()) .UseWebRoot("Pics") diff --git a/src/Services/Identity/Identity.API/Program.cs b/src/Services/Identity/Identity.API/Program.cs index 48531ae65..eb999639b 100644 --- a/src/Services/Identity/Identity.API/Program.cs +++ b/src/Services/Identity/Identity.API/Program.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; +using Microsoft.AspNetCore.Hosting; using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; namespace eShopOnContainers.Identity { @@ -13,7 +9,6 @@ namespace eShopOnContainers.Identity { var host = new WebHostBuilder() .UseKestrel() - .UseUrls("http://0.0.0.0:5105") .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() .UseStartup() diff --git a/src/Services/Ordering/Ordering.API/Program.cs b/src/Services/Ordering/Ordering.API/Program.cs index d5daf106e..1a9d705d4 100644 --- a/src/Services/Ordering/Ordering.API/Program.cs +++ b/src/Services/Ordering/Ordering.API/Program.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Builder; +using System.IO; namespace Microsoft.eShopOnContainers.Services.Ordering.API { @@ -15,7 +11,6 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API var host = new WebHostBuilder() .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseUrls("http://0.0.0.0:5102") .UseIISIntegration() .UseStartup() .Build(); diff --git a/src/Web/WebMVC/Program.cs b/src/Web/WebMVC/Program.cs index 848e17679..6775c071c 100644 --- a/src/Web/WebMVC/Program.cs +++ b/src/Web/WebMVC/Program.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; +using Microsoft.AspNetCore.Hosting; using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; namespace Microsoft.eShopOnContainers.WebMVC { @@ -14,7 +10,6 @@ namespace Microsoft.eShopOnContainers.WebMVC var host = new WebHostBuilder() .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseUrls("http://0.0.0.0:5100") .UseIISIntegration() .UseStartup() .Build(); diff --git a/src/Web/WebSPA/Program.cs b/src/Web/WebSPA/Program.cs index ffad0461e..3759baa3b 100644 --- a/src/Web/WebSPA/Program.cs +++ b/src/Web/WebSPA/Program.cs @@ -1,6 +1,5 @@ -using System.IO; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; +using Microsoft.AspNetCore.Hosting; +using System.IO; namespace eShopConContainers.WebSPA { @@ -11,7 +10,6 @@ namespace eShopConContainers.WebSPA var host = new WebHostBuilder() .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseUrls("http://0.0.0.0:5104") .UseIISIntegration() .UseStartup() .Build();