Merge from vscode 5e80bf449c995aa32a59254c0ff845d37da11b70 (#9317)

extensions/configuration-editing/schemas/devContainer.schema.json

@@ -48,6 +48,16 @@
 					"type": "string",
 					"description": "The user VS Code Server will be started with. The default is the same user as the container."
 				},
+				"initializeCommand": {
+					"type": [
+						"string",
+						"array"
+					],
+					"description": "A command to run locally before anything else. If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.",
+					"items": {
+						"type": "string"
+					}
+				},
 				"postCreateCommand": {
 					"type": [
 						"string",
@@ -132,7 +142,7 @@
 				}
 			}
 		},
-		"dockerFileContainer": {
+		"dockerFileAndContext": {
 			"type": "object",
 			"properties": {
 				"dockerFile": {
@@ -148,6 +158,64 @@
 				"dockerFile"
 			]
 		},
+		"dockerFileContainer": {
+			"oneOf": [
+				{
+					"type": "object",
+					"properties": {
+						"build": {
+							"type": "object",
+							"description": "Docker build-related options.",
+							"allOf": [
+								{
+									"$ref": "#/definitions/dockerFileAndContext"
+								},
+								{
+									"$ref": "#/definitions/buildOptions"
+								}
+							]
+					}
+					},
+					"required": [
+						"build"
+					]
+				},
+				{
+					"allOf": [
+						{
+							"$ref": "#/definitions/dockerFileAndContext"
+						},
+						{
+							"type": "object",
+							"properties": {
+								"build": {
+									"description": "Docker build-related options.",
+									"$ref": "#/definitions/buildOptions"
+								}
+							}
+						}
+					]
+				}
+			]
+		},
+		"buildOptions": {
+			"type": "object",
+			"properties": {
+				"target": {
+					"type": "string",
+					"description": "Target stage in a multi-stage build."
+				},
+				"args": {
+					"type": "object",
+					"additionalProperties": {
+						"type": [
+							"string"
+						]
+					},
+					"description": "Build arguments."
+				}
+			}
+		},
 		"imageContainer": {
 			"type": "object",
 			"properties": {