Skip to content
This repository was archived by the owner on May 31, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 1.0/jessie/runtime/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:1.0.14-runtime
FROM mcr.microsoft.com/dotnet/core/runtime:1.0.14-jessie

# set up network
ENV ASPNETCORE_URLS http://+:80
Expand Down
2 changes: 1 addition & 1 deletion 1.0/nanoserver-sac2016/runtime/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`
FROM microsoft/dotnet:1.0.14-runtime-nanoserver-sac2016
FROM mcr.microsoft.com/dotnet/core/runtime:1.0.14-nanoserver-sac2016

# set up network
ENV ASPNETCORE_URLS http://+:80
Expand Down
2 changes: 1 addition & 1 deletion 1.1/jessie/kitchensink/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:1.1.11-sdk-1.1.12
FROM mcr.microsoft.com/dotnet/core/sdk:1.1.12-jessie

# set up environment
ENV ASPNETCORE_URLS http://+:80
Expand Down
2 changes: 1 addition & 1 deletion 1.1/jessie/runtime/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:1.1.11-runtime
FROM mcr.microsoft.com/dotnet/core/runtime:1.1.11-jessie

# set up network
ENV ASPNETCORE_URLS http://+:80
Expand Down
2 changes: 1 addition & 1 deletion 1.1/jessie/sdk/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:1.1.11-sdk-1.1.12
FROM mcr.microsoft.com/dotnet/core/sdk:1.1.12-jessie

# set up environment
ENV ASPNETCORE_URLS http://+:80
Expand Down
2 changes: 1 addition & 1 deletion 1.1/nanoserver-sac2016/kitchensink/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`
FROM microsoft/dotnet:1.1.11-sdk-1.1.12-nanoserver-sac2016
FROM mcr.microsoft.com/dotnet/core/sdk:1.1.12-nanoserver-sac2016

# set up environment
ENV ASPNETCORE_URLS http://+:80
Expand Down
2 changes: 1 addition & 1 deletion 1.1/nanoserver-sac2016/runtime/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`
FROM microsoft/dotnet:1.1.11-runtime-nanoserver-sac2016
FROM mcr.microsoft.com/dotnet/core/runtime:1.1.11-nanoserver-sac2016

# set up network
ENV ASPNETCORE_URLS http://+:80
Expand Down
2 changes: 1 addition & 1 deletion 1.1/nanoserver-sac2016/sdk/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`
FROM microsoft/dotnet:1.1.11-sdk-1.1.12-nanoserver-sac2016
FROM mcr.microsoft.com/dotnet/core/sdk:1.1.12-nanoserver-sac2016

# set up environment
ENV ASPNETCORE_URLS http://+:80
Expand Down
8 changes: 4 additions & 4 deletions 2.1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ You can upgrade to 2.1 and by changing the repository name in the `FROM` line in

Current | Upgrade
--------|--------------
`microsoft/aspnetcore:1.0`<br>`microsoft/aspnetcore:1.1`<br>`microsoft/aspnetcore:2.0` | `microsoft/dotnet:2.1-aspnetcore-runtime`
`microsoft/aspnetcore-build:1.0`<br>`microsoft/aspnetcore-build:1.1`<br>`microsoft/aspnetcore-build:2.0` | `microsoft/dotnet:2.1-sdk`
`microsoft/aspnetcore:1.0`<br>`microsoft/aspnetcore:1.1`<br>`microsoft/aspnetcore:2.0` | `mcr.microsoft.com/dotnet/core/aspnet:2.1`
`microsoft/aspnetcore-build:1.0`<br>`microsoft/aspnetcore-build:1.1`<br>`microsoft/aspnetcore-build:2.0` | `mcr.microsoft.com/dotnet/core/sdk:2.1`

**I was using NodeJS in `microsoft/aspnetcore-build`, but this is missing from `microsoft/dotnet:2.1-sdk`. What should I do?**
**I was using NodeJS in `microsoft/aspnetcore-build`, but this is missing from `dotnet/core/sdk:2.1`. What should I do?**

