Unverified Commit d5ef6a74 authored by Samruddhi Khandale's avatar Samruddhi Khandale Committed by GitHub

Docker-in-docker - [Bug fix] : Fix externally-managed-environment python error...

Docker-in-docker - [Bug fix] : Fix externally-managed-environment python error for "bookworm" (#833)

* Docker-in-docker - [Bug fix] : Fix externally-managed-environment python error for "bookworm"

* add comment
parent 08fb370a
{ {
"id": "docker-in-docker", "id": "docker-in-docker",
"version": "2.8.0", "version": "2.8.1",
"name": "Docker (Docker-in-Docker)", "name": "Docker (Docker-in-Docker)",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/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.", "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
......
...@@ -233,7 +233,8 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then ...@@ -233,7 +233,8 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
if [ "${target_compose_arch}" = "amd64" ]; then if [ "${target_compose_arch}" = "amd64" ]; then
target_compose_arch="x86_64" target_compose_arch="x86_64"
fi fi
if [ "${target_compose_arch}" != "x86_64" ]; then # https://github.com/devcontainers/features/issues/832
if [ "${target_compose_arch}" != "x86_64" ] && [ "${VERSION_CODENAME}" != "bookworm" ]; then
# Use pip to get a version that runs on this architecture # Use pip to get a version that runs on this architecture
check_packages python3-minimal python3-pip libffi-dev python3-venv check_packages python3-minimal python3-pip libffi-dev python3-venv
export PIPX_HOME=/usr/local/pipx export PIPX_HOME=/usr/local/pipx
......
#!/bin/bash
set -e
# Optional: Import test library
source dev-container-features-test-lib
# Definition specific tests
check "docker-buildx" bash -c "docker buildx version"
check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
check "docker-buildx" docker buildx version
check "docker-build" docker build ./
check "installs docker-compose v2 install" bash -c "type docker-compose"
check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
check "docker-compose" bash -c "docker-compose --version | grep -E '2.[0-9]+.[0-9]+'"
check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
# Report result
reportResults
...@@ -77,6 +77,16 @@ ...@@ -77,6 +77,16 @@
} }
} }
}, },
"docker_python_bookworm": {
"image": "mcr.microsoft.com/devcontainers/base:bookworm",
"features": {
"docker-in-docker": {
"moby": true,
"installDockerBuildx": true,
"dockerDashComposeVersion": "v2"
}
}
},
// DO NOT REMOVE: This scenario is used by the docker-in-docker-stress-test workflow // DO NOT REMOVE: This scenario is used by the docker-in-docker-stress-test workflow
"docker_with_on_create_command": { "docker_with_on_create_command": {
"image": "mcr.microsoft.com/devcontainers/base:debian", "image": "mcr.microsoft.com/devcontainers/base:debian",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment