Uncommented ApplicationInsights.

Reverted ESHOP_OCELOT_VOLUME_SPEC variable to docker-compose.override.
Changed 2.1.3-aspnetcore-runtime and 2.1.401-sdk in Docker files from microsoft/dotnet-nightly to microsoft/dotnet.

docker-compose.override.yml

@@ -190,7 +190,7 @@ services:
     ports:
       - "5200:80"   
     volumes:
-      - ./src/ApiGateways/Mobile.Bff.Shopping/apigw:/app/configuration
+      - ./src/ApiGateways/Mobile.Bff.Shopping/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
 
   mobilemarketingapigw:
     environment:
@@ -199,7 +199,7 @@ services:
     ports:
       - "5201:80"   
     volumes:
-      - ./src/ApiGateways/Mobile.Bff.Marketing/apigw:/app/configuration
+      - ./src/ApiGateways/Mobile.Bff.Marketing/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
 
   webshoppingapigw:
     environment:
@@ -208,7 +208,7 @@ services:
     ports:
       - "5202:80"   
     volumes:
-      - ./src/ApiGateways/Web.Bff.Shopping/apigw:/app/configuration
+      - ./src/ApiGateways/Web.Bff.Shopping/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
 
   webmarketingapigw:
     environment:
@@ -217,7 +217,7 @@ services:
     ports:
       - "5203:80"   
     volumes:
-      - ./src/ApiGateways/Web.Bff.Marketing/apigw:/app/configuration
+      - ./src/ApiGateways/Web.Bff.Marketing/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
 
   mobileshoppingagg:
     environment:

src/ApiGateways/ApiGw-Base/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1.401-sdk AS build
 WORKDIR /src
 COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/
 RUN dotnet restore src/ApiGateways/ApiGw-Base/

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1.401-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator

src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1.401-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/ApiGateways/Web.Bff.Shopping/aggregator

src/Services/Basket/Basket.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1.401-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Basket/Basket.API

src/Services/Basket/Basket.API/Program.cs

@@ -49,7 +49,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
                     builder.AddConsole();
                     builder.AddDebug();
                 })
-                //.UseApplicationInsights()
+                .UseApplicationInsights()
                 .Build();
     }
 }

src/Services/Basket/Basket.API/Startup.cs

@@ -215,7 +215,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
 
         private void RegisterAppInsights(IServiceCollection services)
         {
-            //services.AddApplicationInsightsTelemetry(Configuration);
+            services.AddApplicationInsightsTelemetry(Configuration);
             var orchestratorType = Configuration.GetValue<string>("OrchestratorType");
             
             if (orchestratorType?.ToUpper() == "K8S")

src/Services/Catalog/Catalog.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1.401-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Catalog/Catalog.API

src/Services/Catalog/Catalog.API/Program.cs

@@ -33,7 +33,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
              .UseStartup<Startup>()
-                //.UseApplicationInsights()
+                .UseApplicationInsights()
                 .UseHealthChecks("/hc")
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseWebRoot("Pics")

src/Services/Catalog/Catalog.API/Startup.cs

@@ -101,7 +101,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
     {
         public static IServiceCollection AddAppInsight(this IServiceCollection services, IConfiguration configuration)
         {
-            //services.AddApplicationInsightsTelemetry(configuration);
+            services.AddApplicationInsightsTelemetry(configuration);
             var orchestratorType = configuration.GetValue<string>("OrchestratorType");
 
             if (orchestratorType?.ToUpper() == "K8S")

src/Services/Identity/Identity.API/Dockerfile

@@ -1,9 +1,9 @@
 ARG NODE_IMAGE=node:8.11
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk as dotnet-build
+FROM microsoft/dotnet:2.1.401-sdk as dotnet-build
 WORKDIR /src
 
 FROM ${NODE_IMAGE} as node-build

src/Services/Identity/Identity.API/Program.cs

@@ -68,7 +68,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
                     builder.AddConsole();
                     builder.AddDebug();
                 })
-                //.UseApplicationInsights()
+                .UseApplicationInsights()
                 .Build();
     }
 }

src/Services/Identity/Identity.API/Startup.cs

@@ -165,7 +165,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
 
         private void RegisterAppInsights(IServiceCollection services)
         {
-            //services.AddApplicationInsightsTelemetry(Configuration);
+            services.AddApplicationInsightsTelemetry(Configuration);
             var orchestratorType = Configuration.GetValue<string>("OrchestratorType");
 
             if (orchestratorType?.ToUpper() == "K8S")

src/Services/Location/Locations.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1.401-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Location/Locations.API

src/Services/Location/Locations.API/Program.cs

@@ -44,7 +44,7 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API
                     builder.AddConsole();
                     builder.AddDebug();
                 })
-                //.UseApplicationInsights()
+                .UseApplicationInsights()
                 .Build();
     }
 }

src/Services/Location/Locations.API/Startup.cs

@@ -186,7 +186,7 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API
 
         private void RegisterAppInsights(IServiceCollection services)
         {
-            //services.AddApplicationInsightsTelemetry(Configuration);
+            services.AddApplicationInsightsTelemetry(Configuration);
             var orchestratorType = Configuration.GetValue<string>("OrchestratorType");
 
             if (orchestratorType?.ToUpper() == "K8S")

src/Services/Marketing/Marketing.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1.401-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Marketing/Marketing.API

src/Services/Marketing/Marketing.API/Program.cs

@@ -27,7 +27,7 @@
 
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                //.UseApplicationInsights()
+                .UseApplicationInsights()
                 .UseHealthChecks("/hc")
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseStartup<Startup>()
@@ -56,7 +56,7 @@
                     builder.AddConsole();
                     builder.AddDebug();
                 })
