Skip to content

Commit 7b9952b

Browse files
committed
cephadm-dashboard-e2e: install docker from ubuntu's repo
- add a cleanup script to remove the docker installation. Signed-off-by: Nizamudeen A <nia@redhat.com>
1 parent 5696ce3 commit 7b9952b

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

ceph-dashboard-cephadm-e2e/build/cleanup

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,15 @@ kcli delete network ceph-dashboard -y
66
kcli delete pool ceph-dashboard -y
77
sudo rm -rf ${HOME}/.kcli
88
docker container prune -f
9+
10+
echo "Cleaning up old docker installation..."
11+
12+
sudo systemctl stop docker docker.socket containerd || true
13+
sudo apt remove -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin || true
14+
sudo apt purge -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin || true
15+
sudo rm -f /etc/apt/sources.list.d/docker.list
16+
sudo rm -f /usr/share/keyrings/docker-archive-keyring.gpg
17+
sudo apt autoremove -y
18+
sudo apt update -y
19+
920
echo "Cleanup completed."

scripts/dashboard/install-cephadm-e2e-deps.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,7 @@ sudo systemctl enable --now libvirtd
4848
DISTRO="$(lsb_release -cs)"
4949

5050
if [[ $(command -v docker) == '' ]]; then
51-
# Set up docker official repo and install docker.
52-
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
53-
echo \
54-
"deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
55-
${DISTRO} stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
56-
sudo apt update -y
57-
sudo apt install -y docker-ce docker-ce-cli containerd.io
51+
sudo apt install -y docker.io
5852
fi
5953
sudo groupadd docker || true
6054
sudo usermod -aG docker $(id -un)

0 commit comments

Comments
 (0)