Skip to content

Commit c9c8d15

Browse files
committed
Update samples to utilize multi-arch tags
1 parent b6c5bd2 commit c9c8d15

File tree

13 files changed

+11
-56
lines changed

13 files changed

+11
-56
lines changed

.dockerignore

-1
This file was deleted.

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ bld/
2222
[Oo]bj/
2323
[Ll]og/
2424
[Oo]ut/
25+
[Pp]ublished/
2526

2627
# Visual Studio 2015 cache/options directory
2728
.vs/

aspnetapp/Dockerfile.nano

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
FROM microsoft/dotnet:1.1-runtime-nanoserver
1+
FROM microsoft/aspnetcore:1.1.2-nanoserver
22
WORKDIR /app
3-
ENV ASPNETCORE_URLS http://+:80
43
COPY published ./
54
ENTRYPOINT ["dotnet", "aspnetapp.dll"]

dotnetapp-current/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:1.1-runtime
1+
FROM microsoft/dotnet:1.1-runtime
22
WORKDIR /app
3-
COPY out .
3+
COPY out ./
44
ENTRYPOINT ["dotnet", "dotnetapp.dll"]

dotnetapp-current/Dockerfile.nano

-4
This file was deleted.

dotnetapp-current/README.md

+1-10
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,11 @@ dotnet restore
2222
dotnet run Hello .NET Core from Docker
2323
```
2424

25-
Follow these steps to run this sample in a Linux container:
25+
Follow these steps to run this sample in either a Linux or Windows container environment:
2626

2727
```console
2828
dotnet restore
2929
dotnet publish -c Release -o out
3030
docker build -t dotnetapp .
3131
docker run dotnetapp Hello .NET Core from Docker
3232
```
33-
34-
Follow these steps to run this sample in a Windows container:
35-
36-
```console
37-
dotnet restore
38-
dotnet publish -c Release -o out
39-
docker build -t dotnetapp -f Dockerfile.nano .
40-
docker run dotnetapp Hello .NET Core from Docker
41-
```

dotnetapp-dev/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ FROM microsoft/dotnet:1.1-sdk
22
WORKDIR /app
33

44
# copy csproj and restore as distinct layers
5-
COPY dotnetapp.csproj .
5+
COPY dotnetapp.csproj ./
66
RUN dotnet restore
77

88
# copy and build everything else
9-
COPY . .
9+
COPY . ./
1010
RUN dotnet publish -c Release -o out
1111
ENTRYPOINT ["dotnet", "out/dotnetapp.dll"]

dotnetapp-dev/Dockerfile.nano

-11
This file was deleted.

dotnetapp-dev/README.md

+1-8
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,9 @@ dotnet restore
2222
dotnet run Hello .NET Core
2323
```
2424

25-
Follow these steps to run this sample in a Linux container:
25+
Follow these steps to run this sample in a Linux or Windows container environment:
2626

2727
```console
2828
docker build -t dotnetapp .
2929
docker run dotnetapp Hello .NET Core from Docker
3030
```
31-
32-
Follow these steps to run this sample in a Windows container:
33-
34-
```console
35-
docker build -t dotnetapp -f Dockerfile.nano .
36-
docker run dotnetapp Hello .NET Core from Docker
37-
```

dotnetapp-prod/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM microsoft/dotnet:1.0-runtime
22
WORKDIR /app
3-
COPY out .
3+
COPY out ./
44
ENTRYPOINT ["dotnet", "dotnetapp.dll"]

dotnetapp-prod/Dockerfile.nano

-4
This file was deleted.

dotnetapp-prod/README.md

+1-10
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,11 @@ dotnet restore
2222
dotnet run Hello .NET Core from Docker
2323
```
2424

25-
Follow these steps to run this sample in a Linux container:
25+
Follow these steps to run this sample in a Linux or Windows container environment:
2626

2727
```console
2828
dotnet restore
2929
dotnet publish -c Release -o out
3030
docker build -t dotnetapp .
3131
docker run dotnetapp Hello .NET Core from Docker
3232
```
33-
34-
Follow these steps to run this sample in a Windows container:
35-
36-
```console
37-
dotnet restore
38-
dotnet publish -c Release -o out
39-
docker build -t dotnetapp -f Dockerfile.nano .
40-
docker run dotnetapp Hello .NET Core from Docker
41-
```

dotnetapp-selfcontained/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM microsoft/dotnet:1.0-runtime-deps
22
WORKDIR /app
3-
COPY out .
3+
COPY out ./
44
ENTRYPOINT ["./dotnetapp"]

0 commit comments

Comments
 (0)