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

[pull] master from docker:master #55

Merged
merged 6 commits into from
Oct 24, 2024
Merged

[pull] master from docker:master #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ca04bb
rootless: update test+stable versions to 27.3.0
laurazard Sep 19, 2024
d9f9777
Merge pull request #446 from laurazard/27.3.0-rootless
thaJeztah Sep 19, 2024
d17913d
rootless: update test+stable versions to 27.3.1
thaJeztah Sep 23, 2024
596f30d
Merge pull request #447 from thaJeztah/bump_rootless
laurazard Sep 23, 2024
83b23ce
"yum config-manager" to "yum-config-manager"
singhsegv Sep 24, 2024
6d51e2c
Merge pull request #448 from singhsegv/fix/yum
thaJeztah Sep 24, 2024
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
6 changes: 3 additions & 3 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,11 +584,11 @@ do_install() {
$sh_c "dnf makecache"
else
$sh_c "yum -y -q install yum-utils"
$sh_c "yum config-manager --add-repo $repo_file_url"
$sh_c "yum-config-manager --add-repo $repo_file_url"

if [ "$CHANNEL" != "stable" ]; then
$sh_c "yum config-manager --disable \"docker-ce-*\""
$sh_c "yum config-manager --enable \"docker-ce-$CHANNEL\""
$sh_c "yum-config-manager --disable \"docker-ce-*\""
$sh_c "yum-config-manager --enable \"docker-ce-$CHANNEL\""
fi
$sh_c "yum makecache"
fi
Expand Down
4 changes: 2 additions & 2 deletions rootless-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ SCRIPT_COMMIT_SHA=UNKNOWN
# This script should be run with an unprivileged user and install/setup Docker under $HOME/bin/.

# latest version available in the stable channel.
STABLE_LATEST="27.2.1"
STABLE_LATEST="27.3.1"

# latest version available in the test channel.
TEST_LATEST="27.3.0-rc.2"
TEST_LATEST="27.3.1"

# The channel to install from:
# * test
Expand Down
Loading