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

Commit 4971155

Browse files
authored
Update the aspnetcore-build images to contain the 2.0.2 .NET Core SDK (#312)
1 parent a8eed4b commit 4971155

File tree

9 files changed

+25
-20
lines changed

9 files changed

+25
-20
lines changed

2.0/jessie/kitchensink/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.0.0-sdk-jessie
1+
FROM microsoft/dotnet:2.0.0-sdk-2.0.2-jessie
22

33
# set up environment
44
ENV ASPNETCORE_URLS http://+:80

2.0/jessie/sdk/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.0.0-sdk-jessie
1+
FROM microsoft/dotnet:2.0.0-sdk-2.0.2-jessie
22

33
# set up environment
44
ENV ASPNETCORE_URLS http://+:80

2.0/nanoserver/kitchensink/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# escape=`
2-
FROM microsoft/dotnet:2.0.0-sdk-nanoserver-10.0.14393.1715
2+
FROM microsoft/dotnet:2.0.0-sdk-nanoserver-2.0.2-10.0.14393.1715
33

44
# set up environment
55
ENV ASPNETCORE_URLS http://+:80

2.0/nanoserver/sdk/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# escape=`
2-
FROM microsoft/dotnet:2.0.0-sdk-nanoserver-10.0.14393.1715
2+
FROM microsoft/dotnet:2.0.0-sdk-nanoserver-2.0.2-10.0.14393.1715
33

44
# set up environment
55
ENV ASPNETCORE_URLS http://+:80

2.0/stretch/kitchensink/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.0.0-sdk-stretch
1+
FROM microsoft/dotnet:2.0.0-sdk-2.0.2-stretch
22

33
# set up environment
44
ENV ASPNETCORE_URLS http://+:80

2.0/stretch/sdk/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.0.0-sdk-stretch
1+
FROM microsoft/dotnet:2.0.0-sdk-2.0.2-stretch
22

33
# set up environment
44
ENV ASPNETCORE_URLS http://+:80

README.aspnetcore-build.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ This repository contains images that are used to compile/publish ASP.NET Core ap
88

99
- [`1.0.7-jessie`, `1.0.7`, `1.0`, `lts` (*1.0/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.0/jessie/sdk/Dockerfile)
1010
- [`1.1.4-jessie`, `1.1.4`, `1.1`, `1` (*1.1/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/sdk/Dockerfile)
11-
- [`2.0.0-stretch`, `2.0.0`, `2.0`, `2`, `latest` (*2.0/stretch/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/stretch/sdk/Dockerfile)
12-
- [`2.0.0-jessie`, `2.0-jessie`, `2-jessie` (*2.0/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/jessie/sdk/Dockerfile)
11+
- [`2.0.2-stretch`, `2.0.2`, `2.0`, `2`, `latest` (*2.0/stretch/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/stretch/sdk/Dockerfile)
12+
- [`2.0.2-jessie`, `2.0-jessie`, `2-jessie` (*2.0/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/jessie/sdk/Dockerfile)
1313
- [`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)
1414
- [`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)
1515
- [`1.0-2.0-jessie` (*2.0/jessie/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/jessie/kitchensink/Dockerfile)
@@ -18,7 +18,7 @@ This repository contains images that are used to compile/publish ASP.NET Core ap
1818

1919
- [`1.0.7-nanoserver`, `1.0.7`, `1.0`, `lts` (*1.0/nanoserver/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.0/nanoserver/sdk/Dockerfile)
2020
- [`1.1.4-nanoserver`, `1.1.4`, `1.1`, `1` (*1.1/nanoserver/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/nanoserver/sdk/Dockerfile)
21-
- [`2.0.0-nanoserver`, `2.0.0`, `2.0`, `2`, `latest` (*2.0/nanoserver/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver/sdk/Dockerfile)
21+
- [`2.0.2-nanoserver`, `2.0.2`, `2.0`, `2`, `latest` (*2.0/nanoserver/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver/sdk/Dockerfile)
2222
- [`1.0-1.1-nanoserver`, `1.0-1.1` (*1.1/nanoserver/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/nanoserver/kitchensink/Dockerfile)
2323
- [`1.0-2.0-nanoserver`, `1.0-2.0` (*2.0/nanoserver/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver/kitchensink/Dockerfile)
2424

manifest.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
},
169169
{
170170
"sharedTags": {
171-
"2.0.0": {},
171+
"2.0.2": {},
172172
"2.0": {},
173173
"2": {},
174174
"latest": {}
@@ -178,15 +178,15 @@
178178
"dockerfile": "2.0/stretch/sdk",
179179
"os": "linux",
180180
"tags": {
181-
"2.0.0-stretch": {}
181+
"2.0.2-stretch": {}
182182
}
183183
},
184184
{
185185
"dockerfile": "2.0/nanoserver/sdk",
186186
"os": "windows",
187187
"tags": {
188-
"2.0.0-nanoserver": {},
189-
"2.0.0-nanoserver-$(nanoServerVersion)": {
188+
"2.0.2-nanoserver": {},
189+
"2.0.2-nanoserver-$(nanoServerVersion)": {
190190
"isUndocumented": true
191191
}
192192
}
@@ -199,7 +199,7 @@
199199
"dockerfile": "2.0/jessie/sdk",
200200
"os": "linux",
201201
"tags": {
202-
"2.0.0-jessie": {},
202+
"2.0.2-jessie": {},
203203
"2.0-jessie": {},
204204
"2-jessie": {}
205205
}
@@ -242,7 +242,7 @@
242242
{
243243
"sharedTags": {
244244
"1.0-2.0": {},
245-
"1.0-2.0-2017-09": {
245+
"1.0-2.0-2017-10": {
246246
"isUndocumented": true
247247
}
248248
},
@@ -252,7 +252,7 @@
252252
"os": "linux",
253253
"tags": {
254254
"1.0-2.0-stretch": {},
255-
"1.0-2.0-2017-09-stretch": {
255+
"1.0-2.0-2017-10-stretch": {
256256
"isUndocumented": true
257257
}
258258
}
@@ -262,10 +262,10 @@
262262
"os": "windows",
263263
"tags": {
264264
"1.0-2.0-nanoserver": {},
265-
"1.0-2.0-2017-09-nanoserver": {
265+
"1.0-2.0-2017-10-nanoserver": {
266266
"isUndocumented": true
267267
},
268-
"1.0-2.0-2017-09-nanoserver-$(nanoServerVersion)": {
268+
"1.0-2.0-2017-10-nanoserver-$(nanoServerVersion)": {
269269
"isUndocumented": true
270270
}
271271
}
@@ -279,7 +279,7 @@
279279
"os": "linux",
280280
"tags": {
281281
"1.0-2.0-jessie": {},
282-
"1.0-2.0-2017-09-jessie": {
282+
"1.0-2.0-2017-10-jessie": {
283283
"isUndocumented": true
284284
}
285285
}

test/test.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,12 @@ try
198198
$version = $_.dockerfile.Substring(0, 3)
199199
$sdk_tag_info = $_.tags | % { $_.PSobject.Properties } | select -first 1
200200
$sdk_tag = "${repoName}:$($sdk_tag_info.name)"
201-
$runtime_tag = $sdk_tag -replace '-build',''
201+
$runtime_tag = switch ($version) {
202+
# map the 2.0.2 sdk to the 2.0.0 runtime
203+
"2.0" { $sdk_tag -replace '2.0.2','2.0.0' }
204+
Default { $sdk_tag }
205+
}
206+
$runtime_tag = $runtime_tag -replace '-build',''
202207

203208
test_image $version $sdk_tag $runtime_tag
204209
}

0 commit comments

Comments
 (0)