From e11bbc2b226e75434a4ea1a885eb4e856fb1089b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ca=C3=B1izares=20Est=C3=A9vez?= Date: Thu, 17 Nov 2016 10:35:45 +0100 Subject: [PATCH] docker file --- .../eShopOnContainers.Droid.csproj | 2 +- .../eShopOnContainers.Droid.csproj.bak | 21 +++++++++++++++++++ .../eShopOnContainers.WebSPA/Dockerfile | 7 ------- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj index 83c3d49ab..ab50f052c 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj @@ -17,7 +17,7 @@ Off Properties\AndroidManifest.xml true - v7.0 + v6.0 armeabi,armeabi-v7a,x86 diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak index cf581a2b4..83c3d49ab 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak @@ -307,6 +307,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile b/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile index aa8183794..4dd601048 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Dockerfile @@ -1,10 +1,3 @@ -# FROM microsoft/aspnet:1.0.0-rc1-update1 -# COPY . /app -# WORKDIR /app -# RUN ["dnu", "restore"] -# EXPOSE 5104/tcp -# ENTRYPOINT ["dnx", "-p", "project.json", "web"] - FROM microsoft/aspnetcore:1.0.1 ENTRYPOINT ["dotnet", "eShopOnContainers.WebSPA.dll"] ARG source=.