[docker-in-docker] - issue devcontainers#1202 solution - moby=false, …

…holds configured docker-ce and docker-ce-cli version (devcontainers#1215) * [docker-in-docker] - issue devcontainers#1202 solution - moby=false, holds configured docker-ce and docker-ce-cli version * test case for scenario of issue --------- Co-authored-by: Daniel Doyle <[email protected]>
gauravsaini04 · Jan 28, 2025 · c31723d · c31723d
1 parent 28b75a6
commit c31723d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git 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

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
@@ -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
diff --git 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",