Skip to content

Commit 19776b9

Browse files
Resolving conflicts
1 parent abeb35c commit 19776b9

1 file changed

Lines changed: 0 additions & 31 deletions

File tree

src/docker-outside-of-docker/devcontainer-feature.json

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -51,37 +51,6 @@
5151
"description": "Path where the Docker socket is mounted inside the container. For rootless Docker, override the mount in devcontainer.json to map your host socket to this path."
5252
}
5353
},
54-
"moby": {
55-
"type": "boolean",
56-
"default": true,
57-
"description": "Install OSS Moby build instead of Docker CE"
58-
},
59-
"mobyBuildxVersion": {
60-
"type": "string",
61-
"default": "latest",
62-
"description": "Install a specific version of moby-buildx when using Moby"
63-
},
64-
"dockerDashComposeVersion": {
65-
"type": "string",
66-
"enum": [
67-
"none",
68-
"v1",
69-
"v2"
70-
],
71-
"default": "v2",
72-
"description": "Compose version to use for docker-compose (v1 or v2 or none)"
73-
},
74-
"installDockerBuildx": {
75-
"type": "boolean",
76-
"default": true,
77-
"description": "Install Docker Buildx"
78-
},
79-
"installDockerComposeSwitch": {
80-
"type": "boolean",
81-
"default": true,
82-
"description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
83-
}
84-
},
8554
"entrypoint": "/usr/local/share/docker-init.sh",
8655
"customizations": {
8756
"vscode": {

0 commit comments

Comments
 (0)