From ee15fadc5104709c5f579a2317f17e789f719c13 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 25 Feb 2020 17:11:31 +0100
Subject: [PATCH] Change the casing of dockerFile to dockerfile
 (microsoft/vscode-remote-release#2422)

---
 .../schemas/devContainer.schema.json          | 50 +++++++++++--------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/extensions/configuration-editing/schemas/devContainer.schema.json b/extensions/configuration-editing/schemas/devContainer.schema.json
index 3cff1bd58f8..9cb171915fc 100644
--- a/extensions/configuration-editing/schemas/devContainer.schema.json
+++ b/extensions/configuration-editing/schemas/devContainer.schema.json
@@ -142,23 +142,7 @@
 				}
 			}
 		},
-		"dockerFileAndContext": {
-			"type": "object",
-			"properties": {
-				"dockerFile": {
-					"type": "string",
-					"description": "The location of the Dockerfile that defines the contents of the container. The path is relative to the folder containing the `devcontainer.json` file."
-				},
-				"context": {
-					"type": "string",
-					"description": "The location of the context folder for building the Docker image. The path is relative to the folder containing the `devcontainer.json` file."
-				}
-			},
-			"required": [
-				"dockerFile"
-			]
-		},
-		"dockerFileContainer": {
+		"dockerfileContainer": {
 			"oneOf": [
 				{
 					"type": "object",
@@ -168,7 +152,20 @@
 							"description": "Docker build-related options.",
 							"allOf": [
 								{
-									"$ref": "#/definitions/dockerFileAndContext"
+									"type": "object",
+									"properties": {
+										"dockerfile": {
+											"type": "string",
+											"description": "The location of the Dockerfile that defines the contents of the container. The path is relative to the folder containing the `devcontainer.json` file."
+										},
+										"context": {
+											"type": "string",
+											"description": "The location of the context folder for building the Docker image. The path is relative to the folder containing the `devcontainer.json` file."
+										}
+									},
+									"required": [
+										"dockerfile"
+									]
 								},
 								{
 									"$ref": "#/definitions/buildOptions"
@@ -183,7 +180,20 @@
 				{
 					"allOf": [
 						{
-							"$ref": "#/definitions/dockerFileAndContext"
+							"type": "object",
+							"properties": {
+								"dockerFile": {
+									"type": "string",
+									"description": "The location of the Dockerfile that defines the contents of the container. The path is relative to the folder containing the `devcontainer.json` file."
+								},
+								"context": {
+									"type": "string",
+									"description": "The location of the context folder for building the Docker image. The path is relative to the folder containing the `devcontainer.json` file."
+								}
+							},
+							"required": [
+								"dockerFile"
+							]
 						},
 						{
 							"type": "object",
@@ -280,7 +290,7 @@
 						{
 							"oneOf": [
 								{
-									"$ref": "#/definitions/dockerFileContainer"
+									"$ref": "#/definitions/dockerfileContainer"
 								},
 								{
 									"$ref": "#/definitions/imageContainer"