diff --git a/.github/workflows/sync-image.yml b/.github/workflows/sync-image.yml index 840b158..c9343c8 100644 --- a/.github/workflows/sync-image.yml +++ b/.github/workflows/sync-image.yml @@ -52,7 +52,7 @@ jobs: - name: Set up crproxy run: | - wget https://github.com/DaoCloud/crproxy/releases/download/v0.13.0-alpha.154/crproxy_linux_amd64 -O /usr/local/bin/crproxy && chmod +x /usr/local/bin/crproxy + wget https://github.com/DaoCloud/crproxy/releases/download/v0.13.0-alpha.174/crproxy_linux_amd64 -O /usr/local/bin/crproxy && chmod +x /usr/local/bin/crproxy - name: Create message to queue id: get-message @@ -95,6 +95,6 @@ jobs: fi ) & - /usr/local/bin/crproxy cluster runner ${{ secrets.STORAGE_ARGS }} --user '${{ secrets.OCI_USER }}' --queue-token '${{ secrets.QUEUE_TOKEN }}' --queue-url https://queue.m.daocloud.io/apis/v1 --duration 10s --retry=3 --retry-interval=2s & + /usr/local/bin/crproxy cluster runner ${{ secrets.NEW_STORAGE_ARGS }} --user '${{ secrets.OCI_USER }}' --queue-token '${{ secrets.QUEUE_TOKEN }}' --queue-url https://queue.m.daocloud.io/apis/v1 --duration 10s --retry=3 --retry-interval=2s & wait diff --git a/.github/workflows/sync-runner.yml b/.github/workflows/sync-runner.yml index 5c6524d..33c1d6d 100644 --- a/.github/workflows/sync-runner.yml +++ b/.github/workflows/sync-runner.yml @@ -13,8 +13,8 @@ jobs: steps: - name: Set up crproxy run: | - wget https://github.com/DaoCloud/crproxy/releases/download/v0.13.0-alpha.154/crproxy_linux_amd64 -O /usr/local/bin/crproxy && chmod +x /usr/local/bin/crproxy + wget https://github.com/DaoCloud/crproxy/releases/download/v0.13.0-alpha.174/crproxy_linux_amd64 -O /usr/local/bin/crproxy && chmod +x /usr/local/bin/crproxy - name: Sync Runner run: | - /usr/local/bin/crproxy cluster runner ${{ secrets.STORAGE_ARGS }} --user '${{ secrets.OCI_USER }}' --queue-token '${{ secrets.QUEUE_TOKEN }}' --queue-url https://queue.m.daocloud.io/apis/v1 --duration 1h --retry=3 --retry-interval=2s + /usr/local/bin/crproxy cluster runner ${{ secrets.NEW_STORAGE_ARGS }} --user '${{ secrets.OCI_USER }}' --queue-token '${{ secrets.QUEUE_TOKEN }}' --queue-url https://queue.m.daocloud.io/apis/v1 --duration 1h --retry=3 --retry-interval=2s diff --git a/README.md b/README.md index 792260a..6ff39fa 100644 --- a/README.md +++ b/README.md @@ -83,26 +83,34 @@ docker.m.daocloud.io/library/busybox | docker.io | docker.m.daocloud.io | | | gcr.io | gcr.m.daocloud.io | | | ghcr.io | ghcr.m.daocloud.io | | -| k8s.gcr.io | k8s-gcr.m.daocloud.io | k8s.gcr.io 已被迁移到 registry.k8s.io | +| k8s.gcr.io | k8s-gcr.m.daocloud.io | k8s.gcr.io 已被迁移到 registry.k8s.io | | registry.k8s.io | k8s.m.daocloud.io | | | mcr.microsoft.com | mcr.m.daocloud.io | | | nvcr.io | nvcr.m.daocloud.io | | | quay.io | quay.m.daocloud.io | | +| registry.ollama.ai | ollama.m.daocloud.io | 实验内测中,[使用方法](#加速-ollama--deepseek) | ## 最佳实践 -* 通过 加速 安装 kubeadm +### 加速 Kubneretes + +#### 加速安装 kubeadm ``` bash kubeadm config images pull --image-repository k8s-gcr.m.daocloud.io ``` -* 通过 加速 安装 kind +#### 加速安装 kind ``` bash kind create cluster --name kind --image m.daocloud.io/docker.io/kindest/node:v1.22.1 ``` -* Docker 加速 +#### 加速 Containerd + +* 参考 Containerd 官方文档: [hosts.md](https://github.com/containerd/containerd/blob/main/docs/hosts.md#registry-host-namespace) +* 如果您使用 kubespray 安装 containerd, 可以配置 [`containerd_registries_mirrors`](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/CRI/containerd.md#containerd-config) + +### 加速 Docker 添加到 `/etc/docker/daemon.json` ``` json @@ -113,6 +121,40 @@ kind create cluster --name kind --image m.daocloud.io/docker.io/kindest/node:v1. } ``` +### 加速 Ollama & DeepSeek + +#### 加速安装 Ollama + +CPU: +```bash +docker run -d -v ollama:/root/.ollama -p 11434:11434 --name ollama docker.m.daocloud.io/ollama/ollama +``` + +GPU 版本: +1. 首先安装 Nvidia Container Toolkit +2. 运行以下命令启动 Ollama 容器: + +```bash +docker run -d --gpus=all -v ollama:/root/.ollama -p 11434:11434 --name ollama docker.m.daocloud.io/ollama/ollama +``` + +更多信息请参考: +* [Ollama Docker 官方文档](https://ollama.com/blog/ollama-is-now-available-as-an-official-docker-image) + +#### 加速使用 Deepseek-R1 模型(实验内测中) + +如上述步骤,在启动了ollama容器的前提下,还可以通过加速源,加速启动DeepSeek相关的模型服务 + +注:目前 Ollama 官方源的下载速度已经很快,您也可以直接使用[官方源](https://ollama.com/library/deepseek-r1:1.5b)。 + +```bash +# 使用加速源 +docker exec -it ollama ollama run ollama.m.daocloud.io/library/deepseek-r1:1.5b + +# 或直接使用官方源下载模型 +# docker exec -it ollama ollama run deepseek-r1:1.5b +``` + ## [友情链接]加速三剑客 * 镜像加速:https://github.com/DaoCloud/public-image-mirror diff --git a/allows.txt b/allows.txt index 42c56fc..1c243d6 100644 --- a/allows.txt +++ b/allows.txt @@ -33,6 +33,8 @@ docker.io/apachepulsar/* docker.io/apicurio/* docker.io/apitable/* docker.io/apolloconfig/* +docker.io/appbaseio/dejavu +docker.io/approachingai/* docker.io/appsmith/appsmith-ce docker.io/appsmith/appsmith-ee docker.io/aquasec/* @@ -63,6 +65,8 @@ docker.io/bytelang/kplayer docker.io/calciumion/new-api docker.io/calico/* docker.io/camunda/zeebe +docker.io/cars10/elasticvue +docker.io/casbin/casdoor docker.io/certbot/* docker.io/chaosbladeio/chaosblade-box docker.io/charlie0129/bupt-net-login @@ -181,6 +185,7 @@ docker.io/graylog/graylog-datanode docker.io/greenbone/* docker.io/guacamole/* docker.io/gztime/gzctf +docker.io/hacdias/webdav docker.io/hakuyyf/tensorrtx docker.io/halohub/halo docker.io/hanxi/xiaomusic @@ -242,9 +247,9 @@ docker.io/jupyterhub/* docker.io/justsong/one-api docker.io/jxxghp/* docker.io/k8scloudprovider/* +docker.io/kanidm/* docker.io/karmada/* -docker.io/kasmweb/chrome -docker.io/kasmweb/core-ubuntu-focal +docker.io/kasmweb/* docker.io/keelhq/keel docker.io/keking/kkfileview docker.io/kennethreitz/* @@ -255,6 +260,7 @@ docker.io/klakegg/hugo docker.io/koalaman/shellcheck docker.io/koenkk/zigbee2mqtt docker.io/koide3/direct_visual_lidar_calibration +docker.io/koishijs/koishi docker.io/kong/* docker.io/kserve/* docker.io/kubeedge/* @@ -269,6 +275,7 @@ docker.io/kubeskoop/* docker.io/kubesphere/* docker.io/kubespheredev/ksv-installer docker.io/kusionstack/* +docker.io/langflowai/langflow docker.io/langfuse/* docker.io/langgenius/* docker.io/langhuihui/monibuca @@ -442,6 +449,7 @@ docker.io/loggieio/loggie docker.io/longhornio/* docker.io/louislam/* docker.io/mageai/mageai +docker.io/mailserver/* docker.io/mattermost/focalboard docker.io/maxkeytop/* docker.io/menci/archlinuxarm @@ -558,6 +566,7 @@ docker.io/redash/* docker.io/redis/* docker.io/redislabs/* docker.io/redroid/redroid +docker.io/reportportal/reportportal docker.io/resmoio/kubernetes-event-exporter docker.io/ribbybibby/ssl-exporter docker.io/rockylinux/rockylinux @@ -586,6 +595,7 @@ docker.io/senthilrch/* docker.io/serengil/deepface docker.io/sickcodes/docker-osx docker.io/sj26/mailcatcher +docker.io/slskd/slskd docker.io/snowdreamtech/frpc docker.io/snowdreamtech/frps docker.io/solace/solace-pubsub-standard @@ -686,6 +696,7 @@ gcr.io/** ghcr.io/actions/** ghcr.io/advplyr/audiobookshelf ghcr.io/ajnart/homarr +ghcr.io/amamba-io/** ghcr.io/analogj/scrutiny ghcr.io/anduin2017/how-to-cook ghcr.io/apache/** @@ -731,6 +742,7 @@ ghcr.io/grafana/* ghcr.io/hassio-addons/** ghcr.io/helm/** ghcr.io/home-assistant/** +ghcr.io/huaweiclouddeveloper/** ghcr.io/huggingface/* ghcr.io/hwameistor/** ghcr.io/imagegenius/immich