Skip to content

Commit 7e668fb

Browse files
committed
Handle possibly missing moby package in docker-outside-of-docker installation
1 parent b7b8309 commit 7e668fb

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/docker-in-docker/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ else
309309
set -e
310310

311311
if [ ${exit_code} -ne 0 ]; then
312-
err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-20.04')."
312+
err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-24.04')."
313313
exit 1
314314
fi
315315

src/docker-outside-of-docker/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ else
305305
if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
306306
buildx=(moby-buildx${buildx_version_suffix})
307307
fi
308-
apt-get -y install --no-install-recommends ${cli_package_name}${cli_version_suffix} "${buildx[@]}"
308+
apt-get -y install --no-install-recommends ${cli_package_name}${cli_version_suffix} "${buildx[@]}" || { err "It seems packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-24.04')." ; exit 1 ; }
309309
apt-get -y install --no-install-recommends moby-compose || echo "(*) Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
310310
else
311311
buildx=()

0 commit comments

Comments
 (0)