Skip to content

Commit 3da8a14

Browse files
committed
Refine readme info
1 parent 6e9b831 commit 3da8a14

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
1-
# 为中国用户在 Docker for Mac/Windows 中开启 Kubernetes
1+
# Docker Desktop for Mac/Windows 开启 Kubernetes
22

33
中文 | [English](README_en.md)
44

55
说明:
66

7-
* 需安装 Docker for Mac或者Docker for Windows,如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community)
7+
* 需安装 Docker Desktop 的 Mac 或者 Windows 版本,如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community)
88
* 当前 master 分支已经在 Docker for Mac/Windows 2.0.4.x (包含 Docker CE 19.03.0 和 Kubernetes 1.14.1) 版本测试通过
99
* 如果你希望使用 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```
1010
* 如果你希望使用 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```
1111
* 如果你希望使用 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```
1212
* 如果你希望使用 18.03 版本, 请使用下面命令切换 [18.03 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/18.03) ```git checkout 18.03```
1313

14-
### Docker for Mac 开启 Kubernetes
14+
15+
16+
查看 Docker Desktop版本,Docker -> About Docker Desktop
17+
![about](images/about.png)
18+
19+
20+
### Docker Desktop for Mac 开启 Kubernetes
1521

1622
为 Docker daemon 配置 Docker Hub 的中国官方镜像加速 ```https://registry.docker-cn.com```
1723

@@ -34,7 +40,7 @@
3440
![k8s](images/k8s.png)
3541

3642

37-
### Docker for Windows 开启 Kubernetes
43+
### Docker Desktop for Windows 开启 Kubernetes
3844

3945
为 Docker daemon 配置 Docker Hub 的中国官方镜像加速 ```https://registry.docker-cn.com```
4046

README_en.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
# Enable Kubernetes on Docker for Mac/Windows in China
1+
# Enable Kubernetes on Docker Desktop for Mac/Windows in China
22

33
[中文](README.md) | English
44

55
NOTE:
66

7-
* 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).
7+
* 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).
88
* 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```
99
* 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```
1010
* 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```
1111
* If you want to use Docker CE 18.03, please use the 18.03 branch ```git checkout 18.03```
1212

13-
### Enable Kubernetes on Docker for Mac
13+
14+
15+
Check version of Docker Desktop,Docker -> About Docker Desktop
16+
![about](images/about.png)
17+
18+
### Enable Kubernetes on Docker Desktop for Mac
1419

1520
Config registry mirror for Docker daemon with ```https://registry.docker-cn.com``` only if in China
1621

@@ -33,7 +38,7 @@ Enable Kubernetes in Docker for Mac, and wait a while for Kubernetes is running
3338
![k8s](images/k8s.png)
3439

3540

36-
### Enable Kubernetes on Docker for Windows
41+
### Enable Kubernetes on Docker Desktop for Windows
3742

3843
Config registry mirror for Docker daemon with ```https://registry.docker-cn.com```
3944

images/about.png

82.1 KB
Loading

0 commit comments

Comments
 (0)