From 061fbae809129341a5c2a87d990c6e7040831077 Mon Sep 17 00:00:00 2001 From: Arshad Pasha Date: Mon, 19 Jan 2026 19:19:56 +0530 Subject: [PATCH] [ubuntu-slim] Add Docker Compose and Buildx plugins (#13542) Extends the existing Docker CLI installation (from #13511) with: - Docker Compose plugin (docker-compose-plugin) - Docker Buildx plugin (docker-buildx-plugin) - Corresponding tests for compose and buildx commands This provides better Docker tooling coverage while maintaining the lightweight design (no Docker daemon included). Ref: #13541 --- .../ubuntu-slim/scripts/build/install-docker-cli.sh | 13 +++++++++++-- images/ubuntu-slim/test.sh | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/images/ubuntu-slim/scripts/build/install-docker-cli.sh b/images/ubuntu-slim/scripts/build/install-docker-cli.sh index 3b0a7a869..6ec422836 100644 --- a/images/ubuntu-slim/scripts/build/install-docker-cli.sh +++ b/images/ubuntu-slim/scripts/build/install-docker-cli.sh @@ -1,7 +1,9 @@ #!/bin/bash -e ################################################################################ ## File: install-docker-cli.sh -## Desc: Install docker cli, but not the engine +## Desc: Install Docker CLI and plugins (Compose, Buildx) but not the engine. +## The Docker daemon is not included since ubuntu-slim runs as a container. +## Users can mount the host's Docker socket or use Docker-in-Docker if needed. ################################################################################ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg @@ -12,4 +14,11 @@ echo \ apt-get update -apt-get install docker-ce-cli +# Install Docker CLI components (not the daemon) +# docker-ce-cli: Docker command line interface +# docker-buildx-plugin: Build with BuildKit +# docker-compose-plugin: Docker Compose V2 +apt-get install --no-install-recommends -y \ + docker-ce-cli \ + docker-buildx-plugin \ + docker-compose-plugin diff --git a/images/ubuntu-slim/test.sh b/images/ubuntu-slim/test.sh index c97575ae7..032a4344b 100755 --- a/images/ubuntu-slim/test.sh +++ b/images/ubuntu-slim/test.sh @@ -94,6 +94,8 @@ run_test "google cloud SDK is installed" gcloud --version run_test "git lfs is installed" git lfs version run_test "powershell is installed" pwsh --version run_test "docker-cli is installed" docker --version +run_test "docker compose is installed" docker compose version +run_test "docker buildx is installed" docker buildx version # Quick check: ensure the imagedata JSON file was created during image build run_test "imagedata JSON file exists" test -f /imagegeneration/imagedata.json