Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly install both containerd and Docker CLI to handle upgrades #195

Closed
wants to merge 1 commit into from
Closed

Explicitly install both containerd and Docker CLI to handle upgrades #195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,19 +391,15 @@ do_install() {
exit 1
fi
search_command="apt-cache madison 'docker-ce-cli' | grep '$pkg_pattern' | head -1 | awk '{\$1=\$1};1' | cut -d' ' -f 3"
# Don't insert an = for cli_pkg_version, we'll just include it later
cli_pkg_version="$($sh_c "$search_command")"
cli_pkg_version="=$($sh_c "$search_command")"
pkg_version="=$pkg_version"
fi
fi
(
if ! is_dry_run; then
set -x
fi
if [ -n "$cli_pkg_version" ]; then
$sh_c "apt-get install -y -qq --no-install-recommends docker-ce-cli=$cli_pkg_version >/dev/null"
fi
$sh_c "apt-get install -y -qq --no-install-recommends docker-ce$pkg_version >/dev/null"
$sh_c "apt-get install -y -qq --no-install-recommends docker-ce-cli$cli_pkg_version containerd.io docker-ce$pkg_version >/dev/null"
)
echo_docker_as_nonroot
exit 0
Expand Down Expand Up @@ -460,7 +456,7 @@ do_install() {
fi
search_command="$pkg_manager list --showduplicates 'docker-ce-cli' | grep '$pkg_pattern' | tail -1 | awk '{print \$2}'"
# It's okay for cli_pkg_version to be blank, since older versions don't support a cli package
cli_pkg_version="$($sh_c "$search_command" | cut -d':' -f 2)"
cli_pkg_version="-$($sh_c "$search_command" | cut -d':' -f 2)"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this probably breaks installing older versions

# Cut out the epoch and prefix with a '-'
pkg_version="-$(echo "$pkg_version" | cut -d':' -f 2)"
fi
Expand All @@ -469,11 +465,7 @@ do_install() {
if ! is_dry_run; then
set -x
fi
# install the correct cli version first
if [ -n "$cli_pkg_version" ]; then
$sh_c "$pkg_manager install -y -q docker-ce-cli-$cli_pkg_version"
fi
$sh_c "$pkg_manager install -y -q docker-ce$pkg_version"
$sh_c "$pkg_manager install -y -q docker-ce-cli$cli_pkg_version containerd.io docker-ce$pkg_version"
)
echo_docker_as_nonroot
exit 0
Expand Down