From 28532a56a979156a6dc5088c3fd7db3f17add68f Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 5 Feb 2024 14:31:29 -0500
Subject: [PATCH] tests: fix issue where CI cannot install docker-buildx-plugin

---
 Dockerfile                                      | 2 +-
 contrib/images/digitalocean/in_parts/011-docker | 2 +-
 tests.mk                                        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a3a68d5e0..38599e1e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN mkdir -p /etc/apt/keyrings \
   && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
   && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
   && apt-get update \
-  && apt-get -y --no-install-recommends install docker-ce docker-ce-cli containerd.io docker-compose-plugin \
+  && apt-get -y --no-install-recommends install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin \
   && echo "dokku dokku/hostname string $DOKKU_HOSTNAME" | debconf-set-selections \
   && echo "dokku dokku/skip_key_file boolean $DOKKU_SKIP_KEY_FILE" | debconf-set-selections \
   && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE" | debconf-set-selections \
diff --git a/contrib/images/digitalocean/in_parts/011-docker b/contrib/images/digitalocean/in_parts/011-docker
index 6bb7c6b66..efd6cbafa 100755
--- a/contrib/images/digitalocean/in_parts/011-docker
+++ b/contrib/images/digitalocean/in_parts/011-docker
@@ -30,7 +30,7 @@ EOM
 
 echo '--> Installing docker-ce'
 apt-get -y update
-apt-get -y install docker-ce docker-compose-plugin
+apt-get -y install docker-ce docker-buildx-plugin docker-compose-plugin
 
 echo '--> Enabling docker-ce'
 systemctl enable docker
diff --git a/tests.mk b/tests.mk
index 9d23ecb7f..76df2c743 100644
--- a/tests.mk
+++ b/tests.mk
@@ -43,14 +43,14 @@ else
 endif
 endif
 
-ci-dependencies: bats shellcheck xmlstarlet docker-compose-apt-repo
+ci-dependencies: bats shellcheck xmlstarlet docker-apt-repo
 
-docker-compose-apt-repo:
+docker-apt-repo:
 ifdef INSTALL_DOCKER_REPO
 	curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor --yes -o /usr/share/keyrings/docker.gpg
 	echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(shell . /etc/os-release && echo "$$VERSION_CODENAME") stable" | sudo tee /etc/apt/sources.list.d/docker.list
 	sudo apt update
-	sudo apt-get -qq -y --no-install-recommends install docker-compose-plugin
+	sudo apt-get -qq -y --no-install-recommends install docker-buildx-plugin docker-compose-plugin
 endif
 
 setup-deploy-tests: