From bf8dd29c47630ed85db2ef0524ce59bec49fd5c0 Mon Sep 17 00:00:00 2001 From: gitea-actions-bot Date: Thu, 13 Aug 2026 02:00:33 +0000 Subject: [PATCH] chore: synchronise get-docker.sh with upstream --- get-docker.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/get-docker.sh b/get-docker.sh index 11ebc7c..84733e4 100755 --- a/get-docker.sh +++ b/get-docker.sh @@ -94,12 +94,19 @@ set -e # # Note: Starting the service requires appropriate privileges to manage system services. # +# Installing docker-sbx +# +# Set the SBX environment variable to "1" to also install the docker-sbx +# package alongside the regular Docker Engine packages: +# +# $ curl -fsSL https://get.docker.com | sudo SBX=1 sh +# # ============================================================================== # Git commit from https://github.com/docker/docker-install when # the script was uploaded (Should only be modified by upload job): -SCRIPT_COMMIT_SHA="5ce20f2eef3615d08fea941eda5a109e949e8ebf" +SCRIPT_COMMIT_SHA="a23123f03978989e95d257beb9de0c5ad9da6e70" # strip "v" prefix if present VERSION="${VERSION#v}" @@ -131,6 +138,7 @@ mirror='' DRY_RUN=${DRY_RUN:-} REPO_ONLY=${REPO_ONLY:-0} NO_AUTOSTART=${NO_AUTOSTART:-0} +SBX=${SBX:-0} while [ $# -gt 0 ]; do case "$1" in --channel) @@ -549,7 +557,7 @@ do_install() { ubuntu.focal|ubuntu.bionic|ubuntu.xenial|ubuntu.trusty) deprecation_notice "$lsb_dist" "$dist_version" ;; - ubuntu.oracular|ubuntu.mantic|ubuntu.lunar|ubuntu.kinetic|ubuntu.impish|ubuntu.hirsute|ubuntu.groovy|ubuntu.eoan|ubuntu.disco|ubuntu.cosmic) + ubuntu.questing|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.*) @@ -631,6 +639,9 @@ do_install() { if version_gte "28.2"; then pkgs="$pkgs docker-model-plugin" fi + if [ "$SBX" = "1" ]; then + pkgs="$pkgs docker-sbx" + fi if ! is_dry_run; then set -x fi @@ -743,6 +754,9 @@ do_install() { if version_gte "23.0"; then pkgs="$pkgs docker-buildx-plugin docker-model-plugin" fi + if [ "$SBX" = "1" ]; then + pkgs="$pkgs docker-sbx" + fi if ! is_dry_run; then set -x fi