Merge pull request #1846 from buildkite/triarius/docker-compose-ubuntu

Add docker compose for ubuntu docker images

Author: triarius

.buildkite/steps/build-docker-image.sh

@@ -40,6 +40,9 @@ test_docker_image() {
 
   echo "--- :hammer: Testing $image_tag has docker-compose"
   docker run --rm --entrypoint "docker-compose" "$image_tag" --version
+
+  echo "--- :hammer: Testing $image_tag has docker compose v2"
+  docker run --rm --entrypoint "docker" "$image_tag" compose version
 }
 
 push_docker_image() {

packaging/docker/ubuntu-18.04-linux/Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && add-apt-repository \
     "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
     && apt-get update \
-    && apt-get install -y --no-install-recommends docker-ce-cli \
+    && apt-get install -y --no-install-recommends docker-ce-cli docker-compose-plugin \
     && rm -rf /var/lib/apt/lists/*
 
 RUN curl -Lfs -o /sbin/tini https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini \

packaging/docker/ubuntu-20.04-linux/Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && add-apt-repository \
     "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
     && apt-get update \
-    && apt-get install -y --no-install-recommends docker-ce-cli \
+    && apt-get install -y --no-install-recommends docker-ce-cli docker-compose-plugin \
     && rm -rf /var/lib/apt/lists/*
 
 RUN curl -Lfs -o /sbin/tini https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini \