From d28b893748edf3bff8bee6fc10d0cd71b764a316 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 29 Aug 2016 16:33:53 -0700 Subject: [PATCH 1/2] Remove Dockerfile Template **Bug** I believe at some point, NTVS planned to integrate with Docker. This does not appear to have really happened, but we still have this weird DockerFile template hanging around. This file template is not a general dockerfile, but NTVS specific. I do not believe we should include it anymore. **Fix** Delete. --- Nodejs/Product/Nodejs/Nodejs.csproj | 16 ++-- .../Files/DockerfileTemplate/Dockerfile | 13 --- .../DockerfileTemplate/Dockerfile.vstemplate | 18 ----- Nodejs/Product/Nodejs/VSPackage.resx | 6 -- .../DockerfileWizardExtension.cs | 79 ------------------- .../ProjectWizard/ProjectWizard.csproj | 3 +- 6 files changed, 7 insertions(+), 128 deletions(-) delete mode 100644 Nodejs/Product/Nodejs/Templates/Files/DockerfileTemplate/Dockerfile delete mode 100644 Nodejs/Product/Nodejs/Templates/Files/DockerfileTemplate/Dockerfile.vstemplate delete mode 100644 Nodejs/Product/ProjectWizard/DockerfileWizardExtension.cs diff --git a/Nodejs/Product/Nodejs/Nodejs.csproj b/Nodejs/Product/Nodejs/Nodejs.csproj index de5d96be1..d52bbb1ff 100644 --- a/Nodejs/Product/Nodejs/Nodejs.csproj +++ b/Nodejs/Product/Nodejs/Nodejs.csproj @@ -344,13 +344,13 @@ - - - Form + + + Form - + NewFileNameForm.cs - + @@ -700,7 +700,7 @@ NodejsGeneralOptionsControl.cs - + SalsaLsIntellisenseOptionsControl.cs @@ -1155,10 +1155,6 @@ Designer - - - Designer - diff --git a/Nodejs/Product/Nodejs/Templates/Files/DockerfileTemplate/Dockerfile b/Nodejs/Product/Nodejs/Templates/Files/DockerfileTemplate/Dockerfile deleted file mode 100644 index daa9e30e7..000000000 --- a/Nodejs/Product/Nodejs/Templates/Files/DockerfileTemplate/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM node:latest - -# Copy project files and change working directory -COPY . /src -WORKDIR /src - -# Expose container port -ENV PORT=8080 -EXPOSE $PORT - -# Install npm dependencies and run application -RUN npm install -CMD node $nodearguments$ \ No newline at end of file diff --git a/Nodejs/Product/Nodejs/Templates/Files/DockerfileTemplate/Dockerfile.vstemplate b/Nodejs/Product/Nodejs/Templates/Files/DockerfileTemplate/Dockerfile.vstemplate deleted file mode 100644 index 290e2cdd9..000000000 --- a/Nodejs/Product/Nodejs/Templates/Files/DockerfileTemplate/Dockerfile.vstemplate +++ /dev/null @@ -1,18 +0,0 @@ - - - - - Node.js - Docker - Dockerfile - false - 500 - - - Dockerfile - - - Microsoft.NodejsTools.ProjectWizard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Microsoft.NodejsTools.ProjectWizard.DockerfileWizardExtension - - \ No newline at end of file diff --git a/Nodejs/Product/Nodejs/VSPackage.resx b/Nodejs/Product/Nodejs/VSPackage.resx index 6ea2c4264..48f8f9200 100644 --- a/Nodejs/Product/Nodejs/VSPackage.resx +++ b/Nodejs/Product/Nodejs/VSPackage.resx @@ -276,12 +276,6 @@ TypeScript Mocha UnitTest file - - Dockerfile based on node:latest - - - Dockerfile - JavaScript Tape UnitTest file diff --git a/Nodejs/Product/ProjectWizard/DockerfileWizardExtension.cs b/Nodejs/Product/ProjectWizard/DockerfileWizardExtension.cs deleted file mode 100644 index 0eb18c366..000000000 --- a/Nodejs/Product/ProjectWizard/DockerfileWizardExtension.cs +++ /dev/null @@ -1,79 +0,0 @@ -//*********************************************************// -// Copyright (c) Microsoft. All rights reserved. -// -// Apache 2.0 License -// -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -// implied. See the License for the specific language governing -// permissions and limitations under the License. -// -//*********************************************************// - -using System; -using System.Collections.Generic; -using EnvDTE; -using Microsoft.VisualStudio.TemplateWizard; -using Microsoft.VisualStudioTools; - -namespace Microsoft.NodejsTools.ProjectWizard { - /// - /// Provides a project wizard extension which will replace the node arguments - /// in a Dockerfile with properties from the project file. - /// - public sealed class DockerfileWizardExtension : IWizard { - public void BeforeOpeningFile(ProjectItem projectItem) { - return; - } - - public void ProjectFinishedGenerating(EnvDTE.Project project) { - return; - } - - public void ProjectItemFinishedGenerating(ProjectItem projectItem) { - return; - } - - public void RunFinished() { - return; - } - - public void RunStarted(object automationObject, Dictionary replacementsDictionary, WizardRunKind runKind, object[] customParams) { - string arguments = GetFullNodeArguments(automationObject); - replacementsDictionary.Add("$nodearguments$", arguments); - } - - private static string GetFullNodeArguments(object automationObject) { - string arguments = null; - if (automationObject is DTE) { - DTE dte = (DTE)automationObject; - Array activeProjects = (Array)dte.ActiveSolutionProjects; - - if (activeProjects.Length > 0) { - EnvDTE.Project activeProject = (EnvDTE.Project)activeProjects.GetValue(0); - string startupFileName = CommonUtils.GetRelativeFilePath( - (string)activeProject.Properties.Item("ProjectHome").Value, - (string)activeProject.Properties.Item("StartupFile").Value ?? string.Empty).Replace("\\", "/"); - - string nodeExeArguments = (string)activeProject.Properties.Item("NodeExeArguments").Value ?? string.Empty; - string scriptArguments = (string)activeProject.Properties.Item("ScriptArguments").Value ?? string.Empty; - - arguments = String.Format("{0} {1} {2}", - nodeExeArguments.Trim(), - startupFileName.Trim(), - scriptArguments.Trim() - ).Trim(); - } - } - return arguments; - } - - public bool ShouldAddProjectItem(string filePath) { - return true; - } - } -} diff --git a/Nodejs/Product/ProjectWizard/ProjectWizard.csproj b/Nodejs/Product/ProjectWizard/ProjectWizard.csproj index 4896f6c8b..0585f8ee4 100644 --- a/Nodejs/Product/ProjectWizard/ProjectWizard.csproj +++ b/Nodejs/Product/ProjectWizard/ProjectWizard.csproj @@ -1,4 +1,4 @@ - + @@ -86,7 +86,6 @@ TestFrameworkDirectories.cs - From 1a457fef4b897d8c2f937d0097e68cea482da17f Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 30 Aug 2016 11:05:00 -0700 Subject: [PATCH 2/2] Remove docker file from setup files list --- Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj b/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj index f7cbb9ce8..f22d1daac 100644 --- a/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj +++ b/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj @@ -59,8 +59,7 @@ ItemTemplates\JavaScript\MochaUnitTest.zip; ItemTemplates\JavaScript\TypeScriptUnitTest.zip; ItemTemplates\JavaScript\TypeScriptTapeUnitTest.zip; - ItemTemplates\JavaScript\TypeScriptMochaUnitTest.zip; - ItemTemplates\JavaScript\DockerfileTemplate.zip"/> + ItemTemplates\JavaScript\TypeScriptMochaUnitTest.zip;"/>