summaryrefslogtreecommitdiffhomepage
path: root/test/scripts
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2025-10-01 10:12:06 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-10-01 10:12:06 +0200
commit1102f5c4ad865045afc843289094f0617b43cd9b (patch)
treeadac41fad1d29fe0b3384b12ffc8d41c53f87567 /test/scripts
parentd4438db88df86f5c45ddfc37d84b8962f24719db (diff)
parent337fc509ee628dc4bcefc2529454734dc3938de3 (diff)
downloadmullvadvpn-1102f5c4ad865045afc843289094f0617b43cd9b.tar.xz
mullvadvpn-1102f5c4ad865045afc843289094f0617b43cd9b.zip
Merge branch 'add-ubuntu2510'
Diffstat (limited to 'test/scripts')
-rw-r--r--test/scripts/ssh-setup.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/scripts/ssh-setup.sh b/test/scripts/ssh-setup.sh
index 66809407d8..2d4711f080 100644
--- a/test/scripts/ssh-setup.sh
+++ b/test/scripts/ssh-setup.sh
@@ -140,12 +140,16 @@ function install_packages_apt {
if ! which ping &>/dev/null; then
robust_apt install iputils-ping
fi
+}
+
+function install_docker {
curl -fsSL https://get.docker.com | sh
}
# Install required packages
if which apt &>/dev/null; then
install_packages_apt
+ install_docker || echo "Failed to install docker" # Be a bit lenient on this - If it fails to install, the container tests will simply fail.
elif which dnf &>/dev/null; then
dnf install -y xorg-x11-server-Xvfb wireguard-tools podman
fi