diff options
Diffstat (limited to 'docs/sources/articles')
| -rw-r--r-- | docs/sources/articles/runmetrics.rst | 2 | ||||
| -rw-r--r-- | docs/sources/articles/security.rst | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/sources/articles/runmetrics.rst b/docs/sources/articles/runmetrics.rst index afb7f82e39..6b705fb737 100644 --- a/docs/sources/articles/runmetrics.rst +++ b/docs/sources/articles/runmetrics.rst @@ -63,7 +63,7 @@ For Docker containers using cgroups, the container name will be the full ID or long ID of the container. If a container shows up as ae836c95b4c3 in ``docker ps``, its long ID might be something like ``ae836c95b4c3c9e9179e0e91015512da89fdec91612f63cebae57df9a5444c79``. You -can look it up with ``docker inspect`` or ``docker ps -notrunc``. +can look it up with ``docker inspect`` or ``docker ps --no-trunc``. Putting everything together to look at the memory metrics for a Docker container, take a look at ``/sys/fs/cgroup/memory/lxc/<longid>/``. diff --git a/docs/sources/articles/security.rst b/docs/sources/articles/security.rst index 3dc5780e85..ec2ab9bffd 100644 --- a/docs/sources/articles/security.rst +++ b/docs/sources/articles/security.rst @@ -7,7 +7,7 @@ Docker Security =============== - *Adapted from* `Containers & Docker: How Secure are They? <blogsecurity>`_ + *Adapted from* `Containers & Docker: How Secure are They? <blogsecurity_>`_ There are three major areas to consider when reviewing Docker security: @@ -82,6 +82,8 @@ when some applications start to misbehave. Control Groups have been around for a while as well: the code was started in 2006, and initially merged in kernel 2.6.24. +.. _dockersecurity_daemon: + Docker Daemon Attack Surface ---------------------------- @@ -261,7 +263,7 @@ with Docker, since everything is provided by the kernel anyway. For more context and especially for comparisons with VMs and other container systems, please also see the `original blog post -<blogsecurity>`_. +<blogsecurity_>`_. .. _blogsecurity: http://blog.docker.io/2013/08/containers-docker-how-secure-are-they/ |