Skip to content

Commit d4b8ec9

Browse files
committed
Make image/dockerfile/dockerComposeFile optional
1 parent 56d9340 commit d4b8ec9

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

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

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -282,33 +282,42 @@
282282
]
283283
}
284284
},
285-
"allOf": [
285+
"oneOf": [
286286
{
287-
"oneOf": [
287+
"allOf": [
288288
{
289-
"allOf": [
289+
"oneOf": [
290290
{
291-
"oneOf": [
291+
"allOf": [
292292
{
293-
"$ref": "#/definitions/dockerfileContainer"
293+
"oneOf": [
294+
{
295+
"$ref": "#/definitions/dockerfileContainer"
296+
},
297+
{
298+
"$ref": "#/definitions/imageContainer"
299+
}
300+
]
294301
},
295302
{
296-
"$ref": "#/definitions/imageContainer"
303+
"$ref": "#/definitions/nonComposeBase"
297304
}
298305
]
299306
},
300307
{
301-
"$ref": "#/definitions/nonComposeBase"
308+
"$ref": "#/definitions/composeContainer"
302309
}
303310
]
304311
},
305312
{
306-
"$ref": "#/definitions/composeContainer"
313+
"$ref": "#/definitions/devContainerCommon"
307314
}
308315
]
309316
},
310317
{
311-
"$ref": "#/definitions/devContainerCommon"
318+
"type": "object",
319+
"$ref": "#/definitions/devContainerCommon",
320+
"additionalProperties": false
312321
}
313322
]
314323
}

0 commit comments

Comments
 (0)