Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@sheerun
sheerun committed Nov 25, 2024
1 parent 9471f1c commit e4d907d
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 83 deletions.
32 changes: 9 additions & 23 deletions _layouts/docs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,19 @@ <h4 class="small-hidden" style="margin: -20px 0 0 223px">{{ page.subtitle | mark
<li class="nav-about"><a href="/docs/about/">About</a></li>
</ul>
<h5>Sponsors (<a href="https://opencollective.com/bower">become one</a>):</h5>
<a rel="sponsored" href="https://www.instinctools.com/cloud-computing/"><img class="sidebar-logo" src="https://i.imgur.com/c56Di42.png" alt="*instinctools" /></a>
<a rel="sponsored" href="https://420couponcodes.com/"><img class="sidebar-logo" src="https://i.imgur.com/IbhCD2k.png" alt="420couponcodes.com" /></a>
<a rel="sponsored" href="https://420couponcodes.com/"><img class="sidebar-logo" src="https://i.imgur.com/IbhCD2k.png" alt="420couponcodes.com" /></a>
<a rel="sponsored" href="https://www.credimaxx.de/"><img class="sidebar-logo" src="https://i.imgur.com/sf5e7KT.png" alt="credimaxx.de" /></a>
<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>
<a rel="sponsored" href="https://www.softwaredevelopment.co.uk/"><img class="sidebar-logo" src="https://i.imgur.com/HoU15ep.png" alt="SoftwareDevelopmentUK" /></a>
<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>
<a rel="sponsored" href="https://www.top5credits.com/"><img class="sidebar-logo" src="https://i.imgur.com/K2EU3HD.png" alt="top5credits.com" /></a>
<a rel="sponsored" href="https://www.instinctools.com/cloud-computing/"><img class="sidebar-logo" src="https://i.imgur.com/c56Di42.png" alt="*instinctools" /></a>
<a rel="sponsored" href="https://www.cryptonewsz.com/"><img class="sidebar-logo" src="https://i.imgur.com/sYNDuyj.png" alt="CryptoNewsZ" /></a>
<a rel="sponsored" href="https://legalbet.uk/"><img class="sidebar-logo" src="https://i.imgur.com/2qQ6Gxf.png" alt="Legalbet" /></a>
<a rel="sponsored" href="https://route4me.com/"><img class="sidebar-logo" src="https://i.imgur.com/g5LeC9Q.png" alt="Route4Me Route Planner" /></a>
<a rel="sponsored" href="https://www.synetec.co.uk/"><img class="sidebar-logo" src="https://i.imgur.com/FatvhBy.png" alt="Synetec" /></a>
<a rel="sponsored" href="https://fitclubfinder.com/"><img class="sidebar-logo" src="https://i.imgur.com/wEp91FC.png" alt="FitclubFinder" /></a>
<a rel="sponsored" href="https://sprocketdigital.co.nz/"><img class="sidebar-logo" src="https://i.imgur.com/koJsb0d.png" alt="Matthew Chalk" /></a>
<a rel="sponsored" href="https://vpn-review.com/"><img class="sidebar-logo" src="https://i.imgur.com/INf1G7H.png" alt="VPN reviews 2019" /></a>
<a rel="sponsored" href="https://faveable.com/"><img class="sidebar-logo" src="https://i.imgur.com/PMqdGyT.png" alt="Faveable" /></a>
<a rel="sponsored" href="https://iboysoft.com"><img class="sidebar-logo" src="https://i.imgur.com/eOWcxUr.png" alt="iBoysoft" /></a>
<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>
<a rel="sponsored" href="https://sprocketdigital.co.nz/"><img class="sidebar-logo" src="https://i.imgur.com/koJsb0d.png" alt="Matthew Chalk" /></a>

<ul class="extra-nav nav">
<li><a href="https://github.com/bower/bower">
Expand All @@ -115,24 +111,18 @@ <h5>Sponsors (<a href="https://opencollective.com/bower">become one</a>):</h5>
<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>
<p>
Our supporters:
<a rel="sponsored" href="https://www.arkiraha.fi/">Arkiraha</a> |
<a rel="sponsored" href="https://veepn.com/vpn-apps/vpn-for-chrome/">VeePN VPN</a> |
<a rel="sponsored" href="https://veepn.com/vpn-apps/vpn-for-chrome/">VeePN VPN</a> |
<a rel="sponsored" href="https://www.partitionwizard.com">Partition Wizard</a> |
<a rel="sponsored" href="https://www.minitool.com">MiniTool</a> |
<a rel="sponsored" href="http://www.metrodetroitreview.com">metrodetroitreview.com</a> |
<a rel="sponsored" href="https://kafidoff.com/">Vasyl Kafidov</a> |
<a rel="sponsored" href="https://www.appdrawn.com/">AppDrawn</a> |
<a rel="sponsored" href="https://legalbet.uk/">Legalbet</a> |
<a rel="sponsored" href="https://swiindex.com/">swiindex.com</a> |
<a rel="sponsored" href="https://www.plumbingnewsandmore.com/">Plumbing News and More</a> |
<a rel="sponsored" href="https://www.edwinsedibles.com">CBD Gummies</a> |
<a rel="sponsored" href="https://cyberogism.com/">Cyberogism</a> |
<a rel="sponsored" href="http://www.fiveguysplumbingdearborn.com">Five Guys Plumbing Dearborn</a> |
<a rel="sponsored" href="https://talousapu.fi/">Talousapu.fi</a> |
<a rel="sponsored" href="https://oscollective.org/">Open Source Collective</a> |
<a rel="sponsored" href="https://oscollective.org/">Open Source Collective</a> |
<a rel="sponsored" href="https://legalbet.uk/">Legalbet</a> |
<a rel="sponsored" href="https://www.arkiraha.fi/">Arkiraha</a> |
<a rel="sponsored" href="https://www.mister-auto.com/">Mister Auto</a> |
<a rel="sponsored" href="https://www.richmondconcretepros.com/">Richmond Concrete</a> |
<a rel="sponsored" href="https://tankpenge.dk">Per Andersen</a> |
<a rel="sponsored" href="https://www.bathroomremodelingwesterville.com">Bathroom Remodeling Westerville</a> |
<a rel="sponsored" href="https://www.tankcoffee.com">Tank Coffee</a> |
Expand All @@ -141,17 +131,13 @@ <h5>Sponsors (<a href="https://opencollective.com/bower">become one</a>):</h5>
<a rel="sponsored" href="https://www.firesticktricks.com">Fire Stick Tricks</a> |
<a rel="sponsored" href="https://www.upgrow.com/">UpGrow</a> |
<a rel="sponsored" href="https://www.upgrow.com/">UpGrow</a> |
<a rel="sponsored" href="https://truealtitude.shop/">True Altitude</a> |
<a rel="sponsored" href="https://truealtitude.shop/">True Altitude</a> |
<a rel="sponsored" href="https://www.troupon.com">Troupon</a> |
<a rel="sponsored" href="https://www.troupon.com">Troupon</a> |
<a rel="sponsored" href="https://bloomingtoncarpetmn.com/">Bloomington Carpet & Upholstery Cleaning</a> |
<a rel="sponsored" href="https://minneapolistowingmn.com/">Minneapolis Towing</a> |
<a rel="sponsored" href="https://earthweb.com/">EarthWeb</a> |
<a rel="sponsored" href="https://bountii.coupons/">Bountii</a> |
<a rel="sponsored" href="https://www.creditcaptain.com/">CreditCaptain – Leading AI Credit Repair Service</a> |
<a rel="sponsored" href="https://www.famegear.com">Famegear</a> |
<a rel="sponsored" href="https://igstan.com">Instagram Follower Tracker</a> |
<a rel="sponsored" href="https://www.pakstyle.pk/">PakStyle.pk</a>
<a rel="sponsored" href="https://www.pakstyle.pk/">PakStyle.pk</a> |
<a rel="sponsored" href="https://uk-exchange.com/en/usdt-to-paypal.php">UK-Exchange</a>
</p>
</footer>

Expand Down
121 changes: 61 additions & 60 deletions install-docker.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,14 @@ set -e

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

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

# The channel to install from:
# * stable
# * test
# * edge (deprecated)
# * nightly (deprecated)
DEFAULT_CHANNEL_VALUE="stable"
if [ -z "$CHANNEL" ]; then
CHANNEL=$DEFAULT_CHANNEL_VALUE
Expand Down Expand Up @@ -149,10 +147,6 @@ esac
case "$CHANNEL" in
stable|test)
;;
edge|nightly)
>&2 echo "DEPRECATED: the $CHANNEL channel has been deprecated and is no longer supported by this script."
exit 1
;;
*)
>&2 echo "unknown CHANNEL '$CHANNEL': use either stable or test."
exit 1
Expand All @@ -174,12 +168,12 @@ command_exists() {
# version_gte 23.0 // 0 (success)
# version_gte 20.10 // 0 (success)
# version_gte 19.03 // 0 (success)
# version_gte 21.10 // 1 (fail)
# version_gte 26.1 // 1 (fail)
version_gte() {
if [ -z "$VERSION" ]; then
return 0
fi
eval version_compare "$VERSION" "$1"
version_compare "$VERSION" "$1"
}

# version_compare compares two version strings (either SemVer (Major.Minor.Path),
Expand Down Expand Up @@ -450,7 +444,7 @@ do_install() {
esac
;;

centos|rhel|sles)
centos|rhel)
if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
fi
Expand All @@ -473,20 +467,23 @@ do_install() {
# Print deprecation warnings for distro versions that recently reached EOL,
# but may still be commonly used (especially LTS versions).
case "$lsb_dist.$dist_version" in
debian.stretch|debian.jessie)
centos.8|centos.7|rhel.7)
deprecation_notice "$lsb_dist" "$dist_version"
;;
debian.buster|debian.stretch|debian.jessie)
deprecation_notice "$lsb_dist" "$dist_version"
;;
raspbian.stretch|raspbian.jessie)
raspbian.buster|raspbian.stretch|raspbian.jessie)
deprecation_notice "$lsb_dist" "$dist_version"
;;
ubuntu.xenial|ubuntu.trusty)
ubuntu.bionic|ubuntu.xenial|ubuntu.trusty)
deprecation_notice "$lsb_dist" "$dist_version"
;;
ubuntu.impish|ubuntu.hirsute|ubuntu.groovy|ubuntu.eoan|ubuntu.disco|ubuntu.cosmic)
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.*)
if [ "$dist_version" -lt 36 ]; then
if [ "$dist_version" -lt 39 ]; then
deprecation_notice "$lsb_dist" "$dist_version"
fi
;;
Expand All @@ -495,22 +492,19 @@ do_install() {
# Run setup for each distro accordingly
case "$lsb_dist" in
ubuntu|debian|raspbian)
pre_reqs="apt-transport-https ca-certificates curl"
if ! command -v gpg > /dev/null; then
pre_reqs="$pre_reqs gnupg"
fi
apt_repo="deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] $DOWNLOAD_URL/linux/$lsb_dist $dist_version $CHANNEL"
pre_reqs="ca-certificates curl"
apt_repo="deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] $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 'apt-get -qq update >/dev/null'
$sh_c "DEBIAN_FRONTEND=noninteractive apt-get -y -qq install $pre_reqs >/dev/null"
$sh_c 'install -m 0755 -d /etc/apt/keyrings'
$sh_c "curl -fsSL \"$DOWNLOAD_URL/linux/$lsb_dist/gpg\" | gpg --dearmor --yes -o /etc/apt/keyrings/docker.gpg"
$sh_c "chmod a+r /etc/apt/keyrings/docker.gpg"
$sh_c "curl -fsSL \"$DOWNLOAD_URL/linux/$lsb_dist/gpg\" -o /etc/apt/keyrings/docker.asc"
$sh_c "chmod a+r /etc/apt/keyrings/docker.asc"
$sh_c "echo \"$apt_repo\" > /etc/apt/sources.list.d/docker.list"
$sh_c 'apt-get update -qq >/dev/null'
$sh_c 'apt-get -qq update >/dev/null'
)
pkg_version=""
if [ -n "$VERSION" ]; then
Expand Down Expand Up @@ -552,50 +546,63 @@ do_install() {
if ! is_dry_run; then
set -x
fi
$sh_c "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq $pkgs >/dev/null"
$sh_c "DEBIAN_FRONTEND=noninteractive apt-get -y -qq install $pkgs >/dev/null"
)
echo_docker_as_nonroot
exit 0
;;
centos|fedora|rhel)
if [ "$(uname -m)" != "s390x" ] && [ "$lsb_dist" = "rhel" ]; then
echo "Packages for RHEL are currently only available for s390x."
exit 1
fi
if [ "$lsb_dist" = "fedora" ]; then
pkg_manager="dnf"
config_manager="dnf config-manager"
enable_channel_flag="--set-enabled"
disable_channel_flag="--set-disabled"
pre_reqs="dnf-plugins-core"
pkg_suffix="fc$dist_version"
else
pkg_manager="yum"
config_manager="yum-config-manager"
enable_channel_flag="--enable"
disable_channel_flag="--disable"
pre_reqs="yum-utils"
pkg_suffix="el"
fi
repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
(
if ! is_dry_run; then
set -x
fi
$sh_c "$pkg_manager install -y -q $pre_reqs"
$sh_c "$config_manager --add-repo $repo_file_url"
if command_exists dnf5; then
$sh_c "dnf -y -q --setopt=install_weak_deps=False install dnf-plugins-core"
$sh_c "dnf5 config-manager addrepo --save-filename=docker-ce.repo --from-repofile='$repo_file_url'"

if [ "$CHANNEL" != "stable" ]; then
$sh_c "dnf5 config-manager setopt \"docker-ce-*.enabled=0\""
$sh_c "dnf5 config-manager setopt \"docker-ce-$CHANNEL.enabled=1\""
fi
$sh_c "dnf makecache"
elif command_exists dnf; then
$sh_c "dnf -y -q --setopt=install_weak_deps=False install dnf-plugins-core"
$sh_c "dnf config-manager --add-repo $repo_file_url"

if [ "$CHANNEL" != "stable" ]; then
$sh_c "dnf config-manager --set-disabled \"docker-ce-*\""
$sh_c "dnf config-manager --set-enabled \"docker-ce-$CHANNEL\""
fi
$sh_c "dnf makecache"
else
$sh_c "yum -y -q install yum-utils"
$sh_c "yum-config-manager --add-repo $repo_file_url"

if [ "$CHANNEL" != "stable" ]; then
$sh_c "$config_manager $disable_channel_flag 'docker-ce-*'"
$sh_c "$config_manager $enable_channel_flag 'docker-ce-$CHANNEL'"
if [ "$CHANNEL" != "stable" ]; then
$sh_c "yum-config-manager --disable \"docker-ce-*\""
$sh_c "yum-config-manager --enable \"docker-ce-$CHANNEL\""
fi
$sh_c "yum makecache"
fi
$sh_c "$pkg_manager makecache"
)
pkg_version=""
if command_exists dnf; then
pkg_manager="dnf"
pkg_manager_flags="-y -q --best"
else
pkg_manager="yum"
pkg_manager_flags="-y -q"
fi
if [ -n "$VERSION" ]; then
if is_dry_run; then
echo "# WARNING: VERSION pinning is not supported in DRY_RUN"
else
if [ "$lsb_dist" = "fedora" ]; then
pkg_suffix="fc$dist_version"
else
pkg_suffix="el"
fi
pkg_pattern="$(echo "$VERSION" | sed 's/-ce-/\\\\.ce.*/g' | sed 's/-/.*/g').*$pkg_suffix"
search_command="$pkg_manager list --showduplicates docker-ce | grep '$pkg_pattern' | tail -1 | awk '{print \$2}'"
pkg_version="$($sh_c "$search_command")"
Expand Down Expand Up @@ -635,7 +642,7 @@ do_install() {
if ! is_dry_run; then
set -x
fi
$sh_c "$pkg_manager install -y -q $pkgs"
$sh_c "$pkg_manager $pkg_manager_flags install $pkgs"
)
echo_docker_as_nonroot
exit 0
Expand All @@ -645,12 +652,6 @@ do_install() {
echo "Packages for SLES are currently only available for s390x"
exit 1
fi
if [ "$dist_version" = "15.3" ]; then
sles_version="SLE_15_SP3"
else
sles_minor_version="${dist_version##*.}"
sles_version="15.$sles_minor_version"
fi
repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
pre_reqs="ca-certificates curl libseccomp2 awk"
(
Expand All @@ -662,13 +663,13 @@ do_install() {
if ! is_dry_run; then
cat >&2 <<-'EOF'
WARNING!!
openSUSE repository (https://download.opensuse.org/repositories/security:SELinux) will be enabled now.
openSUSE repository (https://download.opensuse.org/repositories/security:/SELinux) will be enabled now.
Do you wish to continue?
You may press Ctrl+C now to abort this script.
EOF
( set -x; sleep 30 )
fi
opensuse_repo="https://download.opensuse.org/repositories/security:SELinux/$sles_version/security:SELinux.repo"
opensuse_repo="https://download.opensuse.org/repositories/security:/SELinux/openSUSE_Factory/security:SELinux.repo"
$sh_c "zypper addrepo $opensuse_repo"
$sh_c "zypper --gpg-auto-import-keys refresh"
$sh_c "zypper lr -d"
Expand Down
12 changes: 12 additions & 0 deletions sponsors.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,18 @@ const ignoredsupporters = ['rocketpayz', 'webton-bv', 'casinotop-com', 'upendra-
const exceptions = ['digital-bank-guide', 'alex-owner']

const datasup = [
{
name: 'bloomingtoncarpetcleaning',
href: 'https://bloomingtoncarpetmn.com/',
text: 'Bloomington Carpet & Upholstery Cleaning'
},

{
name: 'uk-exchange',
href: 'https://uk-exchange.com/en/usdt-to-paypal.php',
text: 'UK-Exchange'
},

{
name: 'pakstyle',
href: 'https://www.pakstyle.pk/',
Expand Down

0 comments on commit e4d907d

Please sign in to comment.