From 4e12176801b38c9bab75efdff073dbe28da2392a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C3=B3n=20Tom=C3=A1s?= Date: Tue, 12 Sep 2017 15:39:06 +0200 Subject: [PATCH] Update identity.api base image to aspnetcore2.0 Rename Identity.api namespace --- .../Identity/Identity.API/Data/ApplicationContextSeed.cs | 3 +-- src/Services/Identity/Identity.API/Dockerfile | 2 +- src/Services/Identity/Identity.API/Program.cs | 2 ++ src/Services/Identity/Identity.API/Startup.cs | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Services/Identity/Identity.API/Data/ApplicationContextSeed.cs b/src/Services/Identity/Identity.API/Data/ApplicationContextSeed.cs index 0f81bcf66..d0099cc21 100644 --- a/src/Services/Identity/Identity.API/Data/ApplicationContextSeed.cs +++ b/src/Services/Identity/Identity.API/Data/ApplicationContextSeed.cs @@ -5,8 +5,8 @@ using Extensions.Logging; using global::eShopOnContainers.Identity; using global::Identity.API.Data; + using global::Identity.API.Extensions; using global::Identity.API.Models; - using Identity.API.Extensions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; @@ -16,7 +16,6 @@ using System.IO; using System.IO.Compression; using System.Linq; - using System.Security.Cryptography; using System.Text.RegularExpressions; using System.Threading.Tasks; diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile index bd01695f3..029b5893e 100644 --- a/src/Services/Identity/Identity.API/Dockerfile +++ b/src/Services/Identity/Identity.API/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:1.1.2 +FROM microsoft/aspnetcore:2.0.0 ARG source WORKDIR /app EXPOSE 80 diff --git a/src/Services/Identity/Identity.API/Program.cs b/src/Services/Identity/Identity.API/Program.cs index 3a65c32ab..9802c36f1 100644 --- a/src/Services/Identity/Identity.API/Program.cs +++ b/src/Services/Identity/Identity.API/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Microsoft.eShopOnContainers.Services.Identity; using Microsoft.Extensions.Logging; using System.IO; @@ -28,3 +29,4 @@ namespace eShopOnContainers.Identity .Build(); } } + diff --git a/src/Services/Identity/Identity.API/Startup.cs b/src/Services/Identity/Identity.API/Startup.cs index dfdece593..572e0399f 100644 --- a/src/Services/Identity/Identity.API/Startup.cs +++ b/src/Services/Identity/Identity.API/Startup.cs @@ -1,5 +1,6 @@ using Autofac; using Autofac.Extensions.DependencyInjection; +using eShopOnContainers.Identity; using Identity.API.Certificate; using Identity.API.Configuration; using Identity.API.Data; @@ -24,7 +25,7 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; -namespace eShopOnContainers.Identity +namespace Microsoft.eShopOnContainers.Services.Identity { public class Startup {