Skip to content
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.

Sign up for GitHub

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

[docker-in-docker] - issue #1202 solution - moby=false, holds configured docker-ce and docker-ce-cli version #1215

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[docker-in-docker] - issue #1202 solution - moby=false, holds configured docker-ce and docker-ce-cli version #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a3789e
[docker-in-docker] - issue #1202 solution - moby=false, holds configu…
gauravsaini04 Dec 13, 2024
b55901e
test case for scenario of issue
gauravsaini04 Dec 13, 2024
b4f3039
Merge branch 'main' into docker-in-docker_issue_#1202_solution
gauravsaini04 Dec 19, 2024
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
1 change: 1 addition & 0 deletions src/docker-in-docker/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ else
else
apt-get -y install --no-install-recommends docker-ce-cli${cli_version_suffix} docker-ce${engine_version_suffix}
# Install compose
apt-mark hold docker-ce docker-ce-cli
apt-get -y install --no-install-recommends docker-compose-plugin || echo "(*) Package docker-compose-plugin (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
fi
fi
Expand Down
10 changes: 10 additions & 0 deletions test/docker-in-docker/pin_docker-ce_version_moby_false.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

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

check "docker-ce" bash -c "docker --version"
check "docker-ce-cli" bash -c "docker version"

#report result
reportResults
16 changes: 16 additions & 0 deletions test/docker-in-docker/scenarios.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,22 @@
}
}
},
"pin_docker-ce_version_moby_false": {
"image": "mcr.microsoft.com/devcontainers/base:debian",
"features": {
"docker-in-docker": {
"version": "26.1.4",
"moby": "false",
"mobyBuildxVersion": "latest",
"dockerDashComposeVersion": "none",
"azureDnsAutoDetection": "true",
"dockerDefaultAddressPool": "",
"installDockerBuildx": "true",
"installDockerComposeSwitch": "true",
"disableIp6tables": "false"
}
}
},
// DO NOT REMOVE: This scenario is used by the docker-in-docker-stress-test workflow
"docker_with_on_create_command": {
"image": "mcr.microsoft.com/devcontainers/base:debian",
Expand Down
Loading