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.13-runtime
FROM microsoft/dotnet:1.0.14-runtime

# 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.13-runtime-nanoserver-sac2016
FROM microsoft/dotnet:1.0.14-runtime-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.10-sdk-1.1.11
FROM microsoft/dotnet:1.1.11-sdk-1.1.12

# 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.10-runtime
FROM microsoft/dotnet:1.1.11-runtime

# 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.10-sdk-1.1.11
FROM microsoft/dotnet:1.1.11-sdk-1.1.12

# 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.10-sdk-1.1.11-nanoserver-sac2016
FROM microsoft/dotnet:1.1.11-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.10-runtime-nanoserver-sac2016
FROM microsoft/dotnet:1.1.11-runtime-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.10-sdk-1.1.11-nanoserver-sac2016
FROM microsoft/dotnet:1.1.11-sdk-1.1.12-nanoserver-sac2016

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

# Linux amd64 tags

- [`1.1.10-1.1.11-jessie`, `1.1.10-1.1.11`, `1.1`, `1` (*1.1/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/jessie/sdk/Dockerfile)
- [`1.1.11-1.1.12-jessie`, `1.1.11-1.1.12`, `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].

# Windows Server 2016 amd64 tags

- [`1.1.10-1.1.11-nanoserver-sac2016`, `1.1.10-1.1.11`, `1.1`, `1` (*1.1/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/nanoserver-sac2016/sdk/Dockerfile)
- [`1.1.11-1.1.12-nanoserver-sac2016`, `1.1.11-1.1.12`, `1.1`, `1` (*1.1/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/nanoserver-sac2016/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
4 changes: 2 additions & 2 deletions README.aspnetcore-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast

# Linux amd64 tags

- [`1.1.10-1.1.11-jessie`, `1.1.10-1.1.11`, `1.1`, `1` (*1.1/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/sdk/Dockerfile)
- [`1.1.11-1.1.12-jessie`, `1.1.11-1.1.12`, `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].

# Windows Server 2016 amd64 tags

- [`1.1.10-1.1.11-nanoserver-sac2016`, `1.1.10-1.1.11`, `1.1`, `1` (*1.1/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/nanoserver-sac2016/sdk/Dockerfile)
- [`1.1.11-1.1.12-nanoserver-sac2016`, `1.1.11-1.1.12`, `1.1`, `1` (*1.1/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/nanoserver-sac2016/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
8 changes: 4 additions & 4 deletions README.aspnetcore-nightly.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast

# Linux amd64 tags

- [`1.0.13-jessie`, `1.0.13`, `1.0` (*1.0/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.0/jessie/runtime/Dockerfile)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is nightly applicable anymore? Should these artifacts and corresponding Docker Hub repo be cleaned up? I'm not suggesting doing this with the PR, rather a followup.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't build the nightly repo anymore. Do you know if there is a way to completely deprecate a Docker hub repo?

Copy link
Contributor

@MichaelSimons MichaelSimons Feb 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can update the readme and optionally delete the repo. I would suggest we update the description to indicate it is deprecated and put a timeline on when it will be removed.

- [`1.1.10-jessie`, `1.1.10`, `1.1`, `1` (*1.1/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/jessie/runtime/Dockerfile)
- [`1.0.14-jessie`, `1.0.14`, `1.0` (*1.0/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.0/jessie/runtime/Dockerfile)
- [`1.1.11-jessie`, `1.1.11`, `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].

# Windows Server 2016 amd64 tags

- [`1.0.13-nanoserver-sac2016`, `1.0.13`, `1.0` (*1.0/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.0/nanoserver-sac2016/runtime/Dockerfile)
- [`1.1.10-nanoserver-sac2016`, `1.1.10`, `1.1`, `1` (*1.1/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/nanoserver-sac2016/runtime/Dockerfile)
- [`1.0.14-nanoserver-sac2016`, `1.0.14`, `1.0` (*1.0/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.0/nanoserver-sac2016/runtime/Dockerfile)
- [`1.1.11-nanoserver-sac2016`, `1.1.11`, `1.1`, `1` (*1.1/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/nanoserver-sac2016/runtime/Dockerfile)
- For 2.1 and up, use [microsoft/dotnet-nightly][migrate].

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

# Linux amd64 tags

- [`1.0.13-jessie`, `1.0.13`, `1.0` (*1.0/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.0/jessie/runtime/Dockerfile)
- [`1.1.10-jessie`, `1.1.10`, `1.1`, `1` (*1.1/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/runtime/Dockerfile)
- [`1.0.14-jessie`, `1.0.14`, `1.0` (*1.0/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.0/jessie/runtime/Dockerfile)
- [`1.1.11-jessie`, `1.1.11`, `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].

# Windows Server 2016 amd64 tags

- [`1.0.13-nanoserver-sac2016`, `1.0.13`, `1.0` (*1.0/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.0/nanoserver-sac2016/runtime/Dockerfile)
- [`1.1.10-nanoserver-sac2016`, `1.1.10`, `1.1`, `1` (*1.1/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/nanoserver-sac2016/runtime/Dockerfile)
- [`1.0.14-nanoserver-sac2016`, `1.0.14`, `1.0` (*1.0/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.0/nanoserver-sac2016/runtime/Dockerfile)
- [`1.1.11-nanoserver-sac2016`, `1.1.11`, `1.1`, `1` (*1.1/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/nanoserver-sac2016/runtime/Dockerfile)
- For 2.1 and up, use [microsoft/dotnet][migrate].

# What is ASP.NET Core?
Expand Down
18 changes: 9 additions & 9 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"images": [
{
"sharedTags": {
"1.0.13": {},
"1.0.14": {},
"1.0": {},
"lts": {
"isUndocumented": true
Expand All @@ -26,21 +26,21 @@
"dockerfile": "1.0/jessie/runtime",
"os": "linux",
"tags": {
"1.0.13-jessie": {}
"1.0.14-jessie": {}
}
},
{
"dockerfile": "1.0/nanoserver-sac2016/runtime",
"os": "windows",
"tags": {
"1.0.13-nanoserver-sac2016": {}
"1.0.14-nanoserver-sac2016": {}
}
}
]
},
{
"sharedTags": {
"1.1.10": {},
"1.1.11": {},
"1.1": {},
"1": {}
},
Expand All @@ -49,14 +49,14 @@
"dockerfile": "1.1/jessie/runtime",
"os": "linux",
"tags": {
"1.1.10-jessie": {}
"1.1.11-jessie": {}
}
},
{
"dockerfile": "1.1/nanoserver-sac2016/runtime",
"os": "windows",
"tags": {
"1.1.10-nanoserver-sac2016": {}
"1.1.11-nanoserver-sac2016": {}
}
}
]
Expand All @@ -69,7 +69,7 @@
"images": [
{
"sharedTags": {
"1.1.10-1.1.11": {},
"1.1.11-1.1.12": {},
"1.1": {},
"1": {},
"1.0": {
Expand All @@ -84,14 +84,14 @@
"dockerfile": "1.1/jessie/sdk",
"os": "linux",
"tags": {
"1.1.10-1.1.11-jessie": {}
"1.1.11-1.1.12-jessie": {}
}
},
{
"dockerfile": "1.1/nanoserver-sac2016/sdk",
"os": "windows",
"tags": {
"1.1.10-1.1.11-nanoserver-sac2016": {}
"1.1.11-1.1.12-nanoserver-sac2016": {}
}
}
]
Expand Down