8 changed files with 57 additions and 203 deletions
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@ -14,9 +14,9 @@ jobs:
      - name: Log in to Docker Hub
        uses: https://git.martin98.com/actions/login-action.git@v3
        with:
-          registry: ${{ vars.GIT_IMAGE_URL }}
-          username: ${{ vars.GIT_IMAGE_USERNAME }}
-          password: ${{ vars.GIT_IMAGE_PASSWORD }}
+          registry: ${{ vars.DOCKER_HUB }}
+          username: ${{ vars.DOCKER_USERNAME }}
+          password: ${{ vars.DOCKER_PASSWORD }}

      - name: Build and push
        uses: https://git.martin98.com/actions/build-push-action.git@v4
@ -25,5 +25,5 @@ jobs:
          platforms: linux/amd64
          push: true
          tags: |
-            git.martin98.com/martinfarm/init:latest
-            git.martin98.com/martinfarm/init:${{ github.sha }}
+            docker.martin98.com/martin_farm/init:latest
+            docker.martin98.com/martin_farm/init:${{ github.sha }}
--- a/README_k8s.md
+++ b/README_k8s.md
@ -1,9 +1,3 @@
-## k3s
-> https://docs.k3s.io/zh/quick-start
-```bash
-curl -sfL https://rancher-mirror.rancher.cn/k3s/k3s-install.sh | INSTALL_K3S_MIRROR=cn sh -
-```
-
 ## k8s 快速部署
 ```bash
 # 网段配置
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@ -6,18 +6,15 @@ x-app-config: &app-config
    - ./:/app

 services:
-  alpine:
-    <<: *app-config
-    image: alpine:latest

  debian:
    <<: *app-config
-    image: debian:latest
+    image: docker.martin98.com/library/debian:latest

  ubuntu:
    <<: *app-config
-    image: ubuntu:latest
+    image: docker.martin98.com/library/ubuntu:latest

  ubuntu-2204:
    <<: *app-config
-    image: ubuntu:22.04
+    image: docker.martin98.com/library/ubuntu:22.04
--- a/docker-install.sh
+++ b/docker-install.sh
@ -93,7 +93,7 @@ if [ -z "$CHANNEL" ]; then
 	CHANNEL=$DEFAULT_CHANNEL_VALUE
 fi

-DEFAULT_DOWNLOAD_URL="https://reg.martin98.com/repository/docker-ce/"
+DEFAULT_DOWNLOAD_URL="https://mirrors.martin98.com/repository/docker-ce/"
 #DEFAULT_DOWNLOAD_URL="https://download.docker.com"
 if [ -z "$DOWNLOAD_URL" ]; then
 	DOWNLOAD_URL=$DEFAULT_DOWNLOAD_URL
--- a/init-apt.sh
+++ b/init-apt.sh
@ -1,83 +1,52 @@
 #!/bin/bash

-# Alpine 相关处理
-handle_alpine() {
-    echo "检测到 Alpine，切换 apk 源..."
-    sed -i 's#https\?://dl-cdn.alpinelinux.org/alpine#https://reg.martin98.com/repository/alpine#g' /etc/apk/repositories
+APT_OPTIONS="-o Acquire::https::mirrors.martin98.com::Verify-Peer=false -o Acquire::https::mirrors.martin98.com::Verify-Host=false"
+lsb_dist=$(cat /etc/*release | grep ^ID= | cut -d= -f2) # ubuntu or debian?
+release=$(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) #  ubuntu(jammy oracular) debian(bookworm)....
+components=$([ "${lsb_dist=}" = "debian" ] && echo "main contrib non-free non-free-firmware" || ([ "${lsb_dist=}" = "ubuntu" ] && echo "main restricted universe multiverse"))

-    echo "安装 openntpd 和 vim..."
-    apk update
-    apk add --no-cache openntpd vim
-
-    # 启动并设置 openntpd 开机自启
-    rc-service openntpd restart
-    rc-update add openntpd default
-
-    # 配置 vim 粘贴
-    if ! grep -q "set pastetoggle=" ~/.vimrc; then
-        echo "set pastetoggle=" >> ~/.vimrc
-    fi
-}
-
-# Debian/Ubuntu 相关处理
-handle_debian_ubuntu() {
-    APT_OPTIONS="-o Acquire::https::reg.martin98.com::Verify-Peer=false -o Acquire::https::reg.martin98.com::Verify-Host=false"
-    lsb_dist=$(cat /etc/*release | grep ^ID= | cut -d= -f2) # ubuntu or debian?
-    release=$(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) #  ubuntu(jammy oracular) debian(bookworm)....
-    components=$([ "${lsb_dist=}" = "debian" ] && echo "main contrib non-free non-free-firmware" || ([ "${lsb_dist=}" = "ubuntu" ] && echo "main restricted universe multiverse"))
-
-    # 删除 DEB822 格式
-    if [ -f /etc/apt/sources.list.d/${lsb_dist}.sources ]; then
-        rm /etc/apt/sources.list.d/${lsb_dist}.sources
-    fi
-    # 配置镜像源
-    cat <<EOF > /etc/apt/sources.list
-    deb https://reg.martin98.com/repository/$lsb_dist $release $components
-    deb https://reg.martin98.com/repository/$lsb_dist $release-updates $components
-    deb https://reg.martin98.com/repository/$lsb_dist $release-backports $components
+# 删除 DEB822 格式
+if [ -f /etc/apt/sources.list.d/${lsb_dist}.sources ]; then
+  rm /etc/apt/sources.list.d/${lsb_dist}.sources
+fi
+# 配置镜像源
+cat <<EOF > /etc/apt/sources.list
+deb https://mirrors.martin98.com/repository/$lsb_dist $release $components
+deb https://mirrors.martin98.com/repository/$lsb_dist $release-updates $components
+deb https://mirrors.martin98.com/repository/$lsb_dist $release-backports $components
+deb https://mirrors.martin98.com/repository/$lsb_dist $release-security $components
 EOF

-    for RELEASE in "$@"; do
-        echo "deb https://reg.martin98.com/repository/$lsb_dist $RELEASE $components" >> /etc/apt/sources.list
-    done
+for RELEASE in "$@"; do
+    echo "deb https://mirrors.martin98.com/repository/$lsb_dist $RELEASE $components" >> /etc/apt/sources.list
+done

-    # 关闭交互式弹窗
-    echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections

-    apt update $APT_OPTIONS && apt install $APT_OPTIONS -y ca-certificates curl && update-ca-certificates
-    apt update && apt upgrade -y
+# 关闭交互式弹窗
+echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections

-    # 检查并安装 vim
-    if ! command -v vim >/dev/null 2>&1; then
-        apt install $APT_OPTIONS -y vim
-    fi
+apt update $APT_OPTIONS && apt install $APT_OPTIONS -y ca-certificates curl && update-ca-certificates
+apt update && apt upgrade -y

-    # NTP
-    # 启用阿里云 ntp
-    if pidof systemd >/dev/null 2>&1; then
-        apt install chrony -y
-        cat > /etc/chrony.conf <<EOF
+# NTP
+# 启用阿里云 ntp
+if pidof systemd >/dev/null 2>&1; then
+    apt install chrony -y
+    cat > /etc/chrony.conf <<EOF
 server ntp4.aliyun.com minpoll 4 maxpoll 10 iburst
 server ntp5.aliyun.com iburst
 driftfile /var/lib/chrony/drift
 allow 127.0.0.1
 EOF
-        timedatectl set-timezone Asia/Shanghai
-        systemctl restart chrony && systemctl enable chrony
-    else
-        echo "systemctl 不存在，跳过 chrony 的重启"
-    fi
-
-    # fix vim 粘贴
-    if ! grep -q "set pastetoggle=" ~/.vimrc; then
-        echo "set pastetoggle=" >> ~/.vimrc
-    fi
-}
-
-# 主流程
-if grep -qi 'alpine' /etc/*release; then
-    handle_alpine
-    exit 0
+    timedatectl set-timezone Asia/Shanghai
+    systemctl restart chrony && systemctl enable chrony
 else
-    handle_debian_ubuntu "$@"
+    echo "systemctl 不存在，跳过 chrony 的重启"
+fi
+
+# fix vim 粘贴
+if pidof vim >/dev/null 2>&1; then
+  if ! grep -q "set pastetoggle=" ~/.vimrc; then
+      echo "set pastetoggle=" >> ~/.vimrc
+  fi
 fi
--- a/init-docker.sh
+++ b/init-docker.sh
@ -22,22 +22,23 @@ elif command_exists docker; then
 else
  # docker
  if [ ! -f /usr/share/keyrings/docker-archive-keyring.gpg ]; then
-      curl -fsSL https://reg.martin98.com/repository/docker-ce/linux/$lsb_dist/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+      curl -fsSL https://mirrors.martin98.com/repository/docker-ce/linux/$lsb_dist/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
  fi
-  echo "deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://reg.martin98.com/repository/docker-ce/linux/$lsb_dist $release stable" > /etc/apt/sources.list.d/docker.list
+  echo "deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://mirrors.martin98.com/repository/docker-ce/linux/$lsb_dist $release stable" > /etc/apt/sources.list.d/docker.list

  curl -sSL https://git.martin98.com/MartinFarm/init/raw/branch/main/docker-install.sh | sh
-fi
-
-cat > /etc/docker/daemon.json <<EOF
+  cat > /etc/docker/daemon.json <<EOF
 {
    "registry-mirrors": [
-        "https://docker.martin98.com"
+        "https://docker.martin98.com",
+        "https://registry-docker.martin98.com",
+		    "https://registry-dockerhub.hk.martin98.com"
    ]
 }
 EOF
-if pidof systemd >/dev/null 2>&1; then
-    systemctl restart docker
-else
-    echo "systemctl 不存在，跳过 docker 重启。"
+  if pidof systemd >/dev/null 2>&1; then
+      systemctl restart docker
+  else
+      echo "systemctl 不存在，跳过 docker 重启。"
+  fi
 fi
--- a/init-git.sh
+++ b/init-git.sh
@ -5,7 +5,7 @@ if command -v git > /dev/null 2>&1; then
    echo "git 已安装，正在配置镜像源..."
    # 曾经设置过的强制取消
    git config --global --unset url."https://git-proxy.hk.martin98.com/".insteadOf
-    git config --global url."https://git.mirrors.martin98.com/https://github.com/".insteadOf "https://github.com/"
+    git config --global url."https://git-proxy.hk.martin98.com/https://github.com/".insteadOf "https://github.com/"
    echo "镜像源配置完成。"
 else
    echo "git 不存在，跳过..."
--- a/init-k3s.sh
+++ b/init-k3s.sh
@ -1,107 +0,0 @@
-#!/bin/bash
-
-curl -sSL https://git.martin98.com/MartinFarm/init/raw/branch/main/init-apt.sh | bash
-
-current_ip=$(hostname -I | awk '{print $1}')
-
-# 镜像加速
-mkdir /etc/rancher/k3s -p
-
-cat <<EOF > /etc/rancher/k3s/registries.yaml
-mirrors:
-  docker.io:
-    endpoint:
-      - https://docker.martin98.com
-  registry-1.docker.io:
-    endpoint:
-      - https://docker.martin98.com
-  registry.k8s.io:
-    endpoint:
-      - https://docker.martin98.com
-  k8s.gcr.io:
-    endpoint:
-      - https://docker.martin98.com
-  gcr.io:
-    endpoint:
-      - https://docker.martin98.com
-  ghcr.io:
-    endpoint:
-      - https://docker.martin98.com
-  quay.io:
-    endpoint:
-      - https://docker.martin98.com
-EOF
-
-# systemctl restart k3s
-
-# 安装 keepalived
-apt install -y keepalived
-
-# 检查是否为 Master-01
-if [ "$current_ip" == "$master" ]; then
-    state=MASTER
-    priority=100
-else
-    state=BACKUP
-    priority=100
-fi
-
-# 初始化 VIP
-mkdir /etc/keepalived
-cat <<EOF | sudo tee /etc/keepalived/keepalived.conf
-vrrp_instance VI_1 {
-    state $state
-    interface eth0
-    virtual_router_id 51
-    priority $priority
-    advert_int 1
-    virtual_ipaddress {
-        $vip
-    }
-}
-EOF
-
-sudo systemctl restart keepalived
-systemctl status keepalived &
-
-
-
-# 检查是否为 Master-01
-if [ "$current_ip" == "$master" ]; then
-    # 开始部署
-    curl -sfL https://rancher-mirror.rancher.cn/k3s/k3s-install.sh | INSTALL_K3S_MIRROR=cn sh -s - server \
-        --cluster-init \
-        --cluster-cidr $pod_subnet \
-        --service-cidr $service_subnet \
-        --node-external-ip=$vip_ip \
-
-
-    TOKEN=$(cat /var/lib/rancher/k3s/server/node-token)
-    cat <<EOF
------------------------------------------------------------------------------------
-初始化 master VIP[$state] $current_ip 成功
-
-export pod_subnet=$pod_subnet
-export service_subnet=$service_subnet
-export vip_ip=$vip_ip
-export vip=$vip_ip/16
-export master=$master
-export TOKEN=$TOKEN
-curl -sSL https://git.martin98.com/MartinFarm/init/raw/branch/main/init-k3s.sh | bash
-
------------------------------------------------------------------------------------
-EOF
-
-else
-    curl -sfL https://rancher-mirror.rancher.cn/k3s/k3s-install.sh | INSTALL_K3S_MIRROR=cn sh -s - server \
-      --cluster-cidr $pod_subnet \
-      --service-cidr $service_subnet \
-      --node-external-ip=$vip_ip \
-      --token $TOKEN \
-      --server https://$master:6443
-    watch kubectl get nodes
-fi
-
-
-
-