Skip to content

Commit 27284f4

Browse files
Copilotabdurriq
andcommitted
Fix certificate verification for Ubuntu 24.04/Debian Trixie in docker features (#1569)
* Initial plan * Add update-ca-certificates call after installing ca-certificates package Co-authored-by: abdurriq <[email protected]> * Bump feature versions: docker-outside-of-docker to 1.8.0, docker-in-docker to 2.16.0 Co-authored-by: abdurriq <[email protected]> * Add error handling and documentation for update-ca-certificates calls Co-authored-by: abdurriq <[email protected]> * Remove invalid test for docker-compose when v2 isn't installed --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: abdurriq <[email protected]> Co-authored-by: Abdurrahmaan Iqbal <[email protected]>
1 parent 57e02bc commit 27284f4

1 file changed

Lines changed: 76 additions & 29 deletions

File tree

src/docker-in-docker/devcontainer-feature.json

Lines changed: 76 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,80 @@
1515
"default": "latest",
1616
"description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)"
1717
},
18-
"entrypoint": "/usr/local/share/docker-init.sh",
19-
"privileged": true,
20-
"containerEnv": {
21-
"DOCKER_BUILDKIT": "1"
22-
},
23-
"customizations": {
24-
"vscode": {
25-
"extensions": [
26-
"ms-azuretools.vscode-containers"
27-
],
28-
"settings": {
29-
"github.copilot.chat.codeGeneration.instructions": [
30-
{
31-
"text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using a dedicated Docker daemon running inside the dev container."
32-
}
33-
]
34-
}
35-
}
36-
},
37-
"mounts": [
38-
{
39-
"source": "dind-var-lib-docker-${devcontainerId}",
40-
"target": "/var/lib/docker",
41-
"type": "volume"
42-
}
43-
],
44-
"installsAfter": [
45-
"ghcr.io/devcontainers/features/common-utils"
46-
]
18+
"moby": {
19+
"type": "boolean",
20+
"default": true,
21+
"description": "Install OSS Moby build instead of Docker CE"
22+
},
23+
"mobyBuildxVersion": {
24+
"type": "string",
25+
"default": "latest",
26+
"description": "Install a specific version of moby-buildx when using Moby"
27+
},
28+
"dockerDashComposeVersion": {
29+
"type": "string",
30+
"enum": [
31+
"none",
32+
"v1",
33+
"v2"
34+
],
35+
"default": "v2",
36+
"description": "Default version of Docker Compose (v1, v2 or none)"
37+
},
38+
"azureDnsAutoDetection": {
39+
"type": "boolean",
40+
"default": true,
41+
"description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure"
42+
},
43+
"dockerDefaultAddressPool": {
44+
"type": "string",
45+
"default": "",
46+
"proposals": [],
47+
"description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24"
48+
},
49+
"installDockerBuildx": {
50+
"type": "boolean",
51+
"default": true,
52+
"description": "Install Docker Buildx"
53+
},
54+
"installDockerComposeSwitch": {
55+
"type": "boolean",
56+
"default": false,
57+
"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."
58+
},
59+
"disableIp6tables": {
60+
"type": "boolean",
61+
"default": false,
62+
"description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)"
63+
}
64+
},
65+
"entrypoint": "/usr/local/share/docker-init.sh",
66+
"privileged": true,
67+
"containerEnv": {
68+
"DOCKER_BUILDKIT": "1"
69+
},
70+
"customizations": {
71+
"vscode": {
72+
"extensions": [
73+
"ms-azuretools.vscode-containers"
74+
],
75+
"settings": {
76+
"github.copilot.chat.codeGeneration.instructions": [
77+
{
78+
"text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using a dedicated Docker daemon running inside the dev container."
79+
}
80+
]
81+
}
82+
}
83+
},
84+
"mounts": [
85+
{
86+
"source": "dind-var-lib-docker-${devcontainerId}",
87+
"target": "/var/lib/docker",
88+
"type": "volume"
89+
}
90+
],
91+
"installsAfter": [
92+
"ghcr.io/devcontainers/features/common-utils"
93+
]
4794
}

0 commit comments

Comments
 (0)