From 662a10aa978eb531aa3fca66359a3551a5439d7f Mon Sep 17 00:00:00 2001 From: niusmallnan Date: Wed, 7 Nov 2018 16:23:25 +0800 Subject: [PATCH 1/2] Custom the file path of system-docker logs --- .../en/installation/configuration/docker/_index.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/content/os/v1.x/en/installation/configuration/docker/_index.md b/content/os/v1.x/en/installation/configuration/docker/_index.md index 33eddaefdba..14b5953e734 100644 --- a/content/os/v1.x/en/installation/configuration/docker/_index.md +++ b/content/os/v1.x/en/installation/configuration/docker/_index.md @@ -101,6 +101,18 @@ The docker-sys bridge can be configured with system-docker args, it will take ef $ ros config set rancher.system_docker.bip 172.18.43.1/16 ``` +_Available as of v1.4_ + +The default path of system-docker logs is `/var/log/system-docker.log`. If you want to write system-docker logs to a separate partition, +such as [RANCHE_OEM partition]({{< baseurl >}}/os/v1.x/en/about/custom-partition-layout/#use-rancher-oem-partition), you can try `rancher.defaults.system_docker_logs`: + +``` +#cloud-config +rancher: + defaults: + system_docker_logs: /usr/share/ros/oem/system-docker.log +``` + ### Using a pull through registry mirror There are 3 Docker engines that can be configured to use the pull-through Docker Hub registry mirror cache: From 03490244d38086406064a0850d629038b48fc51c Mon Sep 17 00:00:00 2001 From: Denise Date: Wed, 7 Nov 2018 21:09:48 -0800 Subject: [PATCH 2/2] Update _index.md --- .../v1.x/en/installation/configuration/docker/_index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/os/v1.x/en/installation/configuration/docker/_index.md b/content/os/v1.x/en/installation/configuration/docker/_index.md index 14b5953e734..1dbd9c3e21a 100644 --- a/content/os/v1.x/en/installation/configuration/docker/_index.md +++ b/content/os/v1.x/en/installation/configuration/docker/_index.md @@ -93,7 +93,7 @@ Key | Value | Default | Description `extra_args` | List of Strings | `[]` | Arbitrary daemon arguments, appended to the generated command `environment` | List of Strings (optional) | `[]` | -_Available as of v1.4_ +_Available as of v1.4.x_ The docker-sys bridge can be configured with system-docker args, it will take effect after reboot. @@ -101,10 +101,10 @@ The docker-sys bridge can be configured with system-docker args, it will take ef $ ros config set rancher.system_docker.bip 172.18.43.1/16 ``` -_Available as of v1.4_ +_Available as of v1.4.x_ -The default path of system-docker logs is `/var/log/system-docker.log`. If you want to write system-docker logs to a separate partition, -such as [RANCHE_OEM partition]({{< baseurl >}}/os/v1.x/en/about/custom-partition-layout/#use-rancher-oem-partition), you can try `rancher.defaults.system_docker_logs`: +The default path of system-docker logs is `/var/log/system-docker.log`. If you want to write the system-docker logs to a separate partition, +e.g. [RANCHE_OEM partition]({{< baseurl >}}/os/v1.x/en/about/custom-partition-layout/#use-rancher-oem-partition), you can try `rancher.defaults.system_docker_logs`: ``` #cloud-config