Skip to content
This repository has been archived by the owner on Mar 1, 2018. It is now read-only.

Update samples to utilize multi-arch tags #47

Merged
merged 1 commit into from
May 18, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .dockerignore

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ bld/
[Oo]bj/
[Ll]og/
[Oo]ut/
[Pp]ublished/

# Visual Studio 2015 cache/options directory
.vs/
Expand Down
3 changes: 1 addition & 2 deletions aspnetapp/Dockerfile.nano
Original file line number Diff line number Diff line change
@@ -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"]
4 changes: 2 additions & 2 deletions dotnetapp-current/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
4 changes: 0 additions & 4 deletions dotnetapp-current/Dockerfile.nano

This file was deleted.

11 changes: 1 addition & 10 deletions dotnetapp-current/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,11 @@ 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
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
```
4 changes: 2 additions & 2 deletions dotnetapp-dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
11 changes: 0 additions & 11 deletions dotnetapp-dev/Dockerfile.nano

This file was deleted.

9 changes: 1 addition & 8 deletions dotnetapp-dev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
2 changes: 1 addition & 1 deletion dotnetapp-prod/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:1.0-runtime
WORKDIR /app
COPY out .
COPY out ./
ENTRYPOINT ["dotnet", "dotnetapp.dll"]
4 changes: 0 additions & 4 deletions dotnetapp-prod/Dockerfile.nano

This file was deleted.

11 changes: 1 addition & 10 deletions dotnetapp-prod/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,11 @@ 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
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
```
2 changes: 1 addition & 1 deletion dotnetapp-selfcontained/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:1.0-runtime-deps
WORKDIR /app
COPY out .
COPY out ./
ENTRYPOINT ["./dotnetapp"]