Merge branch 'main' into rootless_socket

Author: sireeshajonnalagadda

src/aws-cli/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "aws-cli",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "name": "AWS CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/aws-cli",
     "description": "Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -12,6 +12,11 @@
             ],
             "default": "latest",
             "description": "Select or enter an AWS CLI version."
+        },
+        "verbose": {
+            "type": "boolean",
+            "default": true,
+            "description": "Suppress verbose output."
         }
     },
     "customizations": {

src/aws-cli/install.sh

@@ -13,6 +13,7 @@ set -e
 rm -rf /var/lib/apt/lists/*
 
 VERSION=${VERSION:-"latest"}
+VERBOSE=${VERBOSE:-"true"}
 
 AWSCLI_GPG_KEY=FB5DB77FD5C118B80511ADA8A6310ACC4672475C
 AWSCLI_GPG_KEY_MATERIAL="-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -110,7 +111,12 @@ install() {
         exit 1
     fi
 
-    unzip "${scriptZipFile}"
+    if [ "${VERBOSE}" = "false" ]; then
+        unzip -q "${scriptZipFile}"
+    else
+        unzip "${scriptZipFile}"
+    fi
+    
     ./aws/install
 
     # kubectl bash completion

src/docker-outside-of-docker/README.md

@@ -20,7 +20,7 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 | version | Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
 | mobyBuildxVersion | Install a specific version of moby-buildx when using Moby | string | latest |
-| dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2 or none) | string | v2 |
+| dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2 or none or latest) | string | latest |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
 | installDockerComposeSwitch | Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter. | boolean | true |
 | socketPath | Path where the Docker socket is mounted inside the container. For rootless Docker, override the mount in devcontainer.json to map your host socket to this path. | string | /var/run/docker-host.sock |

src/docker-outside-of-docker/devcontainer-feature.json

@@ -1,6 +1,7 @@
 {
+
     "id": "docker-outside-of-docker",
-    "version": "1.9.0",
+    "version": "1.9.1",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
@@ -29,11 +30,12 @@
             "type": "string",
             "enum": [
                 "none",
+                "latest",
                 "v1",
                 "v2"
             ],
-            "default": "v2",
-            "description": "Compose version to use for docker-compose (v1 or v2 or none)"
+            "default": "latest",
+            "description": "Compose version to use for docker-compose (v1 or v2 or none or latest)"
         },
         "installDockerBuildx": {
             "type": "boolean",

src/docker-outside-of-docker/install.sh

@@ -10,7 +10,7 @@
 DOCKER_VERSION="${VERSION:-"latest"}"
 USE_MOBY="${MOBY:-"true"}"
 MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"latest"}"
-DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v2"}" # v1 or v2 or none
+DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"latest"}" # v1 or v2 or none or latest
 
 ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
 SOCKET_PATH="${SOCKETPATH:-"/var/run/docker-host.sock"}" # From feature option

test/docker-outside-of-docker/docker_dash_compose_latest_moby.sh

@@ -0,0 +1 @@
+docker_dash_compose_latest_no_moby.sh

test/docker-outside-of-docker/docker_dash_compose_latest_no_moby.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker compose" bash -c "docker compose version | grep -E '5.[0-9]+.[0-9]+'"
+check "docker-compose" bash -c "docker-compose --version | grep -E '5.[0-9]+.[0-9]+'"
+check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
+
+# Report result
+reportResults

test/docker-outside-of-docker/scenarios.json

@@ -203,42 +203,29 @@
         "features": {
             "docker-outside-of-docker": {
                 "moby": false
-            }
+              }
         },
         "containerUser": "vscode"
     },
-    "custom_rootless_socket_path": {
+     "docker_dash_compose_latest_moby": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
-                "moby": false,
-                "socketPath": "/custom/docker/rootless.sock"
+                "moby": true,
+                "dockerDashComposeVersion": "latest"
             }
         },
-        "mounts": [
-            {
-                "source": "/var/run/docker.sock",
-                "target": "/custom/docker/rootless.sock",
-                "type": "bind"
-            }
-        ],
         "containerUser": "vscode"
     },
-    "xdg_runtime_dir_socket": {
+    "docker_dash_compose_latest_no_moby": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": false,
-                "socketPath": "/var/run/user-docker.sock"
+                "dockerDashComposeVersion": "latest"
             }
         },
-        "mounts": [
-            {
-                "source": "/var/run/docker.sock",
-                "target": "/var/run/user-docker.sock",
-                "type": "bind"
-            }
-        ],
         "containerUser": "vscode"
     }
-}
+
+