Nell/eShopOnWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating Dockerfiles

Browse Source 
Adding instructions and cleaning up.
This commit is contained in:
Steve Smith
2018-06-07 15:50:32 -04:00
parent 74bc28e6bd
commit 48ad346b3c
3 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Web/Controllers/AccountController.cs
View File

@@ -10,7 +10,6 @@ using System.Threading.Tasks;
namespace Microsoft.eShopWeb.Web.Controllers namespace Microsoft.eShopWeb.Web.Controllers
{ {
[Route("[controller]/[action]")] [Route("[controller]/[action]")]
[Authorize] [Authorize]
public class AccountController : Controller public class AccountController : Controller
@@ -40,7 +39,7 @@ namespace Microsoft.eShopWeb.Web.Controllers
await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme); await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
ViewData["ReturnUrl"] = returnUrl; ViewData["ReturnUrl"] = returnUrl;
if (!String.IsNullOrEmpty(returnUrl) && if (!String.IsNullOrEmpty(returnUrl) &&
returnUrl.IndexOf("checkout", StringComparison.OrdinalIgnoreCase) >= 0) returnUrl.IndexOf("checkout", StringComparison.OrdinalIgnoreCase) >= 0)
{ {
ViewData["ReturnUrl"] = "/Basket/Index"; ViewData["ReturnUrl"] = "/Basket/Index";

32
src/Web/Dockerfile
View File

@@ -1,19 +1,27 @@
FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base # RUN BOTH CONTAINERS FROM ROOT (folder with .sln file):
# docker-compose build
# docker-compose up
#
# RUN JUST THIS CONTAINER FROM ROOT (folder with .sln file):
# docker build --pull -t web -f src/Web/Dockerfile .
#
# RUN COMMAND
# docker run --name eshopweb --rm -it -p 8000:5106 web
FROM microsoft/dotnet:2.1-sdk AS build
WORKDIR /app WORKDIR /app
EXPOSE 80
FROM microsoft/aspnetcore-build:2.1.300-preview1 AS build COPY *.sln .
RUN npm install -g bower@1.8.4
WORKDIR /src
COPY . . COPY . .
WORKDIR /src/src/Web WORKDIR /app/src/Web
RUN dotnet restore -nowarn:msb3202,nu1503 RUN dotnet restore
RUN dotnet build --no-restore -c Release -o /app
FROM build AS publish RUN dotnet publish -c Release -o out
RUN dotnet publish --no-restore -c Release -o /app
FROM base AS final FROM microsoft/dotnet:2.1-aspnetcore-runtime AS runtime
WORKDIR /app WORKDIR /app
COPY --from=publish /app . COPY --from=build /app/src/Web/out ./
# Optional: Set this here if not setting it from docker-compose.yml
# ENV ASPNETCORE_ENVIRONMENT Development
ENTRYPOINT ["dotnet", "Web.dll"] ENTRYPOINT ["dotnet", "Web.dll"]

32
src/WebRazorPages/Dockerfile
View File

@@ -1,19 +1,27 @@
FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base # RUN BOTH CONTAINERS FROM ROOT (folder with .sln file):
# docker-compose build
# docker-compose up
#
# RUN JUST THIS CONTAINER FROM ROOT (folder with .sln file):
# docker build --pull -t webrazor -f src/WebRazorPages/Dockerfile .
#
# RUN COMMAND
# docker run --name eshopweb --rm -it -p 5107:5107 webrazor
FROM microsoft/dotnet:2.1-sdk AS build
WORKDIR /app WORKDIR /app
EXPOSE 80
FROM microsoft/aspnetcore-build:2.1.300-preview1 AS build COPY *.sln .
RUN npm install -g bower@1.8.4
WORKDIR /src
COPY . . COPY . .
WORKDIR /src/src/WebRazorPages WORKDIR /app/src/WebRazorPages
RUN dotnet restore -nowarn:msb3202,nu1503 RUN dotnet restore
RUN dotnet build --no-restore -c Release -o /app
FROM build AS publish RUN dotnet publish -c Release -o out
RUN dotnet publish --no-restore -c Release -o /app
FROM base AS final FROM microsoft/dotnet:2.1-aspnetcore-runtime AS runtime
WORKDIR /app WORKDIR /app
COPY --from=publish /app . COPY --from=build /app/src/WebRazorPages/out ./
# Optional: Set this here if not setting it from docker-compose.yml
# ENV ASPNETCORE_ENVIRONMENT Development
ENTRYPOINT ["dotnet", "Microsoft.eShopWeb.RazorPages.dll"] ENTRYPOINT ["dotnet", "Microsoft.eShopWeb.RazorPages.dll"]