Merge pull request dotnet-architecture#46 from dotnet-architecture/dev

fork eShopOnContainers

Author: TarasKovalenko

.gitignore

@@ -263,3 +263,6 @@ pub/
 /src/Web/WebMVC/wwwroot/css/site.min.css
 **/.kube/**
 .mfractor
+
+# Ignore HealthCheckdb
+*healthchecksdb*

NuGet.config

@@ -4,6 +4,9 @@
     <add key="repositoryPath" value="packages" />
   </config>
   <packageSources>
+	  <add key="Preview-aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json"/>
+    <add key="Preview-aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json"/>
+	  <add key="Preview-aspnetcore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json"/>
     <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>

README.md

@@ -2,15 +2,15 @@
 Sample .NET Core reference application, powered by Microsoft, based on a simplified microservices architecture and Docker containers.
 
 ## IMPORTANT NOTES!
-**The current supported Visual Studio version for eShopOnContainers is Visual Studio 2017 15.7** ([GA/RTM since May 8th 2018](https://docs.microsoft.com/en-us/visualstudio/releasenotes/vs2017-relnotes)) or later version. 
+**You can use either the latest version of Visual Studio or simply Docker CLI and .NET CLI for Windows, Mac and Linux**. 
 
 **Note for Pull Requests (PRs)**: We accept pull request from the community. When doing it, please do it onto the **DEV branch** which is the consolidated work-in-progress branch. Do not request it onto Master branch, if possible.
 
 **NEWS / ANNOUNCEMENTS**
 Do you want to be up-to-date on .NET Architecture guidance and reference apps like eShopOnContainers? --> Subscribe by "WATCHING" this new GitHub repo: https://github.com/dotnet-architecture/News 
 
-## Updated for .NET Core 2.0 and 2.1 "wave" of technologies
-eShopOnContainers is updated to .NET Core 2.0 and 2.1 "wave". Not just compilation but also new recommended code in EF Core, ASP.NET Core, and other new related versions.
+## Updated for .NET Core 2.2 "wave" of technologies
+eShopOnContainers is updated to .NET Core 2.x (currently updated to 2.2) "wave" of technologies. Not just compilation but also new recommended code in EF Core, ASP.NET Core, and other new related versions.
 
 The **dockerfiles** in the solution have also been updated and now support [**Docker Multi-Stage**](https://blogs.msdn.microsoft.com/stevelasker/2017/09/11/net-and-multistage-dockerfiles/) since mid-December 2017.
 
@@ -70,7 +70,7 @@ You can download them and start reviewing these Guides/eBooks here:
 | Architecting & Developing | Containers Lifecycle & CI/CD | App patterns with Xamarin.Forms |
 | ------------ | ------------|  ------------|
 | <a href='https://aka.ms/microservicesebook'><img src="img/ebook_arch_dev_microservices_containers_cover.png"> </a> | <a href='https://aka.ms/dockerlifecycleebook'> <img src="img/ebook_containers_lifecycle.png"> </a> | <a href='https://aka.ms/xamarinpatternsebook'> <img src="img/xamarin-enterprise-patterns-ebook-cover-small.png"> </a> |
-| <sup> <a href='https://aka.ms/microservicesebook'>**Download .PDF** (v2.1 Edition)</a> </sup>  | <sup> <a href='https://aka.ms/dockerlifecycleebook'>**Download** </a>  </sup> | <sup> <a href='https://aka.ms/xamarinpatternsebook'>**Download**  </a>  </sup> |
+| <sup> <a href='https://aka.ms/microservicesebook'>**Download .PDF** (v2.2 Edition)</a> </sup>  | <sup> <a href='https://aka.ms/dockerlifecycleebook'>**Download** </a>  </sup> | <sup> <a href='https://aka.ms/xamarinpatternsebook'>**Download**  </a>  </sup> |
 
 Download in other formats (**eReaders** like **MOBI**, **EPUB**) and other eBooks at the [.NET Architecture center](http://dot.net/architecture).
 

docker-compose.override.yml

@@ -187,6 +187,17 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - urls__basket=http://basket.api
+      - urls__catalog=http://catalog.api
+      - urls__orders=http://ordering.api
+      - urls__identity=http://identity.api
+      - CatalogUrlHC=http://catalog.api/hc
+      - OrderingUrlHC=http://ordering.api/hc
+      - IdentityUrlHC=http://identity.api/hc             
+      - BasketUrlHC=http://basket.api/hc
+      - MarketingUrlHC=http://marketing.api/hc
+      - PaymentUrlHC=http://payment.api/hc
+      - LocationUrlHC=http://locations.api/hc
     ports:
       - "5200:80"   
     volumes:
@@ -196,6 +207,13 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - CatalogUrlHC=http://catalog.api/hc
+      - OrderingUrlHC=http://ordering.api/hc
+      - IdentityUrlHC=http://identity.api/hc             
+      - BasketUrlHC=http://basket.api/hc
+      - MarketingUrlHC=http://marketing.api/hc
+      - PaymentUrlHC=http://payment.api/hc
+      - LocationUrlHC=http://locations.api/hc
     ports:
       - "5201:80"   
     volumes:
@@ -205,6 +223,13 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - CatalogUrlHC=http://catalog.api/hc
+      - OrderingUrlHC=http://ordering.api/hc
+      - IdentityUrlHC=http://identity.api/hc             
+      - BasketUrlHC=http://basket.api/hc
+      - MarketingUrlHC=http://marketing.api/hc
+      - PaymentUrlHC=http://payment.api/hc
+      - LocationUrlHC=http://locations.api/hc
     ports:
       - "5202:80"   
     volumes:
@@ -214,6 +239,13 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - CatalogUrlHC=http://catalog.api/hc
+      - OrderingUrlHC=http://ordering.api/hc
+      - IdentityUrlHC=http://identity.api/hc             
+      - BasketUrlHC=http://basket.api/hc
+      - MarketingUrlHC=http://marketing.api/hc
+      - PaymentUrlHC=http://payment.api/hc
+      - LocationUrlHC=http://locations.api/hc
     ports:
       - "5203:80"   
     volumes:
@@ -226,6 +258,13 @@ services:
       - urls__catalog=http://catalog.api
       - urls__orders=http://ordering.api
       - urls__identity=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - CatalogUrlHC=http://catalog.api/hc
+      - OrderingUrlHC=http://ordering.api/hc
+      - IdentityUrlHC=http://identity.api/hc             
+      - BasketUrlHC=http://basket.api/hc
+      - MarketingUrlHC=http://marketing.api/hc
+      - PaymentUrlHC=http://payment.api/hc
+      - LocationUrlHC=http://locations.api/hc
     ports:
       - "5120:80"   # Important: In a production environment your should remove the external port (5120) kept here for microservice debugging purposes. 
                     # The API Gateway redirects and access through the internal port (80).
@@ -237,6 +276,13 @@ services:
       - urls__catalog=http://catalog.api
       - urls__orders=http://ordering.api
       - urls__identity=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - CatalogUrlHC=http://catalog.api/hc
+      - OrderingUrlHC=http://ordering.api/hc
+      - IdentityUrlHC=http://identity.api/hc             
+      - BasketUrlHC=http://basket.api/hc
+      - MarketingUrlHC=http://marketing.api/hc
+      - PaymentUrlHC=http://payment.api/hc
+      - LocationUrlHC=http://locations.api/hc
     ports:
       - "5121:80"   # Important: In a production environment your should remove the external port (5121) kept here for microservice debugging purposes. 
                     # The API Gateway redirects and access through the internal port (80).
@@ -259,16 +305,41 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - CatalogUrl=http://catalog.api/hc
-      - OrderingUrl=http://ordering.api/hc
+      - HealthChecks-UI__HealthChecks__1__Name=WebMVC HTTP Check
+      - HealthChecks-UI__HealthChecks__1__Uri=http://webmvc/hc
+      - HealthChecks-UI__HealthChecks__2__Name=WebSPA HTTP Check
+      - HealthChecks-UI__HealthChecks__2__Uri=http://webspa/hc
+      - HealthChecks-UI__HealthChecks__3__Name=Web Shopping Aggregator GW HTTP Check
+      - HealthChecks-UI__HealthChecks__3__Uri=http://webshoppingagg/hc
+      - HealthChecks-UI__HealthChecks__4__Name=Mobile Shopping Aggregator HTTP Check
+      - HealthChecks-UI__HealthChecks__4__Uri=http://mobileshoppingagg/hc
+      - HealthChecks-UI__HealthChecks__5__Name=Mobile Shopping API GW HTTP Check
+      - HealthChecks-UI__HealthChecks__5__Uri=http://mobileshoppingapigw/hc
+      - HealthChecks-UI__HealthChecks__6__Name=Mobile Marketing API GW HTTP Check
+      - HealthChecks-UI__HealthChecks__6__Uri=http://mobilemarketingapigw/hc
+      - HealthChecks-UI__HealthChecks__7__Name=Web Shopping API GW HTTP Check
+      - HealthChecks-UI__HealthChecks__7__Uri=http://webshoppingapigw/hc
+      - HealthChecks-UI__HealthChecks__8__Name=Web Marketing API GW HTTP Check
+      - HealthChecks-UI__HealthChecks__8__Uri=http://webmarketingapigw/hc
+      - HealthChecks-UI__HealthChecks__9__Name=Ordering HTTP Check
+      - HealthChecks-UI__HealthChecks__9__Uri=http://ordering.api/hc
+      - HealthChecks-UI__HealthChecks__10__Name=Ordering HTTP Background Check
+      - HealthChecks-UI__HealthChecks__10__Uri=http://ordering.backgroundtasks/hc
+      - HealthChecks-UI__HealthChecks__11__Name=Basket HTTP Check
+      - HealthChecks-UI__HealthChecks__11__Uri=http://basket.api/hc
+      - HealthChecks-UI__HealthChecks__12__Name=Catalog HTTP Check
+      - HealthChecks-UI__HealthChecks__12__Uri=http://catalog.api/hc
+      - HealthChecks-UI__HealthChecks__13__Name=Identity HTTP Check
+      - HealthChecks-UI__HealthChecks__13__Uri=http://identity.api/hc
+      - HealthChecks-UI__HealthChecks__14__Name=Marketing HTTP Check
+      - HealthChecks-UI__HealthChecks__14__Uri=http://marketing.api/hc
+      - HealthChecks-UI__HealthChecks__15__Name=Locations HTTP Check
+      - HealthChecks-UI__HealthChecks__15__Uri=http://locations.api/hc
+      - HealthChecks-UI__HealthChecks__16__Name=Payments HTTP Check
+      - HealthChecks-UI__HealthChecks__16__Uri=http://payment.api/hc
+      - HealthChecks-UI__HealthChecks__17__Name=Ordering SignalRHub HTTP Check
+      - HealthChecks-UI__HealthChecks__17__Uri=http://ordering.signalrhub/hc      
       - OrderingBackgroundTasksUrl=http://ordering.backgroundtasks/hc
-      - BasketUrl=http://basket.api/hc
-      - IdentityUrl=http://identity.api/hc
-      - LocationsUrl=http://locations.api/hc
-      - MarketingUrl=http://marketing.api/hc
-      - PaymentUrl=http://payment.api/hc
-      - mvc=http://webmvc/hc
-      - spa=http://webspa/hc
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
     ports:
@@ -281,12 +352,9 @@ services:
       - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
       - PurchaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
       - MarketingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5203   
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
-      - PaymentUrlHC=http://payment.api/hc
+      - PurchaseUrlHC=http://webshoppingapigw/hc
+      - MarketingUrlHC=http://webmarketingapigw/hc
+      - IdentityUrlHC=http://identity.api/hc
       - UseCustomizationData=True
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
@@ -300,14 +368,11 @@ services:
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - PurchaseUrl=http://webshoppingapigw
       - IdentityUrl=http://10.0.75.1:5105  # Local Mac: Use http://docker.for.mac.localhost:5105 || Local Windows:  Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. || #Remote access: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
-      - MarketingUrl=http://webmarketingapigw                                                    
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
-      - PaymentUrlHC=http://payment.api/hc
+      - MarketingUrl=http://webmarketingapigw                                                          
       - SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
+      - IdentityUrlHC=http://identity.api/hc
+      - PurchaseUrlHC=http://webshoppingapigw/hc
+      - MarketingUrlHC=http://webmarketingapigw/hc 
       - UseCustomizationData=True
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}