From b5a7cc9887022b62924d83b8285c0199cc0de8a1 Mon Sep 17 00:00:00 2001 From: Avinash Sridharan Date: Fri, 31 Jul 2015 10:40:18 -0700 Subject: [PATCH] Re-formatted the instructions --- docs/getting-started-guides/docker.md | 32 ++++++++++++++++----------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/docs/getting-started-guides/docker.md b/docs/getting-started-guides/docker.md index c0c0fd92a46..1f6e9db7c76 100644 --- a/docs/getting-started-guides/docker.md +++ b/docs/getting-started-guides/docker.md @@ -57,22 +57,28 @@ Here's a diagram of what the final result will look like: 1. You need to have docker installed on one machine. 2. Your kernel should support memory and swap accounting. Ensure that the following configs are turned on in your linux kernel: -CONFIG_RESOURCE_COUNTERS=y + ```console -CONFIG_MEMCG=y - -CONFIG_MEMCG_SWAP=y - -CONFIG_MEMCG_SWAP_ENABLED=y - -CONFIG_MEMCG_KMEM=y -3. Enable the memory and swap accounting in ther kernel at boot as command line + CONFIG_RESOURCE_COUNTERS=y + CONFIG_MEMCG=y + CONFIG_MEMCG_SWAP=y + CONFIG_MEMCG_SWAP_ENABLED=y + CONFIG_MEMCG_KMEM=y + ``` +3. Enable the memory and swap accounting in the kernel, at boot, as command line parameters as follows: -GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1" -NOTE: The above is specifically for GRUB2. + ```console + GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1" + ``` + NOTE: The above is specifically for GRUB2. -You can check the command line parameters passed to your kenel by looking at the -output of /proc/cmdline + You can check the command line parameters passed to your kenel by looking at the + output of /proc/cmdline: + ```console + $cat /proc/cmdline + BOOT_IMAGE=/boot/vmlinuz-3.18.4-aufs root=/dev/sda5 ro cgroup_enable=memory + swapaccount=1 + ``` ### Step One: Run etcd