tests: fix issue where CI cannot install docker-buildx-plugin

This commit is contained in:
Jose Diaz-Gonzalez committed 2024-02-05 14:59:20 -05:00
1 parent 3d99ea63bd
commit 28532a56a9
3 files changed
+5 -5

No files matched your search

+1 -1
View File
@@ -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 \ && 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 \ && 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 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/hostname string $DOKKU_HOSTNAME" | debconf-set-selections \
&& echo "dokku dokku/skip_key_file boolean $DOKKU_SKIP_KEY_FILE" | 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 \ && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE" | debconf-set-selections \
@@ -30,7 +30,7 @@ EOM
echo '--> Installing docker-ce' echo '--> Installing docker-ce'
apt-get -y update 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' echo '--> Enabling docker-ce'
systemctl enable docker systemctl enable docker
+3 -3
View File
@@ -43,14 +43,14 @@ else
endif endif
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 ifdef INSTALL_DOCKER_REPO
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor --yes -o /usr/share/keyrings/docker.gpg 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 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 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 endif
setup-deploy-tests: setup-deploy-tests: