From 1a03d6b5fca760ce5eaaf4fb9060e590395316bc Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Sun, 23 Feb 2020 11:48:25 +0100
Subject: [PATCH] Schema update (microsoft/vscode-remote-release#46)

---
 .../schemas/devContainer.schema.json          | 60 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/extensions/configuration-editing/schemas/devContainer.schema.json b/extensions/configuration-editing/schemas/devContainer.schema.json
index 0d47b27bec9..bfa1799e8ad 100644
--- a/extensions/configuration-editing/schemas/devContainer.schema.json
+++ b/extensions/configuration-editing/schemas/devContainer.schema.json
@@ -132,7 +132,7 @@
 				}
 			}
 		},
-		"dockerFileContainer": {
+		"dockerFileAndContext": {
 			"type": "object",
 			"properties": {
 				"dockerFile": {
@@ -148,6 +148,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": {
-- 
GitLab