Significant refactoring of scaffolding

.gitattributes

@@ -1,2 +1,2 @@
 # Stop git from breaking this script by putting CRLF in place of LF
-resources/vsdbg text eol=lf
+resources/netCore/vsdbg text eol=lf

.vscode/settings.json

@@ -20,5 +20,8 @@
 		"typescript"
 	],
 	"typescript.tsdk": "node_modules/typescript/lib",
-	"typescript.preferences.importModuleSpecifier": "relative"
+	"typescript.preferences.importModuleSpecifier": "relative",
+	"files.associations": {
+		"*.template": "plaintext"
+	}
 }

extension.bundle.ts

@@ -18,8 +18,6 @@ export { deactivateInternal } from './src/extension';
 //
 // The tests should import '../extension.bundle.ts'. At design-time they live in tests/ and so will pick up this file (extension.bundle.ts).
 // At runtime the tests live in dist/tests and will therefore pick up the main webpack bundle at dist/extension.bundle.js.
-export { configure, ConfigureApiOptions } from './src/configureWorkspace/configure';
-export { splitPorts } from './src/configureWorkspace/configUtils';
 export { configPrefix } from './src/constants';
 export { ProcessProvider } from './src/debugging/coreclr/ChildProcessProvider';
 export { DockerBuildImageOptions, DockerClient } from './src/debugging/coreclr/CliDockerClient';
@@ -34,12 +32,11 @@ export { OSProvider } from './src/utils/LocalOSProvider';
 export { bufferToString } from './src/utils/spawnAsync';
 export { DockerDaemonIsLinuxPrerequisite, DockerfileExistsPrerequisite, DotNetSdkInstalledPrerequisite, LinuxUserInDockerGroupPrerequisite, MacNuGetFallbackFolderSharedPrerequisite } from './src/debugging/coreclr/prereqManager';
 export { ext } from './src/extensionVariables';
-export { globAsync } from './src/utils/globAsync';
 export { httpsRequestBinary } from './src/utils/httpRequest';
 export { IKeytar } from './src/utils/keytar';
 export { inferCommand, inferPackageName, InspectMode, NodePackage } from './src/utils/nodeUtils';
 export { nonNullProp } from './src/utils/nonNull';
-export { getDockerOSType, isWindows10RS3OrNewer, isWindows10RS4OrNewer, isWindows10RS5OrNewer, isWindows1019H1OrNewer } from "./src/utils/osUtils";
+export { getDockerOSType } from "./src/utils/osUtils";
 export { Platform, PlatformOS } from './src/utils/platform';
 export { trimWithElipsis } from './src/utils/trimWithElipsis';
 export { recursiveFindTaskByType } from './src/tasks/TaskHelper';

package.json

