Merge branch 'main' into fix/code_spell_1139

Author: gvatsal60

src/aws-cli/install.sh

@@ -68,7 +68,7 @@ check_packages() {
 
 export DEBIAN_FRONTEND=noninteractive
 
-check_packages curl ca-certificates gnupg2 dirmngr unzip bash-completion
+check_packages curl ca-certificates gnupg2 dirmngr unzip bash-completion less
 
 verify_aws_cli_gpg_signature() {
     local filePath=$1

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

test/aws-cli/less_installed.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+check "less is installed, pagination works !" less --version
+check "less binary installation path" which less
+check "Testing paginated output with less" ls -R / | less
+
+# Report result
+reportResults

test/aws-cli/scenarios.json

@@ -0,0 +1,8 @@
+{
+    "less_installed": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "aws-cli": {}
+        }
+    }
+}

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

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",