Skip to content

Commit e4d907d

Browse files
committed
update
1 parent 9471f1c commit e4d907d

File tree

3 files changed

+82
-83
lines changed

3 files changed

+82
-83
lines changed

_layouts/docs.html

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -73,23 +73,19 @@ <h4 class="small-hidden" style="margin: -20px 0 0 223px">{{ page.subtitle | mark
7373
<li class="nav-about"><a href="/docs/about/">About</a></li>
7474
</ul>
7575
<h5>Sponsors (<a href="https://opencollective.com/bower">become one</a>):</h5>
76-
<a rel="sponsored" href="https://www.instinctools.com/cloud-computing/"><img class="sidebar-logo" src="https://i.imgur.com/c56Di42.png" alt="*instinctools" /></a>
77-
<a rel="sponsored" href="https://420couponcodes.com/"><img class="sidebar-logo" src="https://i.imgur.com/IbhCD2k.png" alt="420couponcodes.com" /></a>
76+
<a rel="sponsored" href="https://420couponcodes.com/"><img class="sidebar-logo" src="https://i.imgur.com/IbhCD2k.png" alt="420couponcodes.com" /></a>
7877
<a rel="sponsored" href="https://www.credimaxx.de/"><img class="sidebar-logo" src="https://i.imgur.com/sf5e7KT.png" alt="credimaxx.de" /></a>
79-
<a rel="sponsored" href="https://www.ramotion.com/agency/web-design/"><img class="sidebar-logo" src="https://i.imgur.com/mQxmvRm.png" alt="Ramotion" /></a>
8078
<a rel="sponsored" href="https://www.softwaredevelopment.co.uk/"><img class="sidebar-logo" src="https://i.imgur.com/HoU15ep.png" alt="SoftwareDevelopmentUK" /></a>
81-
<a rel="sponsored" href="https://theymakedesign.com/best-web-design-companies-3ecc85b32071"><img class="sidebar-logo" src="https://i.imgur.com/kfA0vQE.png" alt="theymakedesign.com" /></a>
82-
<a rel="sponsored" href="https://www.top5credits.com/"><img class="sidebar-logo" src="https://i.imgur.com/K2EU3HD.png" alt="top5credits.com" /></a>
79+
<a rel="sponsored" href="https://www.instinctools.com/cloud-computing/"><img class="sidebar-logo" src="https://i.imgur.com/c56Di42.png" alt="*instinctools" /></a>
8380
<a rel="sponsored" href="https://www.cryptonewsz.com/"><img class="sidebar-logo" src="https://i.imgur.com/sYNDuyj.png" alt="CryptoNewsZ" /></a>
8481
<a rel="sponsored" href="https://legalbet.uk/"><img class="sidebar-logo" src="https://i.imgur.com/2qQ6Gxf.png" alt="Legalbet" /></a>
8582
<a rel="sponsored" href="https://route4me.com/"><img class="sidebar-logo" src="https://i.imgur.com/g5LeC9Q.png" alt="Route4Me Route Planner" /></a>
8683
<a rel="sponsored" href="https://www.synetec.co.uk/"><img class="sidebar-logo" src="https://i.imgur.com/FatvhBy.png" alt="Synetec" /></a>
87-
<a rel="sponsored" href="https://fitclubfinder.com/"><img class="sidebar-logo" src="https://i.imgur.com/wEp91FC.png" alt="FitclubFinder" /></a>
88-
<a rel="sponsored" href="https://sprocketdigital.co.nz/"><img class="sidebar-logo" src="https://i.imgur.com/koJsb0d.png" alt="Matthew Chalk" /></a>
8984
<a rel="sponsored" href="https://vpn-review.com/"><img class="sidebar-logo" src="https://i.imgur.com/INf1G7H.png" alt="VPN reviews 2019" /></a>
9085
<a rel="sponsored" href="https://faveable.com/"><img class="sidebar-logo" src="https://i.imgur.com/PMqdGyT.png" alt="Faveable" /></a>
9186
<a rel="sponsored" href="https://iboysoft.com"><img class="sidebar-logo" src="https://i.imgur.com/eOWcxUr.png" alt="iBoysoft" /></a>
9287
<a rel="sponsored" href="https://webpundits.in"><img class="sidebar-logo" src="https://i.imgur.com/IVgnquz.png" alt="Buy RDP online from Web Pundits" /></a>
88+
<a rel="sponsored" href="https://sprocketdigital.co.nz/"><img class="sidebar-logo" src="https://i.imgur.com/koJsb0d.png" alt="Matthew Chalk" /></a>
9389

9490
<ul class="extra-nav nav">
9591
<li><a href="https://github.com/bower/bower">
@@ -115,24 +111,18 @@ <h5>Sponsors (<a href="https://opencollective.com/bower">become one</a>):</h5>
115111
<p class="issue"><a href="https://github.com/bower/bower.github.io/issues">Help improve these docs. Open an issue or pull request.</a></p>
116112
<p>
117113
Our supporters:
118-
<a rel="sponsored" href="https://www.arkiraha.fi/">Arkiraha</a> |
119-
<a rel="sponsored" href="https://veepn.com/vpn-apps/vpn-for-chrome/">VeePN VPN</a> |
114+
<a rel="sponsored" href="https://veepn.com/vpn-apps/vpn-for-chrome/">VeePN VPN</a> |
120115
<a rel="sponsored" href="https://www.partitionwizard.com">Partition Wizard</a> |
121116
<a rel="sponsored" href="https://www.minitool.com">MiniTool</a> |
122-
<a rel="sponsored" href="http://www.metrodetroitreview.com">metrodetroitreview.com</a> |
123117
<a rel="sponsored" href="https://kafidoff.com/">Vasyl Kafidov</a> |
124118
<a rel="sponsored" href="https://www.appdrawn.com/">AppDrawn</a> |
119+
<a rel="sponsored" href="https://legalbet.uk/">Legalbet</a> |
125120
<a rel="sponsored" href="https://swiindex.com/">swiindex.com</a> |
126-
<a rel="sponsored" href="https://www.plumbingnewsandmore.com/">Plumbing News and More</a> |
127121
<a rel="sponsored" href="https://www.edwinsedibles.com">CBD Gummies</a> |
128122
<a rel="sponsored" href="https://cyberogism.com/">Cyberogism</a> |
129-
<a rel="sponsored" href="http://www.fiveguysplumbingdearborn.com">Five Guys Plumbing Dearborn</a> |
130123
<a rel="sponsored" href="https://talousapu.fi/">Talousapu.fi</a> |
131-
<a rel="sponsored" href="https://oscollective.org/">Open Source Collective</a> |
132-
<a rel="sponsored" href="https://oscollective.org/">Open Source Collective</a> |
133-
<a rel="sponsored" href="https://legalbet.uk/">Legalbet</a> |
124+
<a rel="sponsored" href="https://www.arkiraha.fi/">Arkiraha</a> |
134125
<a rel="sponsored" href="https://www.mister-auto.com/">Mister Auto</a> |
135-
<a rel="sponsored" href="https://www.richmondconcretepros.com/">Richmond Concrete</a> |
136126
<a rel="sponsored" href="https://tankpenge.dk">Per Andersen</a> |
137127
<a rel="sponsored" href="https://www.bathroomremodelingwesterville.com">Bathroom Remodeling Westerville</a> |
138128
<a rel="sponsored" href="https://www.tankcoffee.com">Tank Coffee</a> |
@@ -141,17 +131,13 @@ <h5>Sponsors (<a href="https://opencollective.com/bower">become one</a>):</h5>
141131
<a rel="sponsored" href="https://www.firesticktricks.com">Fire Stick Tricks</a> |
142132
<a rel="sponsored" href="https://www.upgrow.com/">UpGrow</a> |
143133
<a rel="sponsored" href="https://www.upgrow.com/">UpGrow</a> |
144-
<a rel="sponsored" href="https://truealtitude.shop/">True Altitude</a> |
145-
<a rel="sponsored" href="https://truealtitude.shop/">True Altitude</a> |
146-
<a rel="sponsored" href="https://www.troupon.com">Troupon</a> |
147-
<a rel="sponsored" href="https://www.troupon.com">Troupon</a> |
134+
<a rel="sponsored" href="https://bloomingtoncarpetmn.com/">Bloomington Carpet & Upholstery Cleaning</a> |
148135
<a rel="sponsored" href="https://minneapolistowingmn.com/">Minneapolis Towing</a> |
149136
<a rel="sponsored" href="https://earthweb.com/">EarthWeb</a> |
150137
<a rel="sponsored" href="https://bountii.coupons/">Bountii</a> |
151-
<a rel="sponsored" href="https://www.creditcaptain.com/">CreditCaptain – Leading AI Credit Repair Service</a> |
152138
<a rel="sponsored" href="https://www.famegear.com">Famegear</a> |
153-
<a rel="sponsored" href="https://igstan.com">Instagram Follower Tracker</a> |
154-
<a rel="sponsored" href="https://www.pakstyle.pk/">PakStyle.pk</a>
139+
<a rel="sponsored" href="https://www.pakstyle.pk/">PakStyle.pk</a> |
140+
<a rel="sponsored" href="https://uk-exchange.com/en/usdt-to-paypal.php">UK-Exchange</a>
155141
</p>
156142
</footer>
157143

install-docker.sh

Lines changed: 61 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,14 @@ set -e
8080

8181
# Git commit from https://github.com/docker/docker-install when
8282
# the script was uploaded (Should only be modified by upload job):
83-
SCRIPT_COMMIT_SHA="e5543d473431b782227f8908005543bb4389b8de"
83+
SCRIPT_COMMIT_SHA="711a0d41213afabc30b963f82c56e1442a3efe1c"
8484

8585
# strip "v" prefix if present
8686
VERSION="${VERSION#v}"
8787

8888
# The channel to install from:
8989
# * stable
9090
# * test
91-
# * edge (deprecated)
92-
# * nightly (deprecated)
9391
DEFAULT_CHANNEL_VALUE="stable"
9492
if [ -z "$CHANNEL" ]; then
9593
CHANNEL=$DEFAULT_CHANNEL_VALUE
@@ -149,10 +147,6 @@ esac
149147
case "$CHANNEL" in
150148
stable|test)
151149
;;
152-
edge|nightly)
153-
>&2 echo "DEPRECATED: the $CHANNEL channel has been deprecated and is no longer supported by this script."
154-
exit 1
155-
;;
156150
*)
157151
>&2 echo "unknown CHANNEL '$CHANNEL': use either stable or test."
158152
exit 1
@@ -174,12 +168,12 @@ command_exists() {
174168
# version_gte 23.0 // 0 (success)
175169
# version_gte 20.10 // 0 (success)
176170
# version_gte 19.03 // 0 (success)
177-
# version_gte 21.10 // 1 (fail)
171+
# version_gte 26.1 // 1 (fail)
178172
version_gte() {
179173
if [ -z "$VERSION" ]; then
180174
return 0
181175
fi
182-
eval version_compare "$VERSION" "$1"
176+
version_compare "$VERSION" "$1"
183177
}
184178

185179
# version_compare compares two version strings (either SemVer (Major.Minor.Path),
@@ -450,7 +444,7 @@ do_install() {
450444
esac
451445
;;
452446

453-
centos|rhel|sles)
447+
centos|rhel)
454448
if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
455449
dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
456450
fi
@@ -473,20 +467,23 @@ do_install() {
473467
# Print deprecation warnings for distro versions that recently reached EOL,
474468
# but may still be commonly used (especially LTS versions).
475469
case "$lsb_dist.$dist_version" in
476-
debian.stretch|debian.jessie)
470+
centos.8|centos.7|rhel.7)
471+
deprecation_notice "$lsb_dist" "$dist_version"
472+
;;
473+
debian.buster|debian.stretch|debian.jessie)
477474
deprecation_notice "$lsb_dist" "$dist_version"
478475
;;
479-
raspbian.stretch|raspbian.jessie)
476+
raspbian.buster|raspbian.stretch|raspbian.jessie)
480477
deprecation_notice "$lsb_dist" "$dist_version"
481478
;;
482-
ubuntu.xenial|ubuntu.trusty)
479+
ubuntu.bionic|ubuntu.xenial|ubuntu.trusty)
483480
deprecation_notice "$lsb_dist" "$dist_version"
484481
;;
485-
ubuntu.impish|ubuntu.hirsute|ubuntu.groovy|ubuntu.eoan|ubuntu.disco|ubuntu.cosmic)
482+
ubuntu.mantic|ubuntu.lunar|ubuntu.kinetic|ubuntu.impish|ubuntu.hirsute|ubuntu.groovy|ubuntu.eoan|ubuntu.disco|ubuntu.cosmic)
486483
deprecation_notice "$lsb_dist" "$dist_version"
487484
;;
488485
fedora.*)
489-
if [ "$dist_version" -lt 36 ]; then
486+
if [ "$dist_version" -lt 39 ]; then
490487
deprecation_notice "$lsb_dist" "$dist_version"
491488
fi
492489
;;
@@ -495,22 +492,19 @@ do_install() {
495492
# Run setup for each distro accordingly
496493
case "$lsb_dist" in
497494
ubuntu|debian|raspbian)
498-
pre_reqs="apt-transport-https ca-certificates curl"
499-
if ! command -v gpg > /dev/null; then
500-
pre_reqs="$pre_reqs gnupg"
501-
fi
502-
apt_repo="deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] $DOWNLOAD_URL/linux/$lsb_dist $dist_version $CHANNEL"
495+
pre_reqs="ca-certificates curl"
496+
apt_repo="deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] $DOWNLOAD_URL/linux/$lsb_dist $dist_version $CHANNEL"
503497
(
504498
if ! is_dry_run; then
505499
set -x
506500
fi
507-
$sh_c 'apt-get update -qq >/dev/null'
508-
$sh_c "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq $pre_reqs >/dev/null"
501+
$sh_c 'apt-get -qq update >/dev/null'
502+
$sh_c "DEBIAN_FRONTEND=noninteractive apt-get -y -qq install $pre_reqs >/dev/null"
509503
$sh_c 'install -m 0755 -d /etc/apt/keyrings'
510-
$sh_c "curl -fsSL \"$DOWNLOAD_URL/linux/$lsb_dist/gpg\" | gpg --dearmor --yes -o /etc/apt/keyrings/docker.gpg"
511-
$sh_c "chmod a+r /etc/apt/keyrings/docker.gpg"
504+
$sh_c "curl -fsSL \"$DOWNLOAD_URL/linux/$lsb_dist/gpg\" -o /etc/apt/keyrings/docker.asc"
505+
$sh_c "chmod a+r /etc/apt/keyrings/docker.asc"
512506
$sh_c "echo \"$apt_repo\" > /etc/apt/sources.list.d/docker.list"
513-
$sh_c 'apt-get update -qq >/dev/null'
507+
$sh_c 'apt-get -qq update >/dev/null'
514508
)
515509
pkg_version=""
516510
if [ -n "$VERSION" ]; then
@@ -552,50 +546,63 @@ do_install() {
552546
if ! is_dry_run; then
553547
set -x
554548
fi
555-
$sh_c "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq $pkgs >/dev/null"
549+
$sh_c "DEBIAN_FRONTEND=noninteractive apt-get -y -qq install $pkgs >/dev/null"
556550
)
557551
echo_docker_as_nonroot
558552
exit 0
559553
;;
560554
centos|fedora|rhel)
561-
if [ "$(uname -m)" != "s390x" ] && [ "$lsb_dist" = "rhel" ]; then
562-
echo "Packages for RHEL are currently only available for s390x."
563-
exit 1
564-
fi
565-
if [ "$lsb_dist" = "fedora" ]; then
566-
pkg_manager="dnf"
567-
config_manager="dnf config-manager"
568-
enable_channel_flag="--set-enabled"
569-
disable_channel_flag="--set-disabled"
570-
pre_reqs="dnf-plugins-core"
571-
pkg_suffix="fc$dist_version"
572-
else
573-
pkg_manager="yum"
574-
config_manager="yum-config-manager"
575-
enable_channel_flag="--enable"
576-
disable_channel_flag="--disable"
577-
pre_reqs="yum-utils"
578-
pkg_suffix="el"
579-
fi
580555
repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
581556
(
582557
if ! is_dry_run; then
583558
set -x
584559
fi
585-
$sh_c "$pkg_manager install -y -q $pre_reqs"
586-
$sh_c "$config_manager --add-repo $repo_file_url"
560+
if command_exists dnf5; then
561+
$sh_c "dnf -y -q --setopt=install_weak_deps=False install dnf-plugins-core"
562+
$sh_c "dnf5 config-manager addrepo --save-filename=docker-ce.repo --from-repofile='$repo_file_url'"
563+
564+
if [ "$CHANNEL" != "stable" ]; then
565+
$sh_c "dnf5 config-manager setopt \"docker-ce-*.enabled=0\""
566+
$sh_c "dnf5 config-manager setopt \"docker-ce-$CHANNEL.enabled=1\""
567+
fi
568+
$sh_c "dnf makecache"
569+
elif command_exists dnf; then
570+
$sh_c "dnf -y -q --setopt=install_weak_deps=False install dnf-plugins-core"
571+
$sh_c "dnf config-manager --add-repo $repo_file_url"
572+
573+
if [ "$CHANNEL" != "stable" ]; then
574+
$sh_c "dnf config-manager --set-disabled \"docker-ce-*\""
575+
$sh_c "dnf config-manager --set-enabled \"docker-ce-$CHANNEL\""
576+
fi
577+
$sh_c "dnf makecache"
578+
else
579+
$sh_c "yum -y -q install yum-utils"
580+
$sh_c "yum-config-manager --add-repo $repo_file_url"
587581

588-
if [ "$CHANNEL" != "stable" ]; then
589-
$sh_c "$config_manager $disable_channel_flag 'docker-ce-*'"
590-
$sh_c "$config_manager $enable_channel_flag 'docker-ce-$CHANNEL'"
582+
if [ "$CHANNEL" != "stable" ]; then
583+
$sh_c "yum-config-manager --disable \"docker-ce-*\""
584+
$sh_c "yum-config-manager --enable \"docker-ce-$CHANNEL\""
585+
fi
586+
$sh_c "yum makecache"
591587
fi
592-
$sh_c "$pkg_manager makecache"
593588
)
594589
pkg_version=""
590+
if command_exists dnf; then
591+
pkg_manager="dnf"
592+
pkg_manager_flags="-y -q --best"
593+
else
594+
pkg_manager="yum"
595+
pkg_manager_flags="-y -q"
596+
fi
595597
if [ -n "$VERSION" ]; then
596598
if is_dry_run; then
597599
echo "# WARNING: VERSION pinning is not supported in DRY_RUN"
598600
else
601+
if [ "$lsb_dist" = "fedora" ]; then
602+
pkg_suffix="fc$dist_version"
603+
else
604+
pkg_suffix="el"
605+
fi
599606
pkg_pattern="$(echo "$VERSION" | sed 's/-ce-/\\\\.ce.*/g' | sed 's/-/.*/g').*$pkg_suffix"
600607
search_command="$pkg_manager list --showduplicates docker-ce | grep '$pkg_pattern' | tail -1 | awk '{print \$2}'"
601608
pkg_version="$($sh_c "$search_command")"
@@ -635,7 +642,7 @@ do_install() {
635642
if ! is_dry_run; then
636643
set -x
637644
fi
638-
$sh_c "$pkg_manager install -y -q $pkgs"
645+
$sh_c "$pkg_manager $pkg_manager_flags install $pkgs"
639646
)
640647
echo_docker_as_nonroot
641648
exit 0
@@ -645,12 +652,6 @@ do_install() {
645652
echo "Packages for SLES are currently only available for s390x"
646653
exit 1
647654
fi
648-
if [ "$dist_version" = "15.3" ]; then
649-
sles_version="SLE_15_SP3"
650-
else
651-
sles_minor_version="${dist_version##*.}"
652-
sles_version="15.$sles_minor_version"
653-
fi
654655
repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
655656
pre_reqs="ca-certificates curl libseccomp2 awk"
656657
(
@@ -662,13 +663,13 @@ do_install() {
662663
if ! is_dry_run; then
663664
cat >&2 <<-'EOF'
664665
WARNING!!
665-
openSUSE repository (https://download.opensuse.org/repositories/security:SELinux) will be enabled now.
666+
openSUSE repository (https://download.opensuse.org/repositories/security:/SELinux) will be enabled now.
666667
Do you wish to continue?
667668
You may press Ctrl+C now to abort this script.
668669
EOF
669670
( set -x; sleep 30 )
670671
fi
671-
opensuse_repo="https://download.opensuse.org/repositories/security:SELinux/$sles_version/security:SELinux.repo"
672+
opensuse_repo="https://download.opensuse.org/repositories/security:/SELinux/openSUSE_Factory/security:SELinux.repo"
672673
$sh_c "zypper addrepo $opensuse_repo"
673674
$sh_c "zypper --gpg-auto-import-keys refresh"
674675
$sh_c "zypper lr -d"

sponsors.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,18 @@ const ignoredsupporters = ['rocketpayz', 'webton-bv', 'casinotop-com', 'upendra-
8787
const exceptions = ['digital-bank-guide', 'alex-owner']
8888

8989
const datasup = [
90+
{
91+
name: 'bloomingtoncarpetcleaning',
92+
href: 'https://bloomingtoncarpetmn.com/',
93+
text: 'Bloomington Carpet & Upholstery Cleaning'
94+
},
95+
96+
{
97+
name: 'uk-exchange',
98+
href: 'https://uk-exchange.com/en/usdt-to-paypal.php',
99+
text: 'UK-Exchange'
100+
},
101+
90102
{
91103
name: 'pakstyle',
92104
href: 'https://www.pakstyle.pk/',

0 commit comments

Comments
 (0)