Skip to content
This repository was archived by the owner on May 31, 2019. It is now read-only.

May update #448

Merged
merged 2 commits into from
May 14, 2019
Merged

May update #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea09dc5
Update to .NET Core 1.1.13 and 1.0.16
May 10, 2019
30725cb
Merged PR 1243: Update to .NET Core 1.1.13 and 1.0.16
May 13, 2019
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/runtime:1.0.15-jessie
FROM mcr.microsoft.com/dotnet/core/runtime:1.0.16-jessie

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

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

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

# set up environment
ENV ASPNETCORE_URLS http://+:80
Expand Down
2 changes: 1 addition & 1 deletion README.aspnetcore-build-nightly.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast

# Linux amd64 tags

- [`1.1.12-1.1.13-jessie`, `1.1.12-1.1.13`, `1.1`, `1` (*1.1/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/jessie/sdk/Dockerfile)
- [`1.1.13-1.1.14-jessie`, `1.1.13-1.1.14`, `1.1`, `1` (*1.1/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/jessie/sdk/Dockerfile)
- For 2.1 and up, use [microsoft/dotnet-nightly][migrate].

>**Note:** In images tagged with two versions in this pattern `A.B.C-X.Y.Z`, the first version `A.B.C` represents the .NET Core runtime version, and the second `X.Y.Z` represents the .NET Core SDK version.
Expand Down
2 changes: 1 addition & 1 deletion README.aspnetcore-build.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast

# Linux amd64 tags

- [`1.1.12-1.1.13-jessie`, `1.1.12-1.1.13`, `1.1`, `1` (*1.1/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/sdk/Dockerfile)
- [`1.1.13-1.1.14-jessie`, `1.1.13-1.1.14`, `1.1`, `1` (*1.1/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/sdk/Dockerfile)
- For 2.1 and up, use [microsoft/dotnet][migrate].

>**Note:** In images tagged with two versions in this pattern `A.B.C-X.Y.Z`, the first version `A.B.C` represents the .NET Core runtime version, and the second `X.Y.Z` represents the .NET Core SDK version.
Expand Down
4 changes: 2 additions & 2 deletions README.aspnetcore-nightly.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast

# Linux amd64 tags

- [`1.0.15-jessie`, `1.0.15`, `1.0` (*1.0/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.0/jessie/runtime/Dockerfile)
- [`1.1.12-jessie`, `1.1.12`, `1.1`, `1` (*1.1/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/jessie/runtime/Dockerfile)
- [`1.0.16-jessie`, `1.0.16`, `1.0` (*1.0/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.0/jessie/runtime/Dockerfile)
- [`1.1.13-jessie`, `1.1.13`, `1.1`, `1` (*1.1/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/jessie/runtime/Dockerfile)
- For 2.1 and up, use [microsoft/dotnet-nightly][migrate].

# What is ASP.NET Core?
Expand Down
4 changes: 2 additions & 2 deletions README.aspnetcore.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast

# Linux amd64 tags

- [`1.0.15-jessie`, `1.0.15`, `1.0` (*1.0/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.0/jessie/runtime/Dockerfile)
- [`1.1.12-jessie`, `1.1.12`, `1.1`, `1` (*1.1/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/runtime/Dockerfile)
- [`1.0.16-jessie`, `1.0.16`, `1.0` (*1.0/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.0/jessie/runtime/Dockerfile)
- [`1.1.13-jessie`, `1.1.13`, `1.1`, `1` (*1.1/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/runtime/Dockerfile)
- For 2.1 and up, use [microsoft/dotnet][migrate].

# What is ASP.NET Core?
Expand Down
12 changes: 6 additions & 6 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"images": [
{
"sharedTags": {
"1.0.15": {},
"1.0.16": {},
"1.0": {},
"lts": {
"isUndocumented": true
Expand All @@ -26,14 +26,14 @@
"dockerfile": "1.0/jessie/runtime",
"os": "linux",
"tags": {
"1.0.15-jessie": {}
"1.0.16-jessie": {}
}
}
]
},
{
"sharedTags": {
"1.1.12": {},
"1.1.13": {},
"1.1": {},
"1": {}
},
Expand All @@ -42,7 +42,7 @@
"dockerfile": "1.1/jessie/runtime",
"os": "linux",
"tags": {
"1.1.12-jessie": {}
"1.1.13-jessie": {}
}
}
]
Expand All @@ -55,7 +55,7 @@
"images": [
{
"sharedTags": {
"1.1.12-1.1.13": {},
"1.1.13-1.1.14": {},
"1.1": {},
"1": {},
"1.0": {
Expand All @@ -70,7 +70,7 @@
"dockerfile": "1.1/jessie/sdk",
"os": "linux",
"tags": {
"1.1.12-1.1.13-jessie": {}
"1.1.13-1.1.14-jessie": {}
}
}
]
Expand Down