Skip to content

Commit 2aedbc8

Browse files
gvatsal60gvatsal60
authored
Merge branch 'main' into feature/pre-commit-hook_support_1138
2 parents 5e9552b + d79c223 commit 2aedbc8

File tree

18 files changed

+346
-250
lines changed

18 files changed

+346
-250
lines changed

‎.github/dependabot.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "devcontainers"
4+
directory: "/.devcontainer"
5+
schedule:
6+
interval: "weekly"
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"

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

Lines changed: 89 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,94 @@
11
{
2-
"id": "docker-in-docker",
3-
"version": "2.14.0",
4-
"name": "Docker (Docker-in-Docker)",
5-
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
6-
"description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
7-
"options": {
8-
"version": {
9-
"type": "string",
10-
"proposals": [
11-
"latest",
12-
"none",
13-
"20.10"
14-
],
15-
"default": "latest",
16-
"description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)"
17-
},
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-
}
2+
"id": "docker-in-docker",
3+
"version": "2.16.0",
4+
"name": "Docker (Docker-in-Docker)",
5+
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
6+
"description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
7+
"options": {
8+
"version": {
9+
"type": "string",
10+
"proposals": [
11+
"latest",
12+
"none",
13+
"20.10"
14+
],
15+
"default": "latest",
16+
"description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)"
6417
},
65-
"entrypoint": "/usr/local/share/docker-init.sh",
66-
"privileged": true,
67-
"containerEnv": {
68-
"DOCKER_BUILDKIT": "1"
18+
"moby": {
19+
"type": "boolean",
20+
"default": true,
21+
"description": "Install OSS Moby build instead of Docker CE"
6922
},
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-
}
23+
"mobyBuildxVersion": {
24+
"type": "string",
25+
"default": "latest",
26+
"description": "Install a specific version of moby-buildx when using Moby"
8327
},
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-
]
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+
]
9494
}

‎src/docker-in-docker/install.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,13 @@ if ! command -v git >/dev/null 2>&1; then
303303
check_packages git
304304
fi
305305

306+
# Update CA certificates to ensure HTTPS connections work properly
307+
# This is especially important for Ubuntu 24.04 (Noble) and Debian Trixie
308+
# Only run for Debian-based systems (RHEL uses update-ca-trust instead)
309+
if [ "${ADJUSTED_ID}" = "debian" ] && command -v update-ca-certificates > /dev/null 2>&1; then
310+
update-ca-certificates
311+
fi
312+
306313
# Swap to legacy iptables for compatibility (Debian only)
307314
if [ "${ADJUSTED_ID}" = "debian" ] && type iptables-legacy > /dev/null 2>&1; then
308315
update-alternatives --set iptables /usr/sbin/iptables-legacy

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

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
{
2-
"id": "docker-outside-of-docker",
3-
"version": "1.6.5",
4-
"name": "Docker (docker-outside-of-docker)",
5-
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
6-
"description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
7-
"options": {
8-
"version": {
9-
"type": "string",
10-
"proposals": [
11-
"latest",
12-
"none",
13-
"20.10"
14-
],
15-
"default": "latest",
16-
"description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)"
17-
},
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": "Compose version to use for docker-compose (v1 or v2 or none)"
37-
},
38-
"installDockerBuildx": {
39-
"type": "boolean",
40-
"default": true,
41-
"description": "Install Docker Buildx"
42-
},
43-
"installDockerComposeSwitch": {
44-
"type": "boolean",
45-
"default": true,
46-
"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."
47-
}
2+
"id": "docker-outside-of-docker",
3+
"version": "1.8.0",
4+
"name": "Docker (docker-outside-of-docker)",
5+
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
6+
"description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
7+
"options": {
8+
"version": {
9+
"type": "string",
10+
"proposals": [
11+
"latest",
12+
"none",
13+
"20.10"
14+
],
15+
"default": "latest",
16+
"description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)"
4817
},
49-
"entrypoint": "/usr/local/share/docker-init.sh",
50-
"customizations": {
51-
"vscode": {
52-
"extensions": [
53-
"ms-azuretools.vscode-containers"
54-
],
55-
"settings": {
56-
"github.copilot.chat.codeGeneration.instructions": [
57-
{
58-
"text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using the Docker daemon on the host machine."
59-
}
60-
]
61-
}
62-
}
18+
"moby": {
19+
"type": "boolean",
20+
"default": true,
21+
"description": "Install OSS Moby build instead of Docker CE"
6322
},
64-
"mounts": [
65-
{
66-
"source": "/var/run/docker.sock",
67-
"target": "/var/run/docker-host.sock",
68-
"type": "bind"
69-
}
70-
],
71-
"securityOpt": [
72-
"label=disable"
73-
],
74-
"installsAfter": [
75-
"ghcr.io/devcontainers/features/common-utils"
76-
],
77-
"legacyIds": [
78-
"docker-from-docker"
79-
]
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": "Compose version to use for docker-compose (v1 or v2 or none)"
37+
},
38+
"installDockerBuildx": {
39+
"type": "boolean",
40+
"default": true,
41+
"description": "Install Docker Buildx"
42+
},
43+
"installDockerComposeSwitch": {
44+
"type": "boolean",
45+
"default": true,
46+
"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."
47+
}
48+
},
49+
"entrypoint": "/usr/local/share/docker-init.sh",
50+
"customizations": {
51+
"vscode": {
52+
"extensions": [
53+
"ms-azuretools.vscode-containers"
54+
],
55+
"settings": {
56+
"github.copilot.chat.codeGeneration.instructions": [
57+
{
58+
"text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using the Docker daemon on the host machine."
59+
}
60+
]
61+
}
62+
}
63+
},
64+
"mounts": [
65+
{
66+
"source": "/var/run/docker.sock",
67+
"target": "/var/run/docker-host.sock",
68+
"type": "bind"
69+
}
70+
],
71+
"securityOpt": [
72+
"label=disable"
73+
],
74+
"installsAfter": [
75+
"ghcr.io/devcontainers/features/common-utils"
76+
],
77+
"legacyIds": [
78+
"docker-from-docker"
79+
]
8080
}

‎src/docker-outside-of-docker/install.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,11 @@ export DEBIAN_FRONTEND=noninteractive
192192

193193
# Install dependencies
194194
check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr wget
195+
# Update CA certificates to ensure HTTPS connections work properly
196+
# This is especially important for Ubuntu 24.04 (Noble) and Debian Trixie
197+
if command -v update-ca-certificates > /dev/null 2>&1; then
198+
update-ca-certificates
199+
fi
195200
if ! type git > /dev/null 2>&1; then
196201
check_packages git
197202
fi

‎src/java/devcontainer-feature.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "java",
3-
"version": "1.6.3",
3+
"version": "1.7.2",
44
"name": "Java (via SDKMAN!)",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
66
"description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
@@ -122,4 +122,4 @@
122122
"installsAfter": [
123123
"ghcr.io/devcontainers/features/common-utils"
124124
]
125-
}
125+
}

0 commit comments

Comments
 (0)