Skip to content

Commit c9526dd

Browse files
Remove Dockerfiles for consistency with other templates. Also fixesaspnet#694
1 parent 3c2fd50 commit c9526dd

File tree

8 files changed

+2
-105
lines changed

8 files changed

+2
-105
lines changed

‎templates/Angular2Spa/Dockerfile‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎templates/AureliaSpa/Dockerfile‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎templates/KnockoutSpa/Dockerfile‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎templates/ReactReduxSpa/Dockerfile‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎templates/ReactSpa/Dockerfile‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎templates/WebApplicationBasic/Dockerfile‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎templates/package-builder/src/build/build.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ function buildYeomanNpmPackage(outputRoot: string){
9595
{from: /.*\.csproj$/,to: 'tokenreplace-namePascalCase.csproj'}
9696
];
9797
constcontentReplacements=[
98-
// Dockerfile items
99-
{from: /FROMmicrosoft\/dotnet:1.1.0-sdk-projectjson/g,to: 'FROM <%= dockerBaseImage %>'},
100-
10198
// .xproj items
10299
{from: /\bWebApplicationBasic\b/g,to: '<%= namePascalCase %>'},
103100
{from: /<ProjectGuid>[0-9a-f\-]{36}<\/ProjectGuid>/g,to: '<ProjectGuid><%= projectGuid %></ProjectGuid>'},
@@ -162,11 +159,6 @@ function buildDotNetNewNuGetPackage(){
162159
type: 'bind',
163160
binding: 'dotnet-cli-version',
164161
replaces: '1.0.0-preview2-1-003177'
165-
},
166-
dockerBaseImage: {
167-
type: 'parameter',
168-
replaces: 'microsoft/dotnet:1.1.0-sdk-projectjson',
169-
defaultValue: 'microsoft/dotnet:1.1.0-sdk-msbuild'
170162
}
171163
},
172164
tags: {language: 'C#',type: 'project'},

‎templates/package-builder/src/yeoman/app/index.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,11 @@ const templates: TemplateConfig[] = [
5858
constsdkChoices=[{
5959
value: '1.0.0-preview2-1-003177',// Current released version
6060
name: 'project.json'+chalk.gray(' (compatible with .NET Core tooling preview 2 and Visual Studio 2015)'),
61-
includeFiles: [/^project.json$/,/\.xproj$/,/_placeholder.txt$/,/\.deployment$/],
62-
dockerBaseImage: 'microsoft/dotnet:1.1.0-sdk-projectjson'
61+
includeFiles: [/^project.json$/,/\.xproj$/,/_placeholder.txt$/,/\.deployment$/]
6362
},{
6463
value: '1.0.0-preview3-004056',// Version that ships with VS2017RC
6564
name: '.csproj'+chalk.gray(' (compatible with .NET Core tooling preview 3 and Visual Studio 2017)'),
66-
includeFiles: [/\.csproj$/],
67-
dockerBaseImage: 'microsoft/dotnet:1.1.0-sdk-msbuild'
65+
includeFiles: [/\.csproj$/]
6866
}];
6967

7068
classMyGeneratorextendsyeoman.Base{
@@ -123,7 +121,6 @@ class MyGenerator extends yeoman.Base{
123121
this._answers.projectGuid=this.options['projectguid']||uuid.v4();
124122

125123
constchosenSdk=sdkChoices.filter(sdk=>sdk.value===this._answers.sdkVersion)[0];
126-
this._answers.dockerBaseImage=chosenSdk.dockerBaseImage;
127124

128125
done();
129126
});

0 commit comments

Comments
(0)