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

Commit 5793c84

Browse files
author
Nate McMaster
committed
Merge branch 'master' into dev
2 parents eae1097 + 58bb67e commit 5793c84

File tree

12 files changed

+22
-61
lines changed

12 files changed

+22
-61
lines changed

‎2.0/jessie/kitchensink/Dockerfile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.0.6-sdk-2.1.101-jessie
1+
FROM microsoft/dotnet:2.0.6-sdk-2.1.104-jessie
22

33
# set up environment
44
ENV ASPNETCORE_URLS http://+:80
@@ -48,8 +48,3 @@ RUN dotnet restore /tmp/warmup/packagescache.csproj \
4848
&& rm -rf /tmp/warmup/
4949

5050
WORKDIR /
51-
52-
# Workaround for https://github.com/Microsoft/DockerTools/issues/87. This instructs NuGet to use 4.5 behavior in which
53-
# all errors when attempting to restore a project are ignored and treated as warnings instead. This allows the VS
54-
# tooling to use -nowarn:MSB3202 to ignore issues with the .dcproj project
55-
ENV RestoreUseSkipNonexistentTargets false

‎2.0/jessie/sdk/Dockerfile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.0.6-sdk-2.1.101-jessie
1+
FROM microsoft/dotnet:2.0.6-sdk-2.1.104-jessie
22

33
# set up environment
44
ENV ASPNETCORE_URLS http://+:80
@@ -26,8 +26,3 @@ RUN dotnet restore /tmp/warmup/packagescache.csproj \
2626
&& rm -rf /tmp/warmup/
2727

2828
WORKDIR /
29-
30-
# Workaround for https://github.com/Microsoft/DockerTools/issues/87. This instructs NuGet to use 4.5 behavior in which
31-
# all errors when attempting to restore a project are ignored and treated as warnings instead. This allows the VS
32-
# tooling to use -nowarn:MSB3202 to ignore issues with the .dcproj project
33-
ENV RestoreUseSkipNonexistentTargets false

‎2.0/nanoserver-1709/kitchensink/Dockerfile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN Invoke-WebRequest -UseBasicParsing https://distaspnet.blob.core.windows.net/
4545

4646

4747
# Kitchen Sink image
48-
FROM microsoft/dotnet:2.0.6-sdk-2.1.101-nanoserver-1709
48+
FROM microsoft/dotnet:2.0.6-sdk-2.1.104-nanoserver-1709
4949

5050
# Note: Kitchen Sink image's SHELL is the CMD shell (different than the installer image).
5151

@@ -74,7 +74,3 @@ RUN dotnet restore C:\warmup\packagescache.csproj `
7474
--verbosity quiet `
7575
&& del /F /S /Q C:\warmup
7676

77-
# Workaround for https://github.com/Microsoft/DockerTools/issues/87. This instructs NuGet to use 4.5 behavior in which
78-
# all errors when attempting to restore a project are ignored and treated as warnings instead. This allows the VS
79-
# tooling to use -nowarn:MSB3202 to ignore issues with the .dcproj project
80-
ENV RestoreUseSkipNonexistentTargets false

‎2.0/nanoserver-1709/sdk/Dockerfile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN Invoke-WebRequest -UseBasicParsing https://nodejs.org/dist/v${env:NODE_VERSI
2626

2727

2828
# Build image
29-
FROM microsoft/dotnet:2.0.6-sdk-2.1.101-nanoserver-1709
29+
FROM microsoft/dotnet:2.0.6-sdk-2.1.104-nanoserver-1709
3030

3131
# Note: Build image's SHELL is the CMD shell (different than the installer image).
3232

@@ -47,8 +47,3 @@ RUN dotnet restore C:\warmup\packagescache.csproj `
4747
--source https://api.nuget.org/v3/index.json `
4848
--verbosity quiet `
4949
&& del /F /S /Q C:\warmup
50-
51-
# Workaround for https://github.com/Microsoft/DockerTools/issues/87. This instructs NuGet to use 4.5 behavior in which
52-
# all errors when attempting to restore a project are ignored and treated as warnings instead. This allows the VS
53-
# tooling to use -nowarn:MSB3202 to ignore issues with the .dcproj project
54-
ENV RestoreUseSkipNonexistentTargets false

‎2.0/nanoserver-sac2016/kitchensink/Dockerfile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# escape=`
2-
FROM microsoft/dotnet:2.0.6-sdk-2.1.101-nanoserver-sac2016
2+
FROM microsoft/dotnet:2.0.6-sdk-2.1.104-nanoserver-sac2016
33