@@ -32,7 +32,6 @@
     },
     "homepage": "https://github.com/Microsoft/vscode-docker/blob/master/README.md",
     "activationEvents": [
-        "onCommand:vscode-docker.api.configure",
         "onCommand:vscode-docker.compose.down",
         "onCommand:vscode-docker.compose.restart",
         "onCommand:vscode-docker.compose.up",
@@ -127,10 +126,6 @@
     "contributes": {
         "menus": {
             "commandPalette": [
-                {
-                    "command": "vscode-docker.api.configure",
-                    "when": "never"
-                },
                 {
                     "command": "vscode-docker.containers.select",
                     "when": "never"
@@ -2164,6 +2159,10 @@
                     "type": "boolean",
                     "default": true,
                     "description": "%vscode-docker.config.docker.showRemoteWorkspaceWarning%"
+                },
+                "docker.scaffolding.templatePath": {
+                    "type": "string",
+                    "description": "%vscode-docker.config.docker.scaffolding.templatePath%"
                 }
             }
         },
@@ -2177,11 +2176,6 @@
             }
         },
         "commands": [
-            {
-                "command": "vscode-docker.api.configure",
-                "title": "%vscode-docker.commands.api.configure%",
-                "category": "%vscode-docker.commands.category.docker%"
-            },
             {
                 "command": "vscode-docker.compose.down",
                 "title": "%vscode-docker.commands.compose.down%",
@@ -2766,12 +2760,12 @@
         "@azure/arm-containerregistry": "^8.0.0",
         "@azure/storage-blob": "^12.1.2",
         "@docker/sdk": "^0.1.13",
-        "dockerfile-ast": "^0.0.30",
         "dockerfile-language-server-nodejs": "^0.1.1",
         "dockerode": "^3.2.1",
         "fs-extra": "^9.0.1",
         "glob": "^7.1.6",
         "gradle-to-js": "^2.0.0",
+        "handlebars": "^4.7.6",
         "moment": "^2.27.0",
         "request": "^2.88.2",
         "request-promise-native": "^1.0.9",

package.nls.json

@@ -167,8 +167,8 @@
     "vscode-docker.config.docker.dockerComposeBuild": "Set to true to include --build option when docker-compose command is invoked",
     "vscode-docker.config.docker.dockerComposeDetached": "Set to true to include --d (detached) option when docker-compose command is invoked",
     "vscode-docker.config.docker.showRemoteWorkspaceWarning": "Set to true to prompt to switch from \"UI\" extension mode to \"Workspace\" extension mode if an operation is not supported in UI mode.",
+    "vscode-docker.config.docker.scaffolding.templatePath": "The path to use for scaffolding templates.",
     "vscode-docker.config.deprecated": "This setting has been deprecated and will be removed in a future release.",
-    "vscode-docker.commands.api.configure": "Add Docker Files to Workspace (API)...",
     "vscode-docker.commands.compose.down": "Compose Down",
     "vscode-docker.commands.compose.restart": "Compose Restart",
     "vscode-docker.commands.compose.up": "Compose Up",

resources/GetBlazorManifestLocations.targets → resources/netCore/GetBlazorManifestLocations.targets

@@ -7,7 +7,7 @@
         </PropertyGroup>
 
         <WriteLinesToFile
-            File="$(BlazorManifestLocationsOutput)"
+            File="$(InfoOutputPath)"
             Lines="$(BlazorManifestInputLocation)
 $(BlazorManifestOutputLocation)"
             Overwrite="True" />

resources/netCore/GetProjectProperties.targets

@@ -0,0 +1,10 @@
+<Project>
+    <!-- All the relevant info is in root-level PropertyGroups, so there are no dependent targets to make this work -->
+    <Target Name="GetProjectProperties">
+        <WriteLinesToFile
+            File="$(InfoOutputPath)"
+            Lines="$(AssemblyName).dll
+$(TargetFramework)$(TargetFrameworks.Split(';')[0])"
+            Overwrite="True" />
+    </Target>
+</Project>

resources/templates/.dockerignore.template

@@ -0,0 +1,29 @@
+{{#if pythonProjectType}}
+**/__pycache__
+{{/if}}
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+{{#unless (eq platform 'Node.js')}}
+**/bin
+{{/unless}}
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+README.md

resources/templates/cpp/Dockerfile.template

@@ -0,0 +1,19 @@
+# GCC support can be specified at major, minor, or micro version
+# (e.g. 8, 8.2 or 8.2.0).
+# See https://hub.docker.com/r/library/gcc/ for all supported GCC
+# tags from Docker Hub.
+# See https://docs.docker.com/samples/library/gcc/ for more on how to use this image
+FROM gcc:latest
+
+# These commands copy your files into the specified directory in the image
+# and set that as the working location
+COPY . /usr/src/myapp
+WORKDIR /usr/src/myapp
+
+# This command compiles your app using GCC, adjust for your source code
+RUN g++ -o myapp main.cpp
+
+# This command runs your application, comment out this line to compile only
+CMD ["./myapp"]
+
+LABEL Name={{ serviceName }} Version={{ version }}

resources/templates/docker-compose.debug.yml.template

@@ -0,0 +1,14 @@
+version: '3.4'
+
+services:
+  {{ serviceName }}:
+    image: {{ serviceName }}
+    build:
+      context: .
+      dockerfile: Dockerfile
+{{#if ports}}
+    ports:
+{{#each ports}}
+      - {{ . }}:{{ . }}
+{{/each}}
+{{/if}}

resources/templates/docker-compose.yml.template

@@ -0,0 +1,12 @@
+version: '3.4'
+
+services:
+  {{ serviceName }}:
+    image: {{ serviceName }}
+    build: .
+{{#if ports}}
+    ports:
+{{#each ports}}
+      - {{ . }}:{{ . }}
+{{/each}}
+{{/if}}

resources/templates/go/Dockerfile.template

@@ -0,0 +1,17 @@
+#build stage
+FROM golang:alpine AS builder
+WORKDIR /go/src/app
+COPY . .
+RUN apk add --no-cache git
+RUN go get -d -v ./...
+RUN go install -v ./...
+
+#final stage
+FROM alpine:latest
+RUN apk --no-cache add ca-certificates
+COPY --from=builder /go/bin/app /app
+ENTRYPOINT ./app
+LABEL Name={{ serviceName }} Version={{ version }}
+{{#each ports}}
+EXPOSE {{ . }}
+{{/each}}

resources/templates/java/Dockerfile.template

@@ -0,0 +1,11 @@
+FROM openjdk:8-jdk-alpine
+VOLUME /tmp
+ARG JAVA_OPTS
+ENV JAVA_OPTS=$JAVA_OPTS
+ADD {{ relativeJavaOutputPath }} {{ serviceName }}.jar
+{{#each ports}}
+EXPOSE {{ . }}
+{{/each}}
+ENTRYPOINT exec java $JAVA_OPTS -jar {{ serviceName }}.jar
+# For Spring-Boot project, use the entrypoint below to reduce Tomcat startup time.
+#ENTRYPOINT exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar {{ serviceName }}.jar

resources/templates/java/docker-compose.debug.yml.template

@@ -0,0 +1,16 @@
+version: '3.4'
+
+services:
+  {{ serviceName }}:
+    image: {{ serviceName }}
+    build:
+      context: .
+      dockerfile: Dockerfile
+    environment:
+      JAVA_OPTS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005,quiet=y
+{{#if (join ports debugPorts)}}
+    ports:
+{{#each (join ports debugPorts)}}
+      - {{ . }}:{{ . }}
+{{/each}}
+{{/if}}

resources/templates/netCore/Dockerfile.template

@@ -0,0 +1,21 @@
+FROM {{ netCoreRuntimeBaseImage }} AS base
+WORKDIR /app
+{{#each ports}}
+EXPOSE {{ . }}
+{{/each}}
+
+FROM {{ netCoreSdkBaseImage }} AS build
+WORKDIR /src
+COPY ["{{ workspaceRelative . artifact }}", "{{ dirname (workspaceRelative . artifact) }}/"]
+RUN dotnet restore "{{ workspaceRelative . artifact netCorePlatformOS }}"
+COPY . .
+WORKDIR "/src/{{ dirname (workspaceRelative . artifact 'Linux') 'Linux' }}"
+RUN dotnet build "{{ basename artifact }}" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "{{ basename artifact }}" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "{{ netCoreAssemblyName }}"]