From 0a3789e56ece69822769587828fb68b9316a8722 Mon Sep 17 00:00:00 2001 From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com> Date: Fri, 13 Dec 2024 04:39:30 +0000 Subject: [PATCH 1/2] [docker-in-docker] - issue #1202 solution - moby=false, holds configured docker-ce and docker-ce-cli version --- src/docker-in-docker/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh index c4c098ba8..906393997 100755 --- a/src/docker-in-docker/install.sh +++ b/src/docker-in-docker/install.sh @@ -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 From b55901eb98f9ce8857a5e065a867dfddc43ff675 Mon Sep 17 00:00:00 2001 From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com> Date: Fri, 13 Dec 2024 04:52:51 +0000 Subject: [PATCH 2/2] test case for scenario of issue --- .../pin_docker-ce_version_moby_false.sh | 10 ++++++++++ test/docker-in-docker/scenarios.json | 16 ++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 test/docker-in-docker/pin_docker-ce_version_moby_false.sh diff --git a/test/docker-in-docker/pin_docker-ce_version_moby_false.sh b/test/docker-in-docker/pin_docker-ce_version_moby_false.sh new file mode 100644 index 000000000..ec33d1504 --- /dev/null +++ b/test/docker-in-docker/pin_docker-ce_version_moby_false.sh @@ -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 \ No newline at end of file diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json index 699a1dd79..57681b799 100644 --- a/test/docker-in-docker/scenarios.json +++ b/test/docker-in-docker/scenarios.json @@ -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",