Merge branch 'master' into feature/daemon-start-option

Author: gajeshbhat

install.sh

@@ -85,6 +85,13 @@ set -e
 #   $ sudo sh install-docker.sh --start-daemon
 #
 # Note: This option requires appropriate privileges to manage system services.
+# --setup-repo
+#
+# Use the --setup-repo option to configure Docker's package repositories without
+# installing Docker packages. This is useful when you want to add the repository
+# but install packages separately:
+#
+#   $ sudo sh install-docker.sh --setup-repo
 #
 # ==============================================================================
 
@@ -122,6 +129,7 @@ fi
 mirror=''
 DRY_RUN=${DRY_RUN:-}
 START_DAEMON=${START_DAEMON:-}
+REPO_ONLY=${REPO_ONLY:-0}
 while [ $# -gt 0 ]; do
 	case "$1" in
 		--channel)
@@ -142,6 +150,10 @@ while [ $# -gt 0 ]; do
 			VERSION="${2#v}"
 			shift
 			;;
+		--setup-repo)
+			REPO_ONLY=1
+			shift
+			;;
 		--*)
 			echo "Illegal option $1"
 			;;
@@ -565,7 +577,7 @@ do_install() {
 		ubuntu.focal|ubuntu.bionic|ubuntu.xenial|ubuntu.trusty)
 			deprecation_notice "$lsb_dist" "$dist_version"
 			;;
-		ubuntu.mantic|ubuntu.lunar|ubuntu.kinetic|ubuntu.impish|ubuntu.hirsute|ubuntu.groovy|ubuntu.eoan|ubuntu.disco|ubuntu.cosmic)
+		ubuntu.oracular|ubuntu.mantic|ubuntu.lunar|ubuntu.kinetic|ubuntu.impish|ubuntu.hirsute|ubuntu.groovy|ubuntu.eoan|ubuntu.disco|ubuntu.cosmic)
 			deprecation_notice "$lsb_dist" "$dist_version"
 			;;
 		fedora.*)
@@ -592,6 +604,11 @@ do_install() {
 				$sh_c "echo \"$apt_repo\" > /etc/apt/sources.list.d/docker.list"
 				$sh_c 'apt-get -qq update >/dev/null'
 			)
+
+			if [ "$REPO_ONLY" = "1" ]; then
+				exit 0
+			fi
+
 			pkg_version=""
 			if [ -n "$VERSION" ]; then
 				if is_dry_run; then
@@ -684,6 +701,11 @@ do_install() {
 					$sh_c "yum makecache"
 				fi
 			)
+
+			if [ "$REPO_ONLY" = "1" ]; then
+				exit 0
+			fi
+
 			pkg_version=""
 			if command_exists dnf; then
 				pkg_manager="dnf"

rootless-install.sh

@@ -21,10 +21,10 @@ SCRIPT_COMMIT_SHA="$LOAD_SCRIPT_COMMIT_SHA"
 # 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="28.3.3"
+STABLE_LATEST="28.4.0"
 
 # latest version available in the test channel.
-TEST_LATEST="28.3.3"
+TEST_LATEST="28.4.0"
 
 # The channel to install from:
 #   * test