This repository has been archived by the owner on Nov 16, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 124
Enable buildpipeline build and add test apps for 4.7 and 4.7.1 #16
Merged
rakeshsinghranchi
merged 4 commits into
microsoft:dockerhub
from
rakeshsinghranchi:EnableBuildPipeline
Dec 1, 2017
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
3f1f69a
Enable buildpipeline build and add test apps for 4.7 and 4.7.1
rakeshsinghranchi 5ae37ef
Updated per feedback comments
rakeshsinghranchi 3625b4b
Remove .NET 4.6.2 and .NET 4.7 sample applications
rakeshsinghranchi b6bd6d5
update per feedback
rakeshsinghranchi 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
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| .NET Framework Docker Samples | ||
| ============================= | ||
|
|
||
| This repo contains samples that demonstrate various .NET Framework Docker configurations, which you can use as the basis of your own Docker images. These samples depend on the [.NET Framework Docker images](https://hub.docker.com/r/microsoft/dotnet-framework/) on Docker Hub, provided by the .NET Team at Microsoft. | ||
|
|
||
| Docker uses [docker/whalesay](https://hub.docker.com/r/docker/whalesay/) as a getting started sample. The .NET Framework Team at Microsoft uses [dotnetbot](https://github.com/dotnet-bot), which is the mascot for .NET open source projects. Got something to say? Both whalesay and dotnetbot are great listeners. | ||
|
|
||
| You can pick the sample that best fits the scenario you are interested in. The instructions for each sample describe how to target [Windows](http://aka.ms/windowscontainers). | ||
|
|
||
| You need to have the [Docker for Windows client](https://docs.docker.com/docker-for-windows/) client installed to use these samples. | ||
|
|
||
| Samples | ||
| ------- | ||
|
|
||
| The following samples show different ways to use .NET Framework images. | ||
|
|
||
|
|
||
| # Supported Windows Server 2016 Version 1709 (Fall Creators Update) amd64 tags | ||
|
|
||
| - [`4.7.1-windowsservercore-1709`,`4.7.1`,`latest` (*dotnetapp-4.7.1/Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker-samples/blob/dockerhub/dotnetapp-4.7.1/Dockerfile) | ||
| - [`3.5-windowsservercore-1709`,`3.5`(*dotnetapp-3.5/Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker-samples/blob/dockerhub/dotnetapp-3.5/Dockerfile) | ||
|
|
||
| # Supported Windows Server 2016 amd64 tags | ||
|
|
||
| - [`4.7.1-windowsservercore-ltsc2016`, `4.7.1`, `latest` (*dotnetapp-4.7.1/Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker-samples/blob/dockerhub/dotnetapp-4.7.1/Dockerfile) | ||
| - [`3.5-windowsservercore-ltsc2016`, `3.5` (*dotnetapp-3.5/Dockerfile*)](https://github.com/Microsoft/dotnet-framework-docker-samples/blob/dockerhub/dotnetapp-3.5/Dockerfile) | ||
|
|
||
| >**Note:** .NET Core multi-arch tags, such as 2.0-runtime, have been updated to use nanoserver-1709 images if your host is Windows Server 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. | ||
|
|
||
| Related Repositories | ||
| -------------------- | ||
|
|
||
| See the following related Docker Hub repos: | ||
|
|
||
| - [microsoft/dotnet-framework](https://hub.docker.com/r/microsoft/dotnet-framework/) for .NET Framework images (for web applications, see microsoft/aspnet). | ||
| - [microsoft/aspnet](https://hub.docker.com/r/microsoft/aspnet/) for ASP.NET Web Forms and MVC images. | ||
| - [microsoft/dotnet](https://hub.docker.com/r/microsoft/dotnet/) for .NET Core images. | ||
| - [microsoft/dotnet-samples](https://hub.docker.com/r/microsoft/dotnet-samples/) for .NET Core sample images. | ||
| - [microsoft/aspnetcore](https://hub.docker.com/r/microsoft/aspnetcore/) for ASP.NET Core images. | ||
|
|
||
| See the following related GitHub repos: | ||
|
|
||
| - [dotnet/dotnet-docker-samples](https://github.com/dotnet/dotnet-docker-samples/) for .NET Core samples. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| The contents of the [build-pipeline](build-pipeline) folder are used by the .NET Core engineering infrastructure to build and publish the sample Docker images to [microsoft/dotnet-framework-samples](https://hub.docker.com/r/microsoft/dotnet-framework-samples/). |
233 changes: 233 additions & 0 deletions
233
build-pipeline/dotnet-framework-docker-samples-post-image-build.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,233 @@ | ||
| { | ||
| "options": [ | ||
| { | ||
| "enabled": false, | ||
| "definition": { | ||
| "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" | ||
| }, | ||
| "inputs": { | ||
| "workItemType": "234347", | ||
| "assignToRequestor": "true", | ||
| "additionalFields": "{}" | ||
| } | ||
| }, | ||
| { | ||
| "enabled": false, | ||
| "definition": { | ||
| "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" | ||
| }, | ||
| "inputs": {} | ||
| }, | ||
| { | ||
| "enabled": false, | ||
| "definition": { | ||
| "id": "5d58cc01-7c75-450c-be18-a388ddb129ec" | ||
| }, | ||
| "inputs": { | ||
| "branchFilters": "[\"+refs/heads/*\"]", | ||
| "additionalFields": "{}" | ||
| } | ||
| } | ||
| ], | ||
| "build": [ | ||
| { | ||
| "environment": {}, | ||
| "enabled": true, | ||
| "continueOnError": false, | ||
| "alwaysRun": false, | ||
| "displayName": "Cleanup Docker", | ||
| "timeoutInMinutes": 0, | ||
| "refName": "Task1", | ||
| "task": { | ||
| "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", | ||
| "versionSpec": "1.*", | ||
| "definitionType": "task" | ||
| }, | ||
| "inputs": { | ||
| "filename": "docker", | ||
| "arguments": "system prune -a -f", | ||
| "workingFolder": "", | ||
| "failOnStandardError": "false" | ||
| } | ||
| }, | ||
| { | ||
| "environment": {}, | ||
| "enabled": true, | ||
| "continueOnError": false, | ||
| "alwaysRun": false, | ||
| "displayName": "Pull image-builder", | ||
| "timeoutInMinutes": 0, | ||
| "refName": "Task2", | ||
| "task": { | ||
| "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", | ||
| "versionSpec": "1.*", | ||
| "definitionType": "task" | ||
| }, | ||
| "inputs": { | ||
| "filename": "docker", | ||
| "arguments": "pull $(image-builder.imageName)", | ||
| "workingFolder": "", | ||
| "failOnStandardError": "false" | ||
| } | ||
| }, | ||
| { | ||
| "environment": {}, | ||
| "enabled": true, | ||
| "continueOnError": false, | ||
| "alwaysRun": false, | ||
| "displayName": "Publish Manifest", | ||
| "timeoutInMinutes": 0, | ||
| "refName": "Task3", | ||
| "task": { | ||
| "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", | ||
| "versionSpec": "1.*", | ||
| "definitionType": "task" | ||
| }, | ||
| "inputs": { | ||
| "filename": "docker", | ||
| "arguments": "run --rm -v /var/run/docker.sock:/var/run/docker.sock -v $(Build.SourcesDirectory):/repo -w /repo --name $(image-builder.containerName) $(image-builder.imageName) $(image-builder.publishManifest.args)", | ||
| "workingFolder": "", | ||
| "failOnStandardError": "false" | ||
| } | ||
| }, | ||
| { | ||
| "environment": {}, | ||
| "enabled": true, | ||
| "continueOnError": false, | ||
| "alwaysRun": false, | ||
| "displayName": "Update Readme", | ||
| "timeoutInMinutes": 0, | ||
| "refName": "Task4", | ||
| "task": { | ||
| "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", | ||
| "versionSpec": "1.*", | ||
| "definitionType": "task" | ||
| }, | ||
| "inputs": { | ||
| "filename": "docker", | ||
| "arguments": "run --rm -v /var/run/docker.sock:/var/run/docker.sock -v $(Build.SourcesDirectory):/repo -w /repo --name $(image-builder.containerName) $(image-builder.imageName) $(image-builder.updateReadme.args)", | ||
| "workingFolder": "", | ||
| "failOnStandardError": "false" | ||
| } | ||
| }, | ||
| { | ||
| "environment": {}, | ||
| "enabled": true, | ||
| "continueOnError": true, | ||
| "alwaysRun": false, | ||
| "displayName": "Cleanup Docker", | ||
| "timeoutInMinutes": 0, | ||
| "refName": "Task5", | ||
| "task": { | ||
| "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", | ||
| "versionSpec": "1.*", | ||
| "definitionType": "task" | ||
| }, | ||
| "inputs": { | ||
| "filename": "docker", | ||
| "arguments": "system prune -a -f", | ||
| "workingFolder": "", | ||
| "failOnStandardError": "false" | ||
| } | ||
| } | ||
| ], | ||
| "variables": { | ||
| "system.debug": { | ||
| "value": "false", | ||
| "allowOverride": true | ||
| }, | ||
| "image-builder.imageName": { | ||
| "value": "microsoft/dotnet-buildtools-prereqs:image-builder-jessie-20171020090934" | ||
| }, | ||
| "image-builder.common.args": { | ||
| "value": "--manifest manifest.json --username $(PB.docker.username) --password $(PB.docker.password) $(PB.image-builder.customCommonArgs)", | ||
| "allowOverride": true | ||
| }, | ||
| "image-builder.publishManifest.args": { | ||
| "value": "publishManifest $(image-builder.common.args)", | ||
| "allowOverride": true | ||
| }, | ||
| "image-builder.updateReadme.args": { | ||
| "value": "updateReadme $(image-builder.common.args)", | ||
| "allowOverride": true | ||
| }, | ||
| "image-builder.containerName": { | ||
| "value": "$(Build.DefinitionName)-$(Build.BuildId)" | ||
| }, | ||
| "PB.image-builder.customCommonArgs": { | ||
| "value": "" | ||
| }, | ||
| "PB.docker.password": { | ||
| "value": null, | ||
| "isSecret": true | ||
| } | ||
| }, | ||
| "demands": [ | ||
| "Agent.OS -equals linux" | ||
| ], | ||
| "retentionRules": [ | ||
| { | ||
| "branches": [ | ||
| "+refs/heads/*" | ||
| ], | ||
| "artifacts": [], | ||
| "artifactTypesToDelete": [ | ||
| "FilePath", | ||
| "SymbolStore" | ||
| ], | ||
| "daysToKeep": 10, | ||
| "minimumToKeep": 1, | ||
| "deleteBuildRecord": true, | ||
| "deleteTestResults": true | ||
| } | ||
| ], | ||
| "jobAuthorizationScope": 1, | ||
| "jobTimeoutInMinutes": 60, | ||
| "jobCancelTimeoutInMinutes": 5, | ||
| "repository": { | ||
| "properties": { | ||
| "cleanOptions": "3", | ||
| "gitLfsSupport": "false", | ||
| "skipSyncSource": "false", | ||
| "reportBuildStatus": "true", | ||
| "fetchDepth": "0", | ||
| "connectedServiceId": "a022e705-88df-44f2-a23a-53212a14f474", | ||
| "apiUrl": "https://api.github.com/repos/microsoft/dotnet-framework-docker-samples", | ||
| "branchesUrl": "https://api.github.com/repos/microsoft/dotnet-framework-docker-samples/branches", | ||
| "cloneUrl": "https://github.com/microsoft/dotnet-framework-docker-samples.git", | ||
| "refsUrl": "https://api.github.com/repos/microsoft/dotnet-framework-docker-samples/git/refs", | ||
| "checkoutNestedSubmodules": "false" | ||
| }, | ||
| "id": "https://github.com/microsoft/dotnet-framework-docker-samples.git", | ||
| "type": "GitHub", | ||
| "name": "microsoft/dotnet-framework-docker-samples", | ||
| "url": "https://github.com/microsoft/dotnet-framework-docker-samples.git", | ||
| "defaultBranch": "dockerhub", | ||
| "clean": "true", | ||
| "checkoutSubmodules": false | ||
| }, | ||
| "processParameters": {}, | ||
| "quality": "definition", | ||
| "queue": { | ||
| "id": 36, | ||
| "name": "DotNet-Build", | ||
| "pool": { | ||
| "id": 39, | ||
| "name": "DotNet-Build" | ||
| } | ||
| }, | ||
| "id": 7929, | ||
| "name": "dotnet-framework-docker-samples-post-image-build", | ||
| "url": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/7929", | ||
| "path": "\\", | ||
| "type": "build", | ||
| "project": { | ||
| "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", | ||
| "name": "DevDiv", | ||
| "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. ", | ||
| "url": "https://devdiv.visualstudio.com/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", | ||
| "state": "wellFormed", | ||
| "revision": 418098369, | ||
| "visibility": "organization" | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the following comment should be added which exists in our other repos (e.g. https://github.com/Microsoft/dotnet-framework-docker/blob/master/README.md).