Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6554 from dokku/fix-test-runs

Browse Source 
Fix issue where CI cannot install docker-buildx-plugin
This commit is contained in:
Jose Diaz-Gonzalez
2024-02-05 15:26:13 -05:00
committed by GitHub
parent 3d99ea63bd 28532a56a9
commit 2703101068
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
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 \
&& 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 \

2
contrib/images/digitalocean/in_parts/011-docker
View File

@@ -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

6
tests.mk
View File

@@ -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: