AF-209: Update docker and leverage it for compose command

CHANGELOG.md

@@ -17,6 +17,7 @@ The changelog is applicable from version `1.0.0` onwards.
 - APPCLI-112: Autovalidate config file when a `.schema.json` file is provided.
 - APPCLI-115: Enable automerge for dependabot PRs.
 - APPCLI-116: Set Ruff as the linter and formatter.
+- AF-209: Build the docker-compose plugin into the appcli image.
 
 ### Fixed
 

Dockerfile

@@ -10,16 +10,24 @@ FROM alpine:3.15.0 AS docker-binary-download
 
 WORKDIR /tmp
 
-# Download and extract the static docker binary
-RUN \
-    wget -q https://download.docker.com/linux/static/stable/x86_64/docker-20.10.6.tgz \
-    && tar xf docker-20.10.6.tgz
+# List required versions for docker and compose.
+ENV DOCKER_VERSION=24.0.7
+ENV DOCKER_COMPOSE_VERSION=2.23.3
+
+# Download docker and compose.
+RUN wget -q https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz \
+    && tar xf docker-${DOCKER_VERSION}.tgzv \
+    && wget -q https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 \
+    && wget -q https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64.sha256 \
+    && sha256sum -c docker-compose-linux-x86_64.sha256 \
+    && chmod +x docker-compose-linux-x86_64
 
 FROM python:3.10.2-slim-bullseye
 
 ENV LANG=C.UTF-8
 
 COPY --from=docker-binary-download /tmp/docker/docker /usr/bin
+COPY --from=docker-binary-download /tmp/docker-compose-linux-x86_64 /usr/local/lib/docker/cli-plugins/docker-compose
 
 RUN \
     # set timezone to UTC by default

appcli/orchestrators.py

@@ -788,7 +788,8 @@ def execute_compose(
         CompletedProcess: The completed process and its exit code.
     """
     docker_compose_command = [
-        "docker-compose",
+        "docker",
+        "compose",
         "--project-name",
         cli_context.get_project_name(),
     ]