From b7f48ab89ecb6a1eabb7af23542c46a3f11e1ba6 Mon Sep 17 00:00:00 2001 From: YadominJinta Date: Sun, 18 Jul 2021 01:42:11 +0800 Subject: [PATCH 1/2] add debian bullseye support Signed-off-by: YadominJinta --- install.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/install.sh b/install.sh index ac01114..4919cf1 100755 --- a/install.sh +++ b/install.sh @@ -244,6 +244,9 @@ check_forked() { fi dist_version="$(sed 's/\/.*//' /etc/debian_version | sed 's/\..*//')" case "$dist_version" in + 11) + dist_version="bullseye" + ;; 10) dist_version="buster" ;; @@ -329,6 +332,9 @@ do_install() { debian|raspbian) dist_version="$(sed 's/\/.*//' /etc/debian_version | sed 's/\..*//')" case "$dist_version" in + 11) + dist_version="bullseye" + ;; 10) dist_version="buster" ;; From 265aebf0c0c238bc1eec344a01ad6685056300a1 Mon Sep 17 00:00:00 2001 From: YadominJinta Date: Sun, 18 Jul 2021 01:49:21 +0800 Subject: [PATCH 2/2] apt-key is deprecated Co-authored-by: Sebastiaan van Stijn Signed-off-by: YadominJinta --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 4919cf1..716d78c 100755 --- a/install.sh +++ b/install.sh @@ -393,14 +393,14 @@ do_install() { if ! command -v gpg > /dev/null; then pre_reqs="$pre_reqs gnupg" fi - apt_repo="deb [arch=$(dpkg --print-architecture)] $DOWNLOAD_URL/linux/$lsb_dist $dist_version $CHANNEL" + apt_repo="deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] $DOWNLOAD_URL/linux/$lsb_dist $dist_version $CHANNEL" ( if ! is_dry_run; then set -x fi $sh_c 'apt-get update -qq >/dev/null' $sh_c "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq $pre_reqs >/dev/null" - $sh_c "curl -fsSL \"$DOWNLOAD_URL/linux/$lsb_dist/gpg\" | apt-key add -qq - >/dev/null" + $sh_c "curl -fsSL \"$DOWNLOAD_URL/linux/$lsb_dist/gpg\" | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg" $sh_c "echo \"$apt_repo\" > /etc/apt/sources.list.d/docker.list" $sh_c 'apt-get update -qq >/dev/null' )