-                //.UseApplicationInsights()
+                .UseApplicationInsights()
                 .Build();
     }
 }

src/Services/Marketing/Marketing.API/Startup.cs

@@ -217,7 +217,7 @@
 
         private void RegisterAppInsights(IServiceCollection services)
         {
-            //services.AddApplicationInsightsTelemetry(Configuration);
+            services.AddApplicationInsightsTelemetry(Configuration);
             var orchestratorType = Configuration.GetValue<string>("OrchestratorType");
 
             if (orchestratorType?.ToUpper() == "K8S")

src/Services/Ordering/Ordering.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1.401-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Ordering/Ordering.API

src/Services/Ordering/Ordering.API/Program.cs

@@ -60,7 +60,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API
                     builder.AddConsole();
                     builder.AddDebug();
                 })
-                //.UseApplicationInsights()
+                .UseApplicationInsights()
                 .Build();
     }
 }

src/Services/Ordering/Ordering.API/Startup.cs

@@ -132,7 +132,7 @@
     {
         public static IServiceCollection AddApplicationInsights(this IServiceCollection services, IConfiguration configuration)
         {
-            //services.AddApplicationInsightsTelemetry(configuration);
+            services.AddApplicationInsightsTelemetry(configuration);
             var orchestratorType = configuration.GetValue<string>("OrchestratorType");
 
             if (orchestratorType?.ToUpper() == "K8S")

src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1.401-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Ordering/Ordering.BackgroundTasks

src/Services/Ordering/Ordering.SignalrHub/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1.401-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Ordering/Ordering.SignalrHub

src/Services/Payment/Payment.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1.401-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Services/Payment/Payment.API

src/Services/Payment/Payment.API/Program.cs

@@ -29,7 +29,7 @@ namespace Payment.API
                     builder.AddConsole();
                     builder.AddDebug();
                 })
-                //.UseApplicationInsights()
+                .UseApplicationInsights()
                 .Build();
     }
 }

src/Services/Payment/Payment.API/Startup.cs

@@ -112,7 +112,7 @@ namespace Payment.API
 
         private void RegisterAppInsights(IServiceCollection services)
         {
-            //services.AddApplicationInsightsTelemetry(Configuration);
+            services.AddApplicationInsightsTelemetry(Configuration);
             var orchestratorType = Configuration.GetValue<string>("OrchestratorType");
 
             if (orchestratorType?.ToUpper() == "K8S")

src/Web/WebMVC/Dockerfile

@@ -1,9 +1,9 @@
 ARG NODE_IMAGE=node:8.11
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk as dotnet-build
+FROM microsoft/dotnet:2.1.401-sdk as dotnet-build
 WORKDIR /src
 
 FROM ${NODE_IMAGE} as node-build

src/Web/WebMVC/Program.cs

@@ -28,7 +28,7 @@ namespace Microsoft.eShopOnContainers.WebMVC
                     builder.AddConsole();
                     builder.AddDebug();
                 })
-                //.UseApplicationInsights()
+                .UseApplicationInsights()
                 .Build();
     }
 }

src/Web/WebMVC/Startup.cs

@@ -105,7 +105,7 @@ namespace Microsoft.eShopOnContainers.WebMVC
 
         public static IServiceCollection AddAppInsight(this IServiceCollection services, IConfiguration configuration)
         {
-            //services.AddApplicationInsightsTelemetry(configuration);
+            services.AddApplicationInsightsTelemetry(configuration);
             var orchestratorType = configuration.GetValue<string>("OrchestratorType");
 
             if (orchestratorType?.ToUpper() == "K8S")

src/Web/WebSPA/Dockerfile

@@ -1,9 +1,9 @@
 ARG NODE_IMAGE=node:8.11
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk as dotnet-build
+FROM microsoft/dotnet:2.1.401-sdk as dotnet-build
 WORKDIR /src
 
 FROM ${NODE_IMAGE} as node-build

src/Web/WebSPA/Program.cs

@@ -28,7 +28,7 @@ namespace eShopConContainers.WebSPA
                     builder.AddConsole();
                     builder.AddDebug();
                 })
-                //.UseApplicationInsights()                
+                .UseApplicationInsights()                
                 .Build();       
     }
 }

src/Web/WebSPA/Startup.cs

@@ -139,7 +139,7 @@ namespace eShopConContainers.WebSPA
 
         private void RegisterAppInsights(IServiceCollection services)
         {
-            //services.AddApplicationInsightsTelemetry(Configuration);
+            services.AddApplicationInsightsTelemetry(Configuration);
             var orchestratorType = Configuration.GetValue<string>("OrchestratorType");
 
             if (orchestratorType?.ToUpper() == "K8S")

src/Web/WebStatus/Dockerfile

@@ -1,8 +1,8 @@
-FROM microsoft/dotnet-nightly:2.1.3-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.1.3-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet-nightly:2.1.401-sdk AS build
+FROM microsoft/dotnet:2.1.401-sdk AS build
 WORKDIR /src
 COPY . .
 WORKDIR /src/src/Web/WebStatus

src/Web/WebStatus/Program.cs

@@ -27,7 +27,7 @@ namespace WebStatus
                     builder.AddConsole();
                     builder.AddDebug();
                 })
-                //.UseApplicationInsights()
+                .UseApplicationInsights()
                 .Build();
     }
 }

src/Web/WebStatus/Startup.cs

@@ -91,7 +91,7 @@ namespace WebStatus
 
         private void RegisterAppInsights(IServiceCollection services)
         {
-            //services.AddApplicationInsightsTelemetry(Configuration);
+            services.AddApplicationInsightsTelemetry(Configuration);
             var orchestratorType = Configuration.GetValue<string>("OrchestratorType");
 
             if (orchestratorType?.ToUpper() == "K8S")