Skip to content

Commit 0217ebb

Browse files
MichaelSimonsMichaelSimons
committed
Build samples for Nano Server 1709 release
1 parent 37fc934 commit 0217ebb

8 files changed

+319
-18
lines changed

‎README.DockerHub.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
# Supported Windows amd64 tags
2-
3-
- [`dotnetapp-nanoserver`, `dotnetapp`, `latest` (*dotnetapp-prod/Dockerfile*)](https://github.com/dotnet/dotnet-docker-samples/blob/master/dotnetapp-prod/Dockerfile)
4-
51
# Supported Linux amd64 tags
62

73
- [`dotnetapp-stretch`, `dotnetapp`, `latest` (*dotnetapp-prod/Dockerfile*)](https://github.com/dotnet/dotnet-docker-samples/blob/master/dotnetapp-prod/Dockerfile)
84

5+
# Supported Windows Server 2016 Version 1709 (Fall Creators Update) amd64 tags
6+
7+
- [`dotnetapp-nanoserver-1709` (*dotnetapp-prod/Dockerfile*)](https://github.com/dotnet/dotnet-docker-samples/blob/master/dotnetapp-prod/Dockerfile)
8+
9+
# Supported Windows Server 2016 amd64 tags
10+
11+
- [`dotnetapp-nanoserver`, `dotnetapp`, `latest` (*dotnetapp-prod/Dockerfile*)](https://github.com/dotnet/dotnet-docker-samples/blob/master/dotnetapp-prod/Dockerfile)
12+
913
# Supported Linux arm32 tags
1014

1115
- [`dotnetapp-stretch-arm32v7`, `dotnetapp`, `latest` (*dotnetapp-prod/Dockerfile.arm32*)](https://github.com/dotnet/dotnet-docker-samples/blob/master/dotnetapp-prod/Dockerfile.arm32)

‎build-pipeline/dotnet-docker-samples-linux-amd64-images.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"allowOverride": true
123123
},
124124
"image-builder.imageName": {
125-
"value": "microsoft/dotnet-buildtools-prereqs:image-builder-jessie-20170824103849"
125+
"value": "microsoft/dotnet-buildtools-prereqs:image-builder-jessie-20171020090934"
126126
},
127127
"image-builder.args": {
128128
"value": "build --manifest manifest.json --push --username $(PB.docker.username) --password $(PB.docker.password) $(PB.image-builder.customCommonArgs)",
@@ -163,7 +163,7 @@
163163
"jobCancelTimeoutInMinutes": 5,
164164
"repository": {
165165
"properties": {
166-
"cleanOptions": "0",
166+
"cleanOptions": "3",
167167
"gitLfsSupport": "false",
168168
"skipSyncSource": "false",
169169
"reportBuildStatus": "true",
@@ -180,7 +180,7 @@
180180
"name": "dotnet/dotnet-docker-samples",
181181
"url": "https://github.com/dotnet/dotnet-docker-samples.git",
182182
"defaultBranch": "master",
183-
"clean": "false",
183+
"clean": "true",
184184
"checkoutSubmodules": false
185185
},
186186
"processParameters": {},

‎build-pipeline/dotnet-docker-samples-linux-arm32v7-images.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
"value": "$(Build.DefinitionName)-$(Build.BuildId)"
177177
},
178178
"image-builder.imageName": {
179-
"value": "microsoft/dotnet-buildtools-prereqs:image-builder-jessie-20170824103849"
179+
"value": "microsoft/dotnet-buildtools-prereqs:image-builder-jessie-20171020090934"
180180
},
181181
"image-builder.args": {
182182
"value": "build --manifest manifest.json --architecture arm --push --username $(PB.docker.username) --password $(PB.docker.password) $(PB.image-builder.customCommonArgs)",
@@ -215,7 +215,7 @@
215215
"jobCancelTimeoutInMinutes": 5,
216216
"repository": {
217217
"properties": {
218-
"cleanOptions": "0",
218+
"cleanOptions": "3",
219219
"gitLfsSupport": "false",
220220
"skipSyncSource": "false",
221221
"reportBuildStatus": "true",
@@ -232,7 +232,7 @@
232232
"name": "dotnet/dotnet-docker-samples",
233233
"url": "https://github.com/dotnet/dotnet-docker-samples.git",
234234
"defaultBranch": "master",
235-
"clean": "false",
235+
"clean": "true",
236236
"checkoutSubmodules": false
237237
},
238238
"processParameters": {},

‎build-pipeline/dotnet-docker-samples-post-image-build.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
"allowOverride": true
142142
},
143143
"image-builder.imageName": {
144-
"value": "microsoft/dotnet-buildtools-prereqs:image-builder-jessie-20170824103849"
144+
"value": "microsoft/dotnet-buildtools-prereqs:image-builder-jessie-20171020090934"
145145
},
146146
"image-builder.common.args": {
147147
"value": "--manifest manifest.json --username $(PB.docker.username) --password $(PB.docker.password) $(PB.image-builder.customCommonArgs)",
@@ -190,7 +190,7 @@
190190
"jobCancelTimeoutInMinutes": 5,
191191
"repository": {
192192
"properties": {
193-
"cleanOptions": "0",
193+
"cleanOptions": "3",
194194
"gitLfsSupport": "false",
195195
"skipSyncSource": "false",
196196
"reportBuildStatus": "true",
@@ -207,7 +207,7 @@
207207
"name": "dotnet/dotnet-docker-samples",
208208
"url": "https://github.com/dotnet/dotnet-docker-samples.git",
209209
"defaultBranch": "master",
210-
"clean": "false",
210+
"clean": "true",
211211
"checkoutSubmodules": false
212212
},
213213
"processParameters": {},

‎build-pipeline/dotnet-docker-samples-windows-1709-amd64-images.json

+270
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,270 @@
1+
{
2+
"build": [
3+
{
4+
"enabled": true,
5+
"continueOnError": false,
6+
"alwaysRun": false,
7+
"displayName": "Cleanup Docker",
8+
"timeoutInMinutes": 0,
9+
"condition": "succeeded()",
10+
"task": {
11+
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
12+
"versionSpec": "1.*",
13+
"definitionType": "task"
14+
},
15+
"inputs": {
16+
"scriptType": "inlineScript",
17+
"scriptName": "",
18+
"arguments": "",
19+
"workingFolder": "",
20+
"inlineScript": "docker ps -a -q | %{docker rm -f $_}\n\ndocker images | where {-Not ($_.StartsWith(\"microsoft/nanoserver \") -Or $_.StartsWith(\"microsoft/windowsservercore \") -Or $_.StartsWith(\"REPOSITORY \"))} | %{$_.Split(' ', [System.StringSplitOptions]::RemoveEmptyEntries)[2]} | select-object -unique | %{docker rmi -f $_}",
21+
"failOnStandardError": "true"
22+
}
23+
},
24+
{
25+
"enabled": true,
26+
"continueOnError": false,
27+
"alwaysRun": false,
28+
"displayName": "Pull image-builder",
29+
"timeoutInMinutes": 0,
30+
"condition": "succeeded()",
31+
"task": {
32+
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
33+
"versionSpec": "1.*",
34+
"definitionType": "task"
35+
},
36+
"inputs": {
37+
"filename": "docker",
38+
"arguments": "pull $(image-builder.imageName)",
39+
"workingFolder": "",
40+
"failOnStandardError": "false"
41+
}
42+
},
43+
{
44+
"enabled": true,
45+
"continueOnError": false,
46+
"alwaysRun": false,
47+
"displayName": "Create container",
48+
"timeoutInMinutes": 0,
49+
"condition": "succeeded()",
50+
"task": {
51+
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
52+
"versionSpec": "1.*",
53+
"definitionType": "task"
54+
},
55+
"inputs": {
56+
"filename": "docker",
57+
"arguments": "create --name $(image-builder.containerName) $(image-builder.imageName)",
58+
"workingFolder": "",
59+
"failOnStandardError": "false"
60+
}
61+
},
62+
{
63+
"enabled": true,
64+
"continueOnError": false,
65+
"alwaysRun": false,
66+
"displayName": "Copy image-builder locally",
67+
"timeoutInMinutes": 0,
68+
"condition": "succeeded()",
69+
"task": {
70+
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
71+
"versionSpec": "1.*",
72+
"definitionType": "task"
73+
},
74+
"inputs": {
75+
"filename": "docker ",
76+
"arguments": "cp $(image-builder.containerName):/image-builder $(Build.BinariesDirectory)/Microsoft.DotNet.ImageBuilder",
77+
"workingFolder": "",
78+
"failOnStandardError": "false"
79+
}
80+
},
81+
{
82+
"enabled": true,
83+
"continueOnError": false,
84+
"alwaysRun": false,
85+
"displayName": "Cleanup container",
86+
"timeoutInMinutes": 0,
87+
"condition": "always()",
88+
"task": {
89+
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
90+
"versionSpec": "1.*",
91+
"definitionType": "task"
92+
},
93+
"inputs": {
94+
"filename": "docker",
95+
"arguments": "rmi -f $(image-builder.imageName)",
96+
"workingFolder": "",
97+
"failOnStandardError": "false"
98+
}
99+
},
100+
{
101+
"enabled": true,
102+
"continueOnError": false,
103+
"alwaysRun": false,
104+
"displayName": "Run image-builder",
105+
"timeoutInMinutes": 0,
106+
"condition": "succeeded()",
107+
"task": {
108+
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
109+
"versionSpec": "1.*",
110+
"definitionType": "task"
111+
},
112+
"inputs": {
113+
"filename": "$(Build.BinariesDirectory)/Microsoft.DotNet.ImageBuilder/Microsoft.DotNet.ImageBuilder.exe",
114+
"arguments": "$(image-builder.args)",
115+
"workingFolder": "",
116+
"failOnStandardError": "false"
117+
}
118+
},
119+
{
120+
"enabled": true,
121+
"continueOnError": true,
122+
"alwaysRun": true,
123+
"displayName": "Cleanup Docker",
124+
"timeoutInMinutes": 0,
125+
"condition": "always()",
126+
"task": {
127+
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
128+
"versionSpec": "1.*",
129+
"definitionType": "task"
130+
},
131+
"inputs": {
132+
"scriptType": "inlineScript",
133+
"scriptName": "",
134+
"arguments": "",
135+
"workingFolder": "",
136+
"inlineScript": "docker ps -a -q | %{docker rm -f $_}\n\ndocker images | where {-Not ($_.StartsWith(\"microsoft/nanoserver \") -Or $_.StartsWith(\"microsoft/windowsservercore \") -Or $_.StartsWith(\"REPOSITORY \"))} | %{$_.Split(' ', [System.StringSplitOptions]::RemoveEmptyEntries)[2]} | select-object -unique | %{docker rmi -f $_}",
137+
"failOnStandardError": "true"
138+
}
139+
}
140+
],
141+
"options": [
142+
{
143+
"enabled": false,
144+
"definition": {
145+
"id": "5bc3cfb7-6b54-4a4b-b5d2-a3905949f8a6"
146+
},
147+
"inputs": {}
148+
},
149+
{
150+
"enabled": false,
151+
"definition": {
152+
"id": "7c555368-ca64-4199-add6-9ebaf0b0137d"
153+
},
154+
"inputs": {
155+
"multipliers": "[]",
156+
"parallel": "false",
157+
"continueOnError": "true",
158+
"additionalFields": "{}"
159+
}
160+
},
161+
{
162+
"enabled": false,
163+
"definition": {
164+
"id": "a9db38f9-9fdc-478c-b0f9-464221e58316"
165+
},
166+
"inputs": {
167+
"workItemType": "234347",
168+
"assignToRequestor": "true",
169+
"additionalFields": "{}"
170+
}
171+
},
172+
{
173+
"enabled": false,
174+
"definition": {
175+
"id": "57578776-4c22-4526-aeb0-86b6da17ee9c"
176+
},
177+
"inputs": {}
178+
}
179+
],
180+
"variables": {
181+
"system.debug": {
182+
"value": "false",
183+
"allowOverride": true
184+
},
185+
"image-builder.imageName": {
186+
"value": "microsoft/dotnet-buildtools-prereqs:image-builder-nanoserver-20171022184734"
187+
},
188+
"image-builder.args": {
189+
"value": "build --manifest manifest.json --push --username $(PB.docker.username) --password $(PB.docker.password) $(PB.image-builder.customCommonArgs)",
190+
"allowOverride": true
191+
},
192+
"image-builder.containerName": {
193+
"value": "$(Build.DefinitionName)-$(Build.BuildId)"
194+
},
195+
"PB.docker.password": {
196+
"value": null,
197+
"isSecret": true
198+
},
199+
"PB.image-builder.customCommonArgs": {
200+
"value": ""
201+
}
202+
},
203+
"demands": [
204+
"VSTS_OS -equals Windows_Server_2016_Data_Center_RS3"
205+
],
206+
"retentionRules": [
207+
{
208+
"branches": [
209+
"+refs/heads/*"
210+
],
211+
"artifacts": [],
212+
"artifactTypesToDelete": [
213+
"FilePath",
214+
"SymbolStore"
215+
],
216+
"daysToKeep": 10,
217+
"minimumToKeep": 1,
218+
"deleteBuildRecord": true,
219+
"deleteTestResults": true
220+
}
221+
],
222+
"jobAuthorizationScope": "projectCollection",
223+
"jobTimeoutInMinutes": 60,
224+
"jobCancelTimeoutInMinutes": 5,
225+
"repository": {
226+
"properties": {
227+
"cleanOptions": "3",
228+
"gitLfsSupport": "false",
229+
"skipSyncSource": "false",
230+
"reportBuildStatus": "true",
231+
"fetchDepth": "0",
232+
"connectedServiceId": "1e3b2b41-8d83-4240-a16f-6fc0b825d0d6",
233+
"apiUrl": "https://api.github.com/repos/dotnet/dotnet-docker-samples",
234+
"branchesUrl": "https://api.github.com/repos/dotnet/dotnet-docker-samples/branches",
235+
"cloneUrl": "https://github.com/dotnet/dotnet-docker-samples.git",
236+
"refsUrl": "https://api.github.com/repos/dotnet/dotnet-docker-samples/git/refs",
237+
"checkoutNestedSubmodules": "false"
238+
},
239+
"id": "https://github.com/dotnet/dotnet-docker-samples.git",
240+
"type": "GitHub",
241+
"name": "dotnet/dotnet-docker-samples",
242+
"url": "https://github.com/dotnet/dotnet-docker-samples.git",
243+
"defaultBranch": "master",
244+
"clean": "true",
245+
"checkoutSubmodules": false
246+
},
247+
"processParameters": {},
248+
"quality": "definition",
249+
"queue": {
250+
"id": 832,
251+
"name": "DotNetCore-Infra",
252+
"pool": {
253+
"id": 135,
254+
"name": "DotNetCore-Infra"
255+
}
256+
},
257+
"id": 6229,
258+
"name": "dotnet-docker-samples-windows-1709-amd64-images",
259+
"url": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6229",
260+
"path": "\\",
261+
"type": "build",
262+
"project": {
263+
"id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee",
264+
"name": "DevDiv",
265+
"description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ",
266+
"url": "https://devdiv.visualstudio.com/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee",
267+
"state": "wellFormed",
268+
"revision": 418097676
269+
}
270+
}

‎build-pipeline/dotnet-docker-samples-windows-amd64-images.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
"allowOverride": true
184184
},
185185
"image-builder.imageName": {
186-
"value": "microsoft/dotnet-buildtools-prereqs:image-builder-nanoserver-20170824103908"
186+
"value": "microsoft/dotnet-buildtools-prereqs:image-builder-nanoserver-20171022184734"
187187
},
188188
"image-builder.args": {
189189
"value": "build --manifest manifest.json --push --username $(PB.docker.username) --password $(PB.docker.password) $(PB.image-builder.customCommonArgs)",
@@ -224,7 +224,7 @@
224224
"jobCancelTimeoutInMinutes": 5,
225225
"repository": {
226226
"properties": {
227-
"cleanOptions": "1",
227+
"cleanOptions": "3",
228228
"gitLfsSupport": "false",
229229
"skipSyncSource": "false",
230230
"reportBuildStatus": "true",

0 commit comments

Comments
 (0)