You can either install NodeJS by adding a few lines of code to your Dockerfile that download and extract NodeJS,
or you can use the multi-stage feature of Docker and the official NodeJS images.
Expand All @@ -39,7 +39,7 @@ WORKDIR /src
COPY . .
RUN npm run webpack

FROM microsoft/dotnet:2.1-sdk AS dotnet-builder
FROM mcr.microsoft.com/dotnet/core/sdk:2.1 AS dotnet-builder
WORKDIR /app
COPY --from=node-builder /src/dist/*.js ./dist
```
2 changes: 1 addition & 1 deletion README.aspnetcore-build-nightly.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ASP.NET Core Build Docker Image (Nightly)

This repository contains images that are used to compile/publish ASP.NET Core applications inside the container. This is different to compiling an ASP.NET Core application and then adding the compiled output to an image, which is what you would do when using the [microsoft/aspnetcore-nightly](https://hub.docker.com/r/microsoft/aspnetcore-nightly/) image. These Dockerfiles use the [microsoft/dotnet](https://hub.docker.com/r/microsoft/dotnet/) image as its base.

Latest images for **2.1** and newer are now available on [microsoft/dotnet-nightly](https://hub.docker.com/r/microsoft/dotnet-nightly/). See [this link][migrate] for more details about migrating to 2.1.
Latest images for **2.1** and newer are now available on [dotnet/core-nightly](https://hub.docker.com/_/microsoft-dotnet-core-nightly/). See [this link][migrate] for more details about migrating to 2.1.

[migrate]: https://github.com/aspnet/aspnet-docker/blob/master/2.1

Expand Down
2 changes: 1 addition & 1 deletion README.aspnetcore-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ASP.NET Core Build Docker Image

This repository contains images that are used to compile/publish ASP.NET Core applications inside the container. This is different to compiling an ASP.NET Core application and then adding the compiled output to an image, which is what you would do when using the [microsoft/aspnetcore](https://hub.docker.com/r/microsoft/aspnetcore/) image. These Dockerfiles use the [microsoft/dotnet](https://hub.docker.com/r/microsoft/dotnet/) image as its base.

Latest images for **2.1** and newer are now available on [microsoft/dotnet](https://hub.docker.com/r/microsoft/dotnet/). See [this link][migrate] for more details about migrating to 2.1.
Latest images for **2.1** and newer are now available on [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/). See [this link][migrate] for more details about migrating to 2.1.

[migrate]: https://github.com/aspnet/aspnet-docker/blob/master/2.1

Expand Down
2 changes: 1 addition & 1 deletion README.aspnetcore-nightly.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ASP.NET Core Runtime Docker Image (Nightly)

This repository contains images for running published ASP.NET Core applications. These images contain the runtime only. Use [`microsoft/aspnetcore-build-nightly`](https://hub.docker.com/r/microsoft/aspnetcore-build-nightly/) to build ASP.NET Core apps inside the container.

Latest images for **2.1** and newer are now available on [microsoft/dotnet-nightly](https://hub.docker.com/r/microsoft/dotnet-nightly/). See [this link][migrate] for more details about migrating to 2.1.
Latest images for **2.1** and newer are now available on [dotnet/core-nightly](https://hub.docker.com/_/microsoft-dotnet-core-nightly/). See [this link][migrate] for more details about migrating to 2.1.

[migrate]: https://github.com/aspnet/aspnet-docker/blob/master/2.1

Expand Down
2 changes: 1 addition & 1 deletion README.aspnetcore.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ASP.NET Core Runtime Docker Image

This repository contains images for running published ASP.NET Core applications. These images contain the runtime only. Use [`microsoft/aspnetcore-build`](https://hub.docker.com/r/microsoft/aspnetcore-build/) to build ASP.NET Core apps inside the container.

Latest images for **2.1** and newer are now available on [microsoft/dotnet](https://hub.docker.com/r/microsoft/dotnet/). See [this link][migrate] for more details about migrating to 2.1.
Latest images for **2.1** and newer are now available on [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/). See [this link][migrate] for more details about migrating to 2.1.

[migrate]: https://github.com/aspnet/aspnet-docker/blob/master/2.1

Expand Down