diff --git a/README.md b/README.md index a33f36cc60f3ab77954134fc0fae8394fee1e468..2d73bb7e0c2b3a5bd33c9f215b51c6df83f4bd1e 100644 --- a/README.md +++ b/README.md @@ -253,12 +253,12 @@ And here is a list for verified operating systems for references: |------------|---------------------|----------------|----------------------------- | Ubuntu | 16.04, 18.04, 20.04 | 18.09.4 | Linux 4.15, 5.0, 5.3, 5.4 | Debian | bullseye | 19.03.7 | Linux 5.4.42 -| Arch Linux | | 19.03.11 | Linux 5.4.50, 5.7.4 +| Arch Linux | rolling-release | 20.10.3 | Linux 5.4.94, 5.7.4 | CentOS | 7.6, 7.7 | 19.03.8 | Linux 3.10, 5.2.9 | Deepin | 15.11 | 18.09.6 | Linux 4.15 | Mac OS X | 10.15.5 | 19.03.8 | Darwin 19.5.0 | Windows | 10 PRO, WSL2 | 19.03.8 | MINGW64_NT-10.0-17134 -| Manjaro | | 19.03.11 | Linux 5.8.3 +| Manjaro | rolling-release | 20.10.3 | Linux 5.8.3 Welcome to take a look at [the systems running Linux Lab](https://github.com/tinyclub/linux-lab/issues/5) and share yours, for example: @@ -296,13 +296,13 @@ More docker related issues, such as download slowly, download timeout and downlo The other issues, please read the [official docker docs](https://docs.docker.com). **Notes for Ubuntu Users** - - doc/install/ubuntu-docker.md + - [doc/install/ubuntu-docker.md](doc/install/ubuntu-docker.md) **Notes for Arch Users** - - doc/install/arch-docker.md + - [doc/install/arch-docker.md](doc/install/arch-docker.md) **Notes for Manjaro Users** - - doc/install/manjaro-docker.md + - [doc/install/manjaro-docker.md](doc/install/manjaro-docker.md) **Notes for Windows Users**: diff --git a/README_zh.md b/README_zh.md index 6c3a22a5981285231ae62cf72489b4b88b78334b..156ad3ac2958d682ebca431db3d4d8013b795095 100644 --- a/README_zh.md +++ b/README_zh.md @@ -333,12 +333,12 @@ Linux Lab 是一套完备的嵌入式 Linux 开发环境,需要预留足够的 |------------|---------------------|----------------|----------------------------- | Ubuntu | 16.04, 18.04, 20.04 | 18.09.4 | Linux 4.15, 5.0, 5.3, 5.4 | Debian | bullseye | 19.03.7 | Linux 5.4.42 -| Arch Linux | | 19.03.11 | Linux 5.4.50, 5.7.4 +| Arch Linux | rolling-release | 20.10.3 | Linux 5.4.94, 5.7.4 | CentOS | 7.6, 7.7 | 19.03.8 | Linux 3.10, 5.2.9 | Deepin | 15.11 | 18.09.6 | Linux 4.15 | Mac OS X | 10.15.5 | 19.03.8 | Darwin 19.5.0 | Windows | 10 PRO, WSL2 | 19.03.8 | MINGW64_NT-10.0-17134 -| Manjaro | | 19.03.11 | Linux 5.8.3 +| Manjaro | rolling-release | 20.10.3 | Linux 5.8.3 请查看其他同学 [成功运行过 Linux Lab 的系统](https://gitee.com/tinylab/linux-lab/issues/I1FZBJ),并分享你的情况,例如: @@ -376,13 +376,13 @@ Linux Lab 是一套完备的嵌入式 Linux 开发环境,需要预留足够的 其他问题,请参考 [官方 Docker 文档](https://docs.docker.com)。 **Ubuntu 用户安装手册** - - doc/install/ubuntu-docker.md + - [doc/install/ubuntu-docker.md](doc/install/ubuntu-docker.md) **Arch 用户安装手册** - - doc/install/arch-docker.md + - [doc/install/arch-docker.md](doc/install/arch-docker.md) **Manjaro 用户安装手册** - - doc/install/manjaro-docker.md + - [doc/install/manjaro-docker.md](doc/install/manjaro-docker.md) **Windows 用户须知**: diff --git a/doc/install/arch-docker.md b/doc/install/arch-docker.md index fac424b0f83f43ed7cbdde5c997bfb589e7062ab..34f0c0446c12ad8383bff63c032271f730c3f275 100644 --- a/doc/install/arch-docker.md +++ b/doc/install/arch-docker.md @@ -48,23 +48,27 @@ ## Step 2: 启动 Docker -### Step 2.1: 开启 Docker 开机自动启动服务 +### Step 2.1: 启动 Docker 守护进程服务并启动 - 安装完成后设置 Docker 开机自动启动服务。 + $ sudo systemctl enable --now docker.socket + +### Step 2.2: 开启 Docker 开机自动启动服务并启动 - $ sudo systemctl enable docker.service + $ sudo systemctl enable --now docker.service - -### Step 2.2: 关闭 Docker 开机自动启动服务 +### Step 2.3: 关闭 Docker 开机自动启动服务 $ sudo systemctl disable docker.service - -### Step 2.3: 启动 Docker 服务 +### Step 2.4: 启动 Docker 服务 $ sudo systemctl start docker.service +### Step 2.5: 停止 Docker 服务 + $ sudo systemctl stop docker.service + + ## Step 3: 把工作用户加入 docker 组,避免使用 root 帐号工作 Pacman 方式安装好 docker 后已经自动帮我们建立了 docker 组,所以我们不需要自己添加 docker 组,只需要把当前工作用户加入 docker 组即可。 diff --git a/doc/install/manjaro-docker.md b/doc/install/manjaro-docker.md index a70ea2071f0ddbbfedf2203e7382fa6228381cc9..dabff2ae9c523e5a273acb6351ebf41c62439bee 100644 --- a/doc/install/manjaro-docker.md +++ b/doc/install/manjaro-docker.md @@ -53,23 +53,27 @@ Manjaro Linux 设置国内镜像站: ## Step 2: 启动 Docker -### Step 2.1: 开启 Docker 开机自动启动服务 +### Step 2.1: 启动 Docker 守护进程服务并启动 - 安装完成后设置 Docker 开机自动启动服务。 + $ sudo systemctl enable --now docker.socket + +### Step 2.2: 开启 Docker 开机自动启动服务并启动 - $ sudo systemctl enable docker.service + $ sudo systemctl enable --now docker.service - -### Step 2.2: 关闭 Docker 开机自动启动服务 +### Step 2.3: 关闭 Docker 开机自动启动服务 $ sudo systemctl disable docker.service - -### Step 2.3: 启动 Docker 服务 +### Step 2.4: 启动 Docker 服务 $ sudo systemctl start docker.service +### Step 2.5: 停止 Docker 服务 + $ sudo systemctl stop docker.service + + ## Step 3: 把工作用户加入 docker 组,避免使用 root 帐号工作 Pacman 方式安装好 docker 后已经自动帮我们建立了 docker 组,所以我们不需要自己添加 docker 组,只需要把当前工作用户加入 docker 组即可。