From 4fe7edb6626ade9dfa81abebfc58d69c9e176d19 Mon Sep 17 00:00:00 2001 From: taotieren Date: Thu, 4 Feb 2021 21:35:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Arch/Manjaro=20?= =?UTF-8?q?=E5=BC=80=E5=90=AF=20docker=20=E5=AE=88=E6=8A=A4=E8=BF=9B?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/install/arch-docker.md | 3 +++ doc/install/manjaro-docker.md | 3 +++ 2 files changed, 6 insertions(+) diff --git a/doc/install/arch-docker.md b/doc/install/arch-docker.md index fac424b..59ef759 100644 --- a/doc/install/arch-docker.md +++ b/doc/install/arch-docker.md @@ -64,6 +64,9 @@ $ sudo systemctl start docker.service +### Step 2.4: 启动 Docker 守护进程服务 + + $ sudo systemctl enable --now docker.socket ## Step 3: 把工作用户加入 docker 组，避免使用 root 帐号工作 diff --git a/doc/install/manjaro-docker.md b/doc/install/manjaro-docker.md index a70ea20..3c22d33 100644 --- a/doc/install/manjaro-docker.md +++ b/doc/install/manjaro-docker.md @@ -69,6 +69,9 @@ Manjaro Linux 设置国内镜像站： $ sudo systemctl start docker.service +### Step 2.4: 启动 Docker 守护进程服务 + + $ sudo systemctl enable --now docker.socket ## Step 3: 把工作用户加入 docker 组，避免使用 root 帐号工作 -- Gitee From 35d3967b80c9f9b876e498c1a5c8f5b19e9c129c Mon Sep 17 00:00:00 2001 From: taotieren Date: Thu, 4 Feb 2021 21:48:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Arch/Manjaro=20?= =?UTF-8?q?=E5=BC=80=E5=90=AF=20docker=20=E5=AE=88=E6=8A=A4=E8=BF=9B?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/install/arch-docker.md | 17 +++++++---------- doc/install/manjaro-docker.md | 17 +++++++---------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/doc/install/arch-docker.md b/doc/install/arch-docker.md index 59ef759..b9a17b9 100644 --- a/doc/install/arch-docker.md +++ b/doc/install/arch-docker.md @@ -48,25 +48,22 @@ ## Step 2: 启动 Docker -### Step 2.1: 开启 Docker 开机自动启动服务 +### Step 2.1: 启动 Docker 守护进程服务并启动 - 安装完成后设置 Docker 开机自动启动服务。 - - $ sudo systemctl enable docker.service + $ sudo systemctl enable --now docker.socket + +### Step 2.2: 开启 Docker 开机自动启动服务并启动 + $ 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.4: 启动 Docker 守护进程服务 - - $ sudo systemctl enable --now docker.socket ## Step 3: 把工作用户加入 docker 组，避免使用 root 帐号工作 diff --git a/doc/install/manjaro-docker.md b/doc/install/manjaro-docker.md index 3c22d33..1f78ecd 100644 --- a/doc/install/manjaro-docker.md +++ b/doc/install/manjaro-docker.md @@ -53,25 +53,22 @@ Manjaro Linux 设置国内镜像站： ## Step 2: 启动 Docker -### Step 2.1: 开启 Docker 开机自动启动服务 +### Step 2.1: 启动 Docker 守护进程服务并启动 - 安装完成后设置 Docker 开机自动启动服务。 - - $ sudo systemctl enable docker.service + $ sudo systemctl enable --now docker.socket + +### Step 2.2: 开启 Docker 开机自动启动服务并启动 + $ 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.4: 启动 Docker 守护进程服务 - - $ sudo systemctl enable --now docker.socket ## Step 3: 把工作用户加入 docker 组，避免使用 root 帐号工作 -- Gitee From 39e21418850692e76c3b11a59e95d44b3cc99d4b Mon Sep 17 00:00:00 2001 From: taotieren Date: Thu, 4 Feb 2021 22:09:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Arch/Manjaro=20?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=20docker=20=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/install/arch-docker.md | 4 ++++ doc/install/manjaro-docker.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/doc/install/arch-docker.md b/doc/install/arch-docker.md index b9a17b9..34f0c04 100644 --- a/doc/install/arch-docker.md +++ b/doc/install/arch-docker.md @@ -64,7 +64,11 @@ $ 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 1f78ecd..dabff2a 100644 --- a/doc/install/manjaro-docker.md +++ b/doc/install/manjaro-docker.md @@ -69,7 +69,11 @@ Manjaro Linux 设置国内镜像站： $ sudo systemctl start docker.service +### Step 2.5: 停止 Docker 服务 + $ sudo systemctl stop docker.service + + ## Step 3: 把工作用户加入 docker 组，避免使用 root 帐号工作 Pacman 方式安装好 docker 后已经自动帮我们建立了 docker 组，所以我们不需要自己添加 docker 组，只需要把当前工作用户加入 docker 组即可。 -- Gitee From a6d1f8169cfcd34ebe1d96a0137ea209844e264b Mon Sep 17 00:00:00 2001 From: taotieren Date: Thu, 4 Feb 2021 22:10:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README=20=E4=B8=AD=20D?= =?UTF-8?q?ocker=20=E6=96=87=E6=A1=A3=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- README_zh.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a33f36c..76a8212 100644 --- a/README.md +++ b/README.md @@ -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 6c3a22a..8b711dc 100644 --- a/README_zh.md +++ b/README_zh.md @@ -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 用户须知**： -- Gitee