-
Notifications
You must be signed in to change notification settings - Fork 582
Fix certificate verification for Ubuntu 24.04/Debian Trixie in docker features #1577
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+177
−166
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,94 @@ | ||
| { | ||
| "id": "docker-in-docker", | ||
| "version": "2.14.0", | ||
| "name": "Docker (Docker-in-Docker)", | ||
| "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker", | ||
| "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.", | ||
| "options": { | ||
| "version": { | ||
| "type": "string", | ||
| "proposals": [ | ||
| "latest", | ||
| "none", | ||
| "20.10" | ||
| ], | ||
| "default": "latest", | ||
| "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)" | ||
| }, | ||
| "moby": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Install OSS Moby build instead of Docker CE" | ||
| }, | ||
| "mobyBuildxVersion": { | ||
| "type": "string", | ||
| "default": "latest", | ||
| "description": "Install a specific version of moby-buildx when using Moby" | ||
| }, | ||
| "dockerDashComposeVersion": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "none", | ||
| "v1", | ||
| "v2" | ||
| ], | ||
| "default": "v2", | ||
| "description": "Default version of Docker Compose (v1, v2 or none)" | ||
| }, | ||
| "azureDnsAutoDetection": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure" | ||
| }, | ||
| "dockerDefaultAddressPool": { | ||
| "type": "string", | ||
| "default": "", | ||
| "proposals": [], | ||
| "description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24" | ||
| }, | ||
| "installDockerBuildx": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Install Docker Buildx" | ||
| }, | ||
| "installDockerComposeSwitch": { | ||
| "type": "boolean", | ||
| "default": false, | ||
| "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." | ||
| }, | ||
| "disableIp6tables": { | ||
| "type": "boolean", | ||
| "default": false, | ||
| "description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)" | ||
| } | ||
| "id": "docker-in-docker", | ||
| "version": "2.16.0", | ||
| "name": "Docker (Docker-in-Docker)", | ||
| "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker", | ||
| "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.", | ||
| "options": { | ||
| "version": { | ||
| "type": "string", | ||
| "proposals": [ | ||
| "latest", | ||
| "none", | ||
| "20.10" | ||
| ], | ||
| "default": "latest", | ||
| "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)" | ||
| }, | ||
| "entrypoint": "/usr/local/share/docker-init.sh", | ||
| "privileged": true, | ||
| "containerEnv": { | ||
| "DOCKER_BUILDKIT": "1" | ||
| "moby": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Install OSS Moby build instead of Docker CE" | ||
| }, | ||
| "customizations": { | ||
| "vscode": { | ||
| "extensions": [ | ||
| "ms-azuretools.vscode-containers" | ||
| ], | ||
| "settings": { | ||
| "github.copilot.chat.codeGeneration.instructions": [ | ||
| { | ||
| "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." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| "mobyBuildxVersion": { | ||
| "type": "string", | ||
| "default": "latest", | ||
| "description": "Install a specific version of moby-buildx when using Moby" | ||
| }, | ||
| "mounts": [ | ||
| { | ||
| "source": "dind-var-lib-docker-${devcontainerId}", | ||
| "target": "/var/lib/docker", | ||
| "type": "volume" | ||
| } | ||
| ], | ||
| "installsAfter": [ | ||
| "ghcr.io/devcontainers/features/common-utils" | ||
| ] | ||
| "dockerDashComposeVersion": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "none", | ||
| "v1", | ||
| "v2" | ||
| ], | ||
| "default": "v2", | ||
| "description": "Default version of Docker Compose (v1, v2 or none)" | ||
| }, | ||
| "azureDnsAutoDetection": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure" | ||
| }, | ||
| "dockerDefaultAddressPool": { | ||
| "type": "string", | ||
| "default": "", | ||
| "proposals": [], | ||
| "description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24" | ||
| }, | ||
| "installDockerBuildx": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Install Docker Buildx" | ||
| }, | ||
| "installDockerComposeSwitch": { | ||
| "type": "boolean", | ||
| "default": false, | ||
| "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." | ||
| }, | ||
| "disableIp6tables": { | ||
| "type": "boolean", | ||
| "default": false, | ||
| "description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)" | ||
| } | ||
| }, | ||
| "entrypoint": "/usr/local/share/docker-init.sh", | ||
| "privileged": true, | ||
| "containerEnv": { | ||
| "DOCKER_BUILDKIT": "1" | ||
| }, | ||
| "customizations": { | ||
| "vscode": { | ||
| "extensions": [ | ||
| "ms-azuretools.vscode-containers" | ||
| ], | ||
| "settings": { | ||
| "github.copilot.chat.codeGeneration.instructions": [ | ||
| { | ||
| "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." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "mounts": [ | ||
| { | ||
| "source": "dind-var-lib-docker-${devcontainerId}", | ||
| "target": "/var/lib/docker", | ||
| "type": "volume" | ||
| } | ||
| ], | ||
| "installsAfter": [ | ||
| "ghcr.io/devcontainers/features/common-utils" | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,80 +1,80 @@ | ||
| { | ||
| "id": "docker-outside-of-docker", | ||
| "version": "1.6.5", | ||
| "name": "Docker (docker-outside-of-docker)", | ||
| "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker", | ||
| "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.", | ||
| "options": { | ||
| "version": { | ||
| "type": "string", | ||
| "proposals": [ | ||
| "latest", | ||
| "none", | ||
| "20.10" | ||
| ], | ||
| "default": "latest", | ||
| "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)" | ||
| }, | ||
| "moby": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Install OSS Moby build instead of Docker CE" | ||
| }, | ||
| "mobyBuildxVersion": { | ||
| "type": "string", | ||
| "default": "latest", | ||
| "description": "Install a specific version of moby-buildx when using Moby" | ||
| }, | ||
| "dockerDashComposeVersion": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "none", | ||
| "v1", | ||
| "v2" | ||
| ], | ||
| "default": "v2", | ||
| "description": "Compose version to use for docker-compose (v1 or v2 or none)" | ||
| }, | ||
| "installDockerBuildx": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Install Docker Buildx" | ||
| }, | ||
| "installDockerComposeSwitch": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "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." | ||
| } | ||
| "id": "docker-outside-of-docker", | ||
abdurriq marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "version": "1.8.0", | ||
| "name": "Docker (docker-outside-of-docker)", | ||
| "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker", | ||
| "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.", | ||
| "options": { | ||
| "version": { | ||
| "type": "string", | ||
| "proposals": [ | ||
| "latest", | ||
| "none", | ||
| "20.10" | ||
| ], | ||
| "default": "latest", | ||
| "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)" | ||
| }, | ||
| "entrypoint": "/usr/local/share/docker-init.sh", | ||
| "customizations": { | ||
| "vscode": { | ||
| "extensions": [ | ||
| "ms-azuretools.vscode-containers" | ||
| ], | ||
| "settings": { | ||
| "github.copilot.chat.codeGeneration.instructions": [ | ||
| { | ||
| "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." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| "moby": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Install OSS Moby build instead of Docker CE" | ||
| }, | ||
| "mounts": [ | ||
| { | ||
| "source": "/var/run/docker.sock", | ||
| "target": "/var/run/docker-host.sock", | ||
| "type": "bind" | ||
| } | ||
| ], | ||
| "securityOpt": [ | ||
| "label=disable" | ||
| ], | ||
| "installsAfter": [ | ||
| "ghcr.io/devcontainers/features/common-utils" | ||
| ], | ||
| "legacyIds": [ | ||
| "docker-from-docker" | ||
| ] | ||
| "mobyBuildxVersion": { | ||
| "type": "string", | ||
| "default": "latest", | ||
| "description": "Install a specific version of moby-buildx when using Moby" | ||
| }, | ||
| "dockerDashComposeVersion": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "none", | ||
| "v1", | ||
| "v2" | ||
| ], | ||
| "default": "v2", | ||
| "description": "Compose version to use for docker-compose (v1 or v2 or none)" | ||
| }, | ||
| "installDockerBuildx": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "description": "Install Docker Buildx" | ||
| }, | ||
| "installDockerComposeSwitch": { | ||
| "type": "boolean", | ||
| "default": true, | ||
| "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." | ||
| } | ||
| }, | ||
| "entrypoint": "/usr/local/share/docker-init.sh", | ||
| "customizations": { | ||
| "vscode": { | ||
| "extensions": [ | ||
| "ms-azuretools.vscode-containers" | ||
| ], | ||
| "settings": { | ||
| "github.copilot.chat.codeGeneration.instructions": [ | ||
| { | ||
| "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." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "mounts": [ | ||
| { | ||
| "source": "/var/run/docker.sock", | ||
| "target": "/var/run/docker-host.sock", | ||
| "type": "bind" | ||
| } | ||
| ], | ||
| "securityOpt": [ | ||
| "label=disable" | ||
| ], | ||
| "installsAfter": [ | ||
| "ghcr.io/devcontainers/features/common-utils" | ||
| ], | ||
| "legacyIds": [ | ||
| "docker-from-docker" | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.