新增install-docker2 docker-compose安装；新增g安装脚本

Author: db-root

main.sh

@@ -12,6 +12,7 @@ show_help() {
     echo "    CheckSSL          (download)"
     echo "    install-cri-docker (download|execute)"
     echo "    install-nginx     (download|execute)"
+    echo "    install-g         (download|execute)"
     echo "    mng               (download)"
     echo "    OpenSSL           (download|execute)"
     echo "    SystemInfoMonitor (download)"
@@ -65,6 +66,9 @@ else
         "env")
             url="https://download.elisky.cn/scripts/shell/.env-template"
             ;;
+        "install-g")
+            url="https://download.elisky.cn/scripts/shell/install-gvm.sh"
+            ;;
         *)
             show_help
             exit 1

shell/install-docker2.sh

@@ -165,7 +165,8 @@ docker_daemon_install() {
     sudo sh -c 'cat > /etc/docker/daemon.json' <<EOF
 {
 	"registry-mirrors": [
-		"https://docker.eli1.top"
+		"https://docker.eli1.top",
+        "https://docker.m.daocloud.io"
 	]
 }
 EOF
@@ -193,7 +194,15 @@ main() {
     systemctl daemon-reload
     systemctl enable containerd.service --now
     systemctl enable docker.service --now
+    mkdir -p /usr/libexec/docker/cli-plugins
+    curl -Ls https://github.eli1.top/https://github.eli1.top/https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-`uname -s`-`uname -m` > /usr/libexec/docker/cli-plugins/docker-compose;chmod a+x /usr/libexec/docker/cli-plugins/docker-compose
 	# newgrp docker
+        if [ -x "$(command -v bash)" ]; then
+            source <(docker completion bash);echo "source <(docker completion bash)"  >> ${HOME}/.bashrc
+        fi
+        if [ -x "$(command -v zsh)" ]; then
+            source <(docker completion zsh);echo "source <(docker completion zsh)"  >> ${HOME}/.zshrc
+        fi
     else
         echo "Failed to download Docker ${version}."
     fi

shell/install-gvm.sh

@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+set -e
+
+function get_arch() {
+    a=$(uname -m)
+    case ${a} in
+    "x86_64" | "amd64")
+        echo "amd64"
+        ;;
+    "i386" | "i486" | "i586")
+        echo "386"
+        ;;
+    "aarch64" | "arm64")
+        echo "arm64"
+        ;;
+    "armv6l" | "armv7l")
+        echo "arm"
+        ;;
+    "s390x")
+        echo "s390x"
+        ;;
+    *)
+        echo ${NIL}
+        ;;
+    esac
+}
+
+function get_os() {
+    echo $(uname -s | awk '{print tolower($0)}')
+}
+
+function main() {
+    local release="1.7.0"
+    local os=$(get_os)
+    local arch=$(get_arch)
+    local dest_file="${HOME}/.g/downloads/g${release}.${os}-${arch}.tar.gz"
+    local url="https://github.eli1.top/https://github.com/voidint/g/releases/download/v${release}/g${release}.${os}-${arch}.tar.gz"
+
+    echo "[1/3] Downloading ${url}"
+    rm -f "${dest_file}"
+    if [ -x "$(command -v wget)" ]; then
+        wget -q -P "${HOME}/.g/downloads" "${url}"
+    else
+        curl -s -S -L --create-dirs -o "${dest_file}" "${url}"
+    fi
+
+    echo "[2/3] Install g to the ${HOME}/.g/bin"
+    mkdir -p "${HOME}/.g/bin"
+    tar -xz -f "${dest_file}" -C "${HOME}/.g/bin"
+    chmod +x "${HOME}/.g/bin/g"
+
+    echo "[3/3] Set environment variables"
+    cat >${HOME}/.g/env <<-'EOF'
+#!/bin/sh
+# g shell setup
+export GOROOT="${HOME}/.g/go"
+export PATH="${HOME}/.g/bin:${GOROOT}/bin:${GOPATH}/bin:$PATH"
+export G_MIRROR=https://golang.google.cn/dl/
+	EOF
+
+    if [ -x "$(command -v bash)" ]; then
+        cat >>${HOME}/.bashrc <<-'EOF'
+
+[ -s "${HOME}/.g/env" ] && \. "${HOME}/.g/env"  # g shell setup
+
+		EOF
+        source ${HOME}/.bashrc
+    fi
+
+    if [ -x "$(command -v zsh)" ]; then
+        cat >>${HOME}/.zshrc <<-'EOF'
+
+[ -s "${HOME}/.g/env" ] && \. "${HOME}/.g/env"  # g shell setup
+
+		EOF
+        source ${HOME}/.zshrc
+    fi
+
+    echo -e "\nTo configure your current shell, run:\nsource \"$HOME/.g/env\""
+
+    exit 0
+}
+
+main

text/AdGuardHome.yaml

@@ -72,6 +72,8 @@ dns:
   use_http3_upstreams: false
   serve_plain_dns: true
   hostsfile_enabled: true
+  pending_requests:
+    enabled: true
 tls:
   enabled: true
   server_name: dns.s.eli1.top

text/czb.txt

@@ -1,4 +1,4 @@
-# 更新时间：2025-04-16 02:30:02
+# 更新时间：2025-05-21 02:30:01
 
 # 来自https://github.eli1.top/https://raw.githubusercontent.com/BlueSkyXN/AdGuardHomeRules/master/ok.txt