Skip to content

Commit 28bc4d0

Browse files
authored
Merge pull request #243 from thaJeztah/carry_241_add_bullseye
Add support for debian bullseye and deprecate apt-key (carry 241)
2 parents ef254df + 265aebf commit 28bc4d0

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

install.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@ check_forked() {
244244
fi
245245
dist_version="$(sed 's/\/.*//' /etc/debian_version | sed 's/\..*//')"
246246
case "$dist_version" in
247+
11)
248+
dist_version="bullseye"
249+
;;
247250
10)
248251
dist_version="buster"
249252
;;
@@ -329,6 +332,9 @@ do_install() {
329332
debian|raspbian)
330333
dist_version="$(sed 's/\/.*//' /etc/debian_version | sed 's/\..*//')"
331334
case "$dist_version" in
335+
11)
336+
dist_version="bullseye"
337+
;;
332338
10)
333339
dist_version="buster"
334340
;;
@@ -387,14 +393,14 @@ do_install() {
387393
if ! command -v gpg > /dev/null; then
388394
pre_reqs="$pre_reqs gnupg"
389395
fi
390-
apt_repo="deb [arch=$(dpkg --print-architecture)] $DOWNLOAD_URL/linux/$lsb_dist $dist_version $CHANNEL"
396+
apt_repo="deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] $DOWNLOAD_URL/linux/$lsb_dist $dist_version $CHANNEL"
391397
(
392398
if ! is_dry_run; then
393399
set -x
394400
fi
395401
$sh_c 'apt-get update -qq >/dev/null'
396402
$sh_c "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq $pre_reqs >/dev/null"
397-
$sh_c "curl -fsSL \"$DOWNLOAD_URL/linux/$lsb_dist/gpg\" | apt-key add -qq - >/dev/null"
403+
$sh_c "curl -fsSL \"$DOWNLOAD_URL/linux/$lsb_dist/gpg\" | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg"
398404
$sh_c "echo \"$apt_repo\" > /etc/apt/sources.list.d/docker.list"
399405
$sh_c 'apt-get update -qq >/dev/null'
400406
)

0 commit comments

Comments
 (0)