diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 38eedcb..0000000 --- a/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -project.lock.json diff --git a/.gitignore b/.gitignore index 7e5b2af..b1ce69d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ bld/ [Oo]bj/ [Ll]og/ [Oo]ut/ +[Pp]ublished/ # Visual Studio 2015 cache/options directory .vs/ diff --git a/aspnetapp/Dockerfile.nano b/aspnetapp/Dockerfile.nano index 12ac829..97f0117 100644 --- a/aspnetapp/Dockerfile.nano +++ b/aspnetapp/Dockerfile.nano @@ -1,5 +1,4 @@ -FROM microsoft/dotnet:1.1-runtime-nanoserver +FROM microsoft/aspnetcore:1.1.2-nanoserver WORKDIR /app -ENV ASPNETCORE_URLS http://+:80 COPY published ./ ENTRYPOINT ["dotnet", "aspnetapp.dll"] \ No newline at end of file diff --git a/dotnetapp-current/Dockerfile b/dotnetapp-current/Dockerfile index 4fe13f9..7b59bb6 100644 --- a/dotnetapp-current/Dockerfile +++ b/dotnetapp-current/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:1.1-runtime +FROM microsoft/dotnet:1.1-runtime WORKDIR /app -COPY out . +COPY out ./ ENTRYPOINT ["dotnet", "dotnetapp.dll"] diff --git a/dotnetapp-current/Dockerfile.nano b/dotnetapp-current/Dockerfile.nano deleted file mode 100644 index 2603211..0000000 --- a/dotnetapp-current/Dockerfile.nano +++ /dev/null @@ -1,4 +0,0 @@ -FROM microsoft/dotnet:1.1-runtime-nanoserver -WORKDIR /app -COPY out . -ENTRYPOINT ["dotnet", "dotnetapp.dll"] diff --git a/dotnetapp-current/README.md b/dotnetapp-current/README.md index 54ce50d..aaa0a74 100644 --- a/dotnetapp-current/README.md +++ b/dotnetapp-current/README.md @@ -22,7 +22,7 @@ dotnet restore dotnet run Hello .NET Core from Docker ``` -Follow these steps to run this sample in a Linux container: +Follow these steps to run this sample in either a Linux or Windows container environment: ```console dotnet restore @@ -30,12 +30,3 @@ dotnet publish -c Release -o out docker build -t dotnetapp . docker run dotnetapp Hello .NET Core from Docker ``` - -Follow these steps to run this sample in a Windows container: - -```console -dotnet restore -dotnet publish -c Release -o out -docker build -t dotnetapp -f Dockerfile.nano . -docker run dotnetapp Hello .NET Core from Docker -``` diff --git a/dotnetapp-dev/Dockerfile b/dotnetapp-dev/Dockerfile index 7974c2c..5979dd8 100644 --- a/dotnetapp-dev/Dockerfile +++ b/dotnetapp-dev/Dockerfile @@ -2,10 +2,10 @@ FROM microsoft/dotnet:1.1-sdk WORKDIR /app # copy csproj and restore as distinct layers -COPY dotnetapp.csproj . +COPY dotnetapp.csproj ./ RUN dotnet restore # copy and build everything else -COPY . . +COPY . ./ RUN dotnet publish -c Release -o out ENTRYPOINT ["dotnet", "out/dotnetapp.dll"] diff --git a/dotnetapp-dev/Dockerfile.nano b/dotnetapp-dev/Dockerfile.nano deleted file mode 100644 index e73591d..0000000 --- a/dotnetapp-dev/Dockerfile.nano +++ /dev/null @@ -1,11 +0,0 @@ -FROM microsoft/dotnet:1.1-sdk-nanoserver -WORKDIR /app - -# copy csproj and restore as distinct layers -COPY dotnetapp.csproj ./ -RUN dotnet restore - -# copy and build everything else -COPY . ./ -RUN dotnet publish -c Release -o out -ENTRYPOINT ["dotnet", "out/dotnetapp.dll"] diff --git a/dotnetapp-dev/README.md b/dotnetapp-dev/README.md index c64774d..7db127f 100644 --- a/dotnetapp-dev/README.md +++ b/dotnetapp-dev/README.md @@ -22,16 +22,9 @@ dotnet restore dotnet run Hello .NET Core ``` -Follow these steps to run this sample in a Linux container: +Follow these steps to run this sample in a Linux or Windows container environment: ```console docker build -t dotnetapp . docker run dotnetapp Hello .NET Core from Docker ``` - -Follow these steps to run this sample in a Windows container: - -```console -docker build -t dotnetapp -f Dockerfile.nano . -docker run dotnetapp Hello .NET Core from Docker -``` diff --git a/dotnetapp-prod/Dockerfile b/dotnetapp-prod/Dockerfile index 1cf02b0..c2d1f4a 100644 --- a/dotnetapp-prod/Dockerfile +++ b/dotnetapp-prod/Dockerfile @@ -1,4 +1,4 @@ FROM microsoft/dotnet:1.0-runtime WORKDIR /app -COPY out . +COPY out ./ ENTRYPOINT ["dotnet", "dotnetapp.dll"] diff --git a/dotnetapp-prod/Dockerfile.nano b/dotnetapp-prod/Dockerfile.nano deleted file mode 100644 index b55e212..0000000 --- a/dotnetapp-prod/Dockerfile.nano +++ /dev/null @@ -1,4 +0,0 @@ -FROM microsoft/dotnet:1.0-runtime-nanoserver -WORKDIR /app -COPY out . -ENTRYPOINT ["dotnet", "dotnetapp.dll"] diff --git a/dotnetapp-prod/README.md b/dotnetapp-prod/README.md index 5a21cc0..b685daa 100644 --- a/dotnetapp-prod/README.md +++ b/dotnetapp-prod/README.md @@ -22,7 +22,7 @@ dotnet restore dotnet run Hello .NET Core from Docker ``` -Follow these steps to run this sample in a Linux container: +Follow these steps to run this sample in a Linux or Windows container environment: ```console dotnet restore @@ -30,12 +30,3 @@ dotnet publish -c Release -o out docker build -t dotnetapp . docker run dotnetapp Hello .NET Core from Docker ``` - -Follow these steps to run this sample in a Windows container: - -```console -dotnet restore -dotnet publish -c Release -o out -docker build -t dotnetapp -f Dockerfile.nano . -docker run dotnetapp Hello .NET Core from Docker -``` diff --git a/dotnetapp-selfcontained/Dockerfile b/dotnetapp-selfcontained/Dockerfile index d6835b8..bd14251 100644 --- a/dotnetapp-selfcontained/Dockerfile +++ b/dotnetapp-selfcontained/Dockerfile @@ -1,4 +1,4 @@ FROM microsoft/dotnet:1.0-runtime-deps WORKDIR /app -COPY out . +COPY out ./ ENTRYPOINT ["./dotnetapp"]