44
# set up environment
55
ENV ASPNETCORE_URLS http://+:80
@@ -49,8 +49,3 @@ RUN dotnet restore C:/warmup/packagescache.csproj `
4949
--source https://api.nuget.org/v3/index.json `
5050
--verbosity quiet; `
5151
Remove-Item -Recurse -Force C:/warmup
52-
53-
# Workaround for https://github.com/Microsoft/DockerTools/issues/87. This instructs NuGet to use 4.5 behavior in which
54-
# all errors when attempting to restore a project are ignored and treated as warnings instead. This allows the VS
55-
# tooling to use -nowarn:MSB3202 to ignore issues with the .dcproj project
56-
ENV RestoreUseSkipNonexistentTargets false

‎2.0/nanoserver-sac2016/sdk/Dockerfile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# escape=`
2-
FROM microsoft/dotnet:2.0.6-sdk-2.1.101-nanoserver-sac2016
2+
FROM microsoft/dotnet:2.0.6-sdk-2.1.104-nanoserver-sac2016
33

44
# set up environment
55
ENV ASPNETCORE_URLS http://+:80
@@ -32,8 +32,3 @@ RUN dotnet restore C:/warmup/packagescache.csproj `
3232
--source https://api.nuget.org/v3/index.json `
3333
--verbosity quiet; `
3434
Remove-Item -Recurse -Force C:/warmup
35-
36-
# Workaround for https://github.com/Microsoft/DockerTools/issues/87. This instructs NuGet to use 4.5 behavior in which
37-
# all errors when attempting to restore a project are ignored and treated as warnings instead. This allows the VS
38-
# tooling to use -nowarn:MSB3202 to ignore issues with the .dcproj project
39-
ENV RestoreUseSkipNonexistentTargets false

‎2.0/stretch/kitchensink/Dockerfile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.0.6-sdk-2.1.101-stretch
1+
FROM microsoft/dotnet:2.0.6-sdk-2.1.104-stretch
22

33
# set up environment
44
ENV ASPNETCORE_URLS http://+:80
@@ -48,8 +48,3 @@ RUN dotnet restore /tmp/warmup/packagescache.csproj \
4848
&& rm -rf /tmp/warmup/
4949

5050
WORKDIR /
51-
52-
# Workaround for https://github.com/Microsoft/DockerTools/issues/87. This instructs NuGet to use 4.5 behavior in which
53-
# all errors when attempting to restore a project are ignored and treated as warnings instead. This allows the VS
54-
# tooling to use -nowarn:MSB3202 to ignore issues with the .dcproj project
55-
ENV RestoreUseSkipNonexistentTargets false

‎2.0/stretch/sdk/Dockerfile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.0.6-sdk-2.1.101-stretch
1+
FROM microsoft/dotnet:2.0.6-sdk-2.1.104-stretch
22

33
# set up environment
44
ENV ASPNETCORE_URLS http://+:80
@@ -26,8 +26,3 @@ RUN dotnet restore /tmp/warmup/packagescache.csproj \
2626
&& rm -rf /tmp/warmup/
2727

2828
WORKDIR /
29-
30-
# Workaround for https://github.com/Microsoft/DockerTools/issues/87. This instructs NuGet to use 4.5 behavior in which
31-
# all errors when attempting to restore a project are ignored and treated as warnings instead. This allows the VS
32-
# tooling to use -nowarn:MSB3202 to ignore issues with the .dcproj project
33-
ENV RestoreUseSkipNonexistentTargets false

‎README.aspnetcore-build-nightly.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ This repository contains images that are used to compile/publish ASP.NET Core ap
77
# Linux amd64 tags
88

99
- [`1.1.7-1.1.8-jessie`, `1.1.7-1.1.8`, `1.1`, `1` (*1.1/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/jessie/sdk/Dockerfile)
10-
- [`2.0.6-2.1.101-stretch`, `2.0-stretch`, `2.0.6-2.1.101`, `2.0`, `2`, `latest` (*2.0/stretch/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/stretch/sdk/Dockerfile)
11-
- [`2.0.6-2.1.101-jessie`, `2.0-jessie`, `2-jessie` (*2.0/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/jessie/sdk/Dockerfile)
10+
- [`2.0.6-2.1.104-stretch`, `2.0-stretch`, `2.0.6-2.1.104`, `2.0`, `2`, `latest` (*2.0/stretch/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/stretch/sdk/Dockerfile)
11+
- [`2.0.6-2.1.104-jessie`, `2.0-jessie`, `2-jessie` (*2.0/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/jessie/sdk/Dockerfile)
1212

1313
# Windows Server, version 1709 amd64 tags
1414

15-
- [`2.0.6-2.1.101-nanoserver-1709`, `2.0-nanoserver-1709`, `2.0.6-2.1.101`, `2.0`, `2`, `latest` (*2.0/nanoserver-1709/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/nanoserver-1709/sdk/Dockerfile)
15+
- [`2.0.6-2.1.104-nanoserver-1709`, `2.0-nanoserver-1709`, `2.0.6-2.1.104`, `2.0`, `2`, `latest` (*2.0/nanoserver-1709/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/nanoserver-1709/sdk/Dockerfile)
1616

1717
# Windows Server 2016 amd64 tags
1818

1919
- [`1.1.7-1.1.8-nanoserver-sac2016`, `1.1.7-1.1.8`, `1.1`, `1` (*1.1/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/nanoserver-sac2016/sdk/Dockerfile)
20-
- [`2.0.6-2.1.101-nanoserver-sac2016`, `2.0-nanoserver-sac2016`, `2.0.6-2.1.101`, `2.0`, `2`, `latest` (*2.0/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/nanoserver-sac2016/sdk/Dockerfile)
20+
- [`2.0.6-2.1.104-nanoserver-sac2016`, `2.0-nanoserver-sac2016`, `2.0.6-2.1.104`, `2.0`, `2`, `latest` (*2.0/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/nanoserver-sac2016/sdk/Dockerfile)
2121

2222
>**Note:** ASP.NET Core multi-arch tags, such as 2.0, have been updated to use nanoserver-1709 images if your host is Windows Server 2016 Version 1709 or higher or Windows 10 Fall Creators Update (Version 1709) or higher. You need Docker 17.10 or later to take advantage of these updated tags.
2323

‎README.aspnetcore-build.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ This repository contains images that are used to compile/publish ASP.NET Core ap
77
# Supported Linux amd64 tags
88

99
- [`1.1.7-1.1.8-jessie`, `1.1.7-1.1.8`, `1.1`, `1` (*1.1/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/sdk/Dockerfile)
10-
- [`2.0.6-2.1.101-stretch`, `2.0-stretch`, `2.0.6-2.1.101`, `2.0`, `2`, `latest` (*2.0/stretch/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/stretch/sdk/Dockerfile)
11-
- [`2.0.6-2.1.101-jessie`, `2.0-jessie`, `2-jessie` (*2.0/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/jessie/sdk/Dockerfile)
10+
- [`2.0.6-2.1.104-stretch`, `2.0-stretch`, `2.0.6-2.1.104`, `2.0`, `2`, `latest` (*2.0/stretch/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/stretch/sdk/Dockerfile)
11+
- [`2.0.6-2.1.104-jessie`, `2.0-jessie`, `2-jessie` (*2.0/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/jessie/sdk/Dockerfile)
1212
- [`1.0-1.1-jessie`, `1.0-1.1` (*1.1/jessie/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/kitchensink/Dockerfile)
1313
- [`1.0-2.0-stretch`, `1.0-2.0` (*2.0/stretch/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/stretch/kitchensink/Dockerfile)
1414
- [`1.0-2.0-jessie` (*2.0/jessie/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/jessie/kitchensink/Dockerfile)
1515

1616
# Supported Windows Server 2016 Version 1709 (Fall Creators Update) amd64 tags
1717

18-
- [`2.0.6-2.1.101-nanoserver-1709`, `2.0-nanoserver-1709`, `2.0.6-2.1.101`, `2.0`, `2`, `latest` (*2.0/nanoserver-1709/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver-1709/sdk/Dockerfile)
18+
- [`2.0.6-2.1.104-nanoserver-1709`, `2.0-nanoserver-1709`, `2.0.6-2.1.104`, `2.0`, `2`, `latest` (*2.0/nanoserver-1709/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver-1709/sdk/Dockerfile)
1919

2020
# Supported Windows Server 2016 amd64 tags
2121

2222
- [`1.1.7-1.1.8-nanoserver-sac2016`, `1.1.7-1.1.8`, `1.1`, `1` (*1.1/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/nanoserver-sac2016/sdk/Dockerfile)
23-
- [`2.0.6-2.1.101-nanoserver-sac2016`, `2.0-nanoserver-sac2016`, `2.0.6-2.1.101`, `2.0`, `2`, `latest` (*2.0/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver-sac2016/sdk/Dockerfile)
23+
- [`2.0.6-2.1.104-nanoserver-sac2016`, `2.0-nanoserver-sac2016`, `2.0.6-2.1.104`, `2.0`, `2`, `latest` (*2.0/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver-sac2016/sdk/Dockerfile)
2424
- [`1.0-1.1-nanoserver-sac2016`, `1.0-1.1` (*1.1/nanoserver-sac2016/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/nanoserver-sac2016/kitchensink/Dockerfile)
2525
- [`1.0-2.0-nanoserver-sac2016`, `1.0-2.0` (*2.0/nanoserver-sac2016/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver-sac2016/kitchensink/Dockerfile)
2626

0 commit comments

Comments
 (0)