Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/docker-in-docker/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,10 @@ export DEBIAN_FRONTEND=noninteractive
# Fetch host/container arch.
architecture="$(dpkg --print-architecture)"

# Prevent attempting to install Moby on Debian trixie (packages removed)
# Handle moby option for Debian trixie
if [ "${USE_MOBY}" = "true" ] && [ "${ID}" = "debian" ] && [ "${VERSION_CODENAME}" = "trixie" ]; then
err "The 'moby' option is not supported on Debian 'trixie' because 'moby-cli' and related system packages have been removed from that distribution."
err "To continue, either set the feature option '\"moby\": false' or use a different base image (for example: 'debian:bookworm' or 'ubuntu-24.04')."
exit 1
echo "The 'moby' option is not supported on Debian 'trixie', hence setting moby to false"
USE_MOBY="false"
fi

# Check if distro is supported
Expand Down
12 changes: 12 additions & 0 deletions test/docker-in-docker/debian_trixie_with_moby.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

set -e

# Import test library
source dev-container-features-test-lib

# Definition specific tests
check "docker installed" bash -c "type docker"

# Report results
reportResults
12 changes: 12 additions & 0 deletions test/docker-in-docker/debian_trixie_without_moby.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

set -e

# Import test library
source dev-container-features-test-lib

# Definition specific tests
check "docker installed" bash -c "type docker"

# Report results
reportResults
18 changes: 17 additions & 1 deletion test/docker-in-docker/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,5 +177,21 @@
},
"remoteUser": "vscode",
"onCreateCommand": "docker ps && sleep 5s && docker ps"
},
"debian_trixie_without_moby": {
"image": "mcr.microsoft.com/devcontainers/base:trixie",
"features": {
"docker-in-docker": {
"moby": false
}
}
},
"debian_trixie_with_moby": {
"image": "mcr.microsoft.com/devcontainers/base:trixie",
"features": {
"docker-in-docker": {
"moby": true
}
}
}
}
}
Loading