Unverified Commit c31723d2 authored by Gaurav Saini's avatar Gaurav Saini Committed by GitHub

[docker-in-docker] - issue #1202 solution - moby=false, holds configured...

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

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

* test case for scenario of issue

---------
Co-authored-by: 's avatarDaniel Doyle <ddoyle2017@github.com>
parent 28b75a69
...@@ -312,6 +312,7 @@ else ...@@ -312,6 +312,7 @@ else
else else
apt-get -y install --no-install-recommends docker-ce-cli${cli_version_suffix} docker-ce${engine_version_suffix} apt-get -y install --no-install-recommends docker-ce-cli${cli_version_suffix} docker-ce${engine_version_suffix}
# Install compose # 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." 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
fi fi
......
#!/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
\ No newline at end of file
...@@ -142,6 +142,22 @@ ...@@ -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 // 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