From 7209a6e4bfc2fcce25ae58a3607d762d20675ad1 Mon Sep 17 00:00:00 2001 From: v-rodudi Date: Fri, 24 Aug 2018 18:05:42 +0300 Subject: [PATCH] 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 | 8 ++++---- src/ApiGateways/ApiGw-Base/Dockerfile | 4 ++-- src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile | 4 ++-- src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile | 4 ++-- src/Services/Basket/Basket.API/Dockerfile | 4 ++-- src/Services/Basket/Basket.API/Program.cs | 2 +- src/Services/Basket/Basket.API/Startup.cs | 2 +- src/Services/Catalog/Catalog.API/Dockerfile | 4 ++-- src/Services/Catalog/Catalog.API/Program.cs | 2 +- src/Services/Catalog/Catalog.API/Startup.cs | 2 +- src/Services/Identity/Identity.API/Dockerfile | 4 ++-- src/Services/Identity/Identity.API/Program.cs | 2 +- src/Services/Identity/Identity.API/Startup.cs | 2 +- src/Services/Location/Locations.API/Dockerfile | 4 ++-- src/Services/Location/Locations.API/Program.cs | 2 +- src/Services/Location/Locations.API/Startup.cs | 2 +- src/Services/Marketing/Marketing.API/Dockerfile | 4 ++-- src/Services/Marketing/Marketing.API/Program.cs | 4 ++-- src/Services/Marketing/Marketing.API/Startup.cs | 2 +- src/Services/Ordering/Ordering.API/Dockerfile | 4 ++-- src/Services/Ordering/Ordering.API/Program.cs | 2 +- src/Services/Ordering/Ordering.API/Startup.cs | 2 +- src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile | 4 ++-- src/Services/Ordering/Ordering.SignalrHub/Dockerfile | 4 ++-- src/Services/Payment/Payment.API/Dockerfile | 4 ++-- src/Services/Payment/Payment.API/Program.cs | 2 +- src/Services/Payment/Payment.API/Startup.cs | 2 +- src/Web/WebMVC/Dockerfile | 4 ++-- src/Web/WebMVC/Program.cs | 2 +- src/Web/WebMVC/Startup.cs | 2 +- src/Web/WebSPA/Dockerfile | 4 ++-- src/Web/WebSPA/Program.cs | 2 +- src/Web/WebSPA/Startup.cs | 2 +- src/Web/WebStatus/Dockerfile | 4 ++-- src/Web/WebStatus/Program.cs | 2 +- src/Web/WebStatus/Startup.cs | 2 +- 36 files changed, 55 insertions(+), 55 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 8e7f35022..969cfb922 100644 --- a/docker-compose.override.yml +++ b/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: diff --git a/src/ApiGateways/ApiGw-Base/Dockerfile b/src/ApiGateways/ApiGw-Base/Dockerfile index 92c59093d..3126d6e37 100644 --- a/src/ApiGateways/ApiGw-Base/Dockerfile +++ b/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/ diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile index 46f606558..b955542f9 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile +++ b/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 diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile b/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile index 0f1340c7b..c9572c9ab 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile +++ b/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 diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile index 7d0658b87..b2e124070 100644 --- a/src/Services/Basket/Basket.API/Dockerfile +++ b/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 diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs index 750afd687..303a4625d 100644 --- a/src/Services/Basket/Basket.API/Program.cs +++ b/src/Services/Basket/Basket.API/Program.cs @@ -49,7 +49,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API builder.AddConsole(); builder.AddDebug(); }) - //.UseApplicationInsights() + .UseApplicationInsights() .Build(); } } diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index 67ad47c82..7d65ba8b4 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/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("OrchestratorType"); if (orchestratorType?.ToUpper() == "K8S") diff --git a/src/Services/Catalog/Catalog.API/Dockerfile b/src/Services/Catalog/Catalog.API/Dockerfile index c9d6e5dcd..e21218e69 100644 --- a/src/Services/Catalog/Catalog.API/Dockerfile +++ b/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 diff --git a/src/Services/Catalog/Catalog.API/Program.cs b/src/Services/Catalog/Catalog.API/Program.cs index bffaa25e2..8f3910c84 100644 --- a/src/Services/Catalog/Catalog.API/Program.cs +++ b/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() - //.UseApplicationInsights() + .UseApplicationInsights() .UseHealthChecks("/hc") .UseContentRoot(Directory.GetCurrentDirectory()) .UseWebRoot("Pics") diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs index 656618f91..408f870af 100644 --- a/src/Services/Catalog/Catalog.API/Startup.cs +++ b/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("OrchestratorType"); if (orchestratorType?.ToUpper() == "K8S") diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile index 587d1d81c..4841f89e5 100644 --- a/src/Services/Identity/Identity.API/Dockerfile +++ b/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 diff --git a/src/Services/Identity/Identity.API/Program.cs b/src/Services/Identity/Identity.API/Program.cs index 68e3c27f8..6b8353062 100644 --- a/src/Services/Identity/Identity.API/Program.cs +++ b/src/Services/Identity/Identity.API/Program.cs @@ -68,7 +68,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API builder.AddConsole(); builder.AddDebug(); }) - //.UseApplicationInsights() + .UseApplicationInsights() .Build(); } } diff --git a/src/Services/Identity/Identity.API/Startup.cs b/src/Services/Identity/Identity.API/Startup.cs index 2b4d2de6c..255bb82b5 100644 --- a/src/Services/Identity/Identity.API/Startup.cs +++ b/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("OrchestratorType"); if (orchestratorType?.ToUpper() == "K8S") diff --git a/src/Services/Location/Locations.API/Dockerfile b/src/Services/Location/Locations.API/Dockerfile index 36895a275..2e4d7c4a9 100644 --- a/src/Services/Location/Locations.API/Dockerfile +++ b/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 diff --git a/src/Services/Location/Locations.API/Program.cs b/src/Services/Location/Locations.API/Program.cs index e06ae9b19..aedc1bed5 100644 --- a/src/Services/Location/Locations.API/Program.cs +++ b/src/Services/Location/Locations.API/Program.cs @@ -44,7 +44,7 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API builder.AddConsole(); builder.AddDebug(); }) - //.UseApplicationInsights() + .UseApplicationInsights() .Build(); } } diff --git a/src/Services/Location/Locations.API/Startup.cs b/src/Services/Location/Locations.API/Startup.cs index 54a547fd1..be0263312 100644 --- a/src/Services/Location/Locations.API/Startup.cs +++ b/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("OrchestratorType"); if (orchestratorType?.ToUpper() == "K8S") diff --git a/src/Services/Marketing/Marketing.API/Dockerfile b/src/Services/Marketing/Marketing.API/Dockerfile index 575e01d0e..be3141fb2 100644 --- a/src/Services/Marketing/Marketing.API/Dockerfile +++ b/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 diff --git a/src/Services/Marketing/Marketing.API/Program.cs b/src/Services/Marketing/Marketing.API/Program.cs index f50e9d344..06c5b72ca 100644 --- a/src/Services/Marketing/Marketing.API/Program.cs +++ b/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() @@ -56,7 +56,7 @@ builder.AddConsole(); builder.AddDebug(); }) - //.UseApplicationInsights() + .UseApplicationInsights() .Build(); } } diff --git a/src/Services/Marketing/Marketing.API/Startup.cs b/src/Services/Marketing/Marketing.API/Startup.cs index fc90bf1c7..5683dc72d 100644 --- a/src/Services/Marketing/Marketing.API/Startup.cs +++ b/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("OrchestratorType"); if (orchestratorType?.ToUpper() == "K8S") diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile index 6b0c14a36..af1adb170 100644 --- a/src/Services/Ordering/Ordering.API/Dockerfile +++ b/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 diff --git a/src/Services/Ordering/Ordering.API/Program.cs b/src/Services/Ordering/Ordering.API/Program.cs index 77efcd5ca..92ef6ba86 100644 --- a/src/Services/Ordering/Ordering.API/Program.cs +++ b/src/Services/Ordering/Ordering.API/Program.cs @@ -60,7 +60,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API builder.AddConsole(); builder.AddDebug(); }) - //.UseApplicationInsights() + .UseApplicationInsights() .Build(); } } diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index 2005cb8e3..42567641a 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/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("OrchestratorType"); if (orchestratorType?.ToUpper() == "K8S") diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile index 7756971d9..d8ed0edb3 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile +++ b/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 diff --git a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile index ec9035b1e..4d6083d5f 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile +++ b/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 diff --git a/src/Services/Payment/Payment.API/Dockerfile b/src/Services/Payment/Payment.API/Dockerfile index 7eb1c2d01..8bea8a1ef 100644 --- a/src/Services/Payment/Payment.API/Dockerfile +++ b/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 diff --git a/src/Services/Payment/Payment.API/Program.cs b/src/Services/Payment/Payment.API/Program.cs index 3cfbadec3..aff7bf359 100644 --- a/src/Services/Payment/Payment.API/Program.cs +++ b/src/Services/Payment/Payment.API/Program.cs @@ -29,7 +29,7 @@ namespace Payment.API builder.AddConsole(); builder.AddDebug(); }) - //.UseApplicationInsights() + .UseApplicationInsights() .Build(); } } diff --git a/src/Services/Payment/Payment.API/Startup.cs b/src/Services/Payment/Payment.API/Startup.cs index d6eb7cdc2..02cd4c70e 100644 --- a/src/Services/Payment/Payment.API/Startup.cs +++ b/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("OrchestratorType"); if (orchestratorType?.ToUpper() == "K8S") diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index a54b71afa..d9f54151c 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/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 diff --git a/src/Web/WebMVC/Program.cs b/src/Web/WebMVC/Program.cs index c8f910cc3..07332a02a 100644 --- a/src/Web/WebMVC/Program.cs +++ b/src/Web/WebMVC/Program.cs @@ -28,7 +28,7 @@ namespace Microsoft.eShopOnContainers.WebMVC builder.AddConsole(); builder.AddDebug(); }) - //.UseApplicationInsights() + .UseApplicationInsights() .Build(); } } diff --git a/src/Web/WebMVC/Startup.cs b/src/Web/WebMVC/Startup.cs index 3ccf1bbde..9c1c0a3b8 100644 --- a/src/Web/WebMVC/Startup.cs +++ b/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("OrchestratorType"); if (orchestratorType?.ToUpper() == "K8S") diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile index 34661f30b..0ddfd4040 100644 --- a/src/Web/WebSPA/Dockerfile +++ b/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 diff --git a/src/Web/WebSPA/Program.cs b/src/Web/WebSPA/Program.cs index e305bc811..c1a7da269 100644 --- a/src/Web/WebSPA/Program.cs +++ b/src/Web/WebSPA/Program.cs @@ -28,7 +28,7 @@ namespace eShopConContainers.WebSPA builder.AddConsole(); builder.AddDebug(); }) - //.UseApplicationInsights() + .UseApplicationInsights() .Build(); } } diff --git a/src/Web/WebSPA/Startup.cs b/src/Web/WebSPA/Startup.cs index de78b5404..f49eba772 100644 --- a/src/Web/WebSPA/Startup.cs +++ b/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("OrchestratorType"); if (orchestratorType?.ToUpper() == "K8S") diff --git a/src/Web/WebStatus/Dockerfile b/src/Web/WebStatus/Dockerfile index 85abea3b1..4ba896750 100644 --- a/src/Web/WebStatus/Dockerfile +++ b/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 diff --git a/src/Web/WebStatus/Program.cs b/src/Web/WebStatus/Program.cs index f9324ba36..adab0e6b3 100644 --- a/src/Web/WebStatus/Program.cs +++ b/src/Web/WebStatus/Program.cs @@ -27,7 +27,7 @@ namespace WebStatus builder.AddConsole(); builder.AddDebug(); }) - //.UseApplicationInsights() + .UseApplicationInsights() .Build(); } } diff --git a/src/Web/WebStatus/Startup.cs b/src/Web/WebStatus/Startup.cs index 70c127f49..6a9ed32d1 100644 --- a/src/Web/WebStatus/Startup.cs +++ b/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("OrchestratorType"); if (orchestratorType?.ToUpper() == "K8S")