diff --git a/README.md b/README.md index fe9cfc0..8e3bda5 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,23 @@ -# 为中国用户在 Docker for Mac/Windows 中开启 Kubernetes +# Docker Desktop for Mac/Windows 开启 Kubernetes 中文 | [English](README_en.md) 说明: -* 需安装 Docker for Mac或者Docker for Windows,如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community) +* 需安装 Docker Desktop 的 Mac 或者 Windows 版本,如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community) * 当前 master 分支已经在 Docker for Mac/Windows 2.0.4.x (包含 Docker CE 19.03.0 和 Kubernetes 1.14.1) 版本测试通过 * 如果你希望使用 Docker for Mac/Windows 2.0.1.x/2.0.2.x/2.0.3.x (包含 Docker CE 18.09.1 和 Kubernetes 1.13.0) , 请使用下面命令切换 [v2.0.1.0 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v2.0.1.0) ```git checkout v2.0.1.0``` * 如果你希望使用 Docker for Mac/Windows 2.0.0.2/2.0.0.3 (包含 Docker CE 18.09.1 和 Kubernetes 1.10.11) , 请使用下面命令切换 [v2.0.0.2 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v2.0.0.2) ```git checkout v2.0.0.2``` * 如果你希望使用 18.09/18.06 版本(包含 Kubernetes 1.10.3) , 请使用下面命令切换 [18.09 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/18.09) ```git checkout 18.09``` * 如果你希望使用 18.03 版本, 请使用下面命令切换 [18.03 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/18.03) ```git checkout 18.03``` -### Docker for Mac 开启 Kubernetes + + +查看 Docker Desktop版本,Docker -> About Docker Desktop +![about](images/about.png) + + +### Docker Desktop for Mac 开启 Kubernetes 为 Docker daemon 配置 Docker Hub 的中国官方镜像加速 ```https://registry.docker-cn.com``` @@ -34,7 +40,7 @@ ![k8s](images/k8s.png) -### Docker for Windows 开启 Kubernetes +### Docker Desktop for Windows 开启 Kubernetes 为 Docker daemon 配置 Docker Hub 的中国官方镜像加速 ```https://registry.docker-cn.com``` diff --git a/README_en.md b/README_en.md index 12eb240..1f85ef6 100644 --- a/README_en.md +++ b/README_en.md @@ -1,16 +1,21 @@ -# Enable Kubernetes on Docker for Mac/Windows in China +# Enable Kubernetes on Docker Desktop for Mac/Windows in China [中文](README.md) | English NOTE: -* The master branch is tested with Docker for Mac/Windows version 2.0.4.x (with Docker 19.03.0 and Kubernetes 1.14.1). +* The master branch is tested with Docker Desktop for Mac/Windows version 2.0.4.x (with Docker CE 19.03.0 and Kubernetes 1.14.1). * If you want to use v2.0.1.0/v2.0.2.0/v2.0.3.0 (with Docker CE 18.09.1 and Kubernetes 1.13.0), please use the 18.09 branch ```git checkout v2.0.0.2``` * If you want to use v2.0.0.2/v2.0.0.3 (with Docker CE 18.09.1 and Kubernetes 1.10.11), please use the 18.09 branch ```git checkout v2.0.0.2``` * If you want to use Docker CE 18.09/18.06 (with Kubernetes 1.10.3), please use the 18.09 branch ```git checkout 18.09``` * If you want to use Docker CE 18.03, please use the 18.03 branch ```git checkout 18.03``` -### Enable Kubernetes on Docker for Mac + + +Check version of Docker Desktop,Docker -> About Docker Desktop +![about](images/about.png) + +### Enable Kubernetes on Docker Desktop for Mac Config registry mirror for Docker daemon with ```https://registry.docker-cn.com``` only if in China @@ -33,7 +38,7 @@ Enable Kubernetes in Docker for Mac, and wait a while for Kubernetes is running ![k8s](images/k8s.png) -### Enable Kubernetes on Docker for Windows +### Enable Kubernetes on Docker Desktop for Windows Config registry mirror for Docker daemon with ```https://registry.docker-cn.com``` diff --git a/images/about.png b/images/about.png new file mode 100644 index 0000000..91cad0e Binary files /dev/null and b/images/about.png differ