ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-14 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode dbe62be3266ffb6772a7f3db0bf61d63f4aa7f65 (#9337)

Browse Source
This commit is contained in:
Anthony Dresser
2020-02-26 00:23:48 -08:00
committed by GitHub
parent d2892ff78b
commit 067fcc8dfb
42 changed files with 384 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
extensions/configuration-editing/schemas/devContainer.schema.json
View File

@@ -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"