From 0e7ae401679f07f9a0b528ec4a4cd7edb81e0632 Mon Sep 17 00:00:00 2001 From: Tim Bannister Date: Sun, 12 May 2019 13:42:10 +0100 Subject: [PATCH] Fix glossary entry for Docker (#14280) Also mention Docker Engine. Docker as a brand covers several technologies. --- content/en/docs/reference/glossary/docker.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/content/en/docs/reference/glossary/docker.md b/content/en/docs/reference/glossary/docker.md index 639f568790..fee6a7d838 100755 --- a/content/en/docs/reference/glossary/docker.md +++ b/content/en/docs/reference/glossary/docker.md @@ -1,18 +1,17 @@ --- -title: docker +title: Docker id: docker date: 2018-04-12 -full_link: /docs/reference/kubectl/docker-cli-to-kubectl/ +full_link: https://docs.docker.com/engine/ short_description: > Docker is a software technology providing operating-system-level virtualization also known as containers. -aka: +aka: tags: - fundamental --- - Docker is a software technology providing operating-system-level virtualization also known as containers. +Docker (specifically, Docker Engine) is a software technology providing operating-system-level virtualization also known as {{< glossary_tooltip text="containers" term_id="container" >}}. - - -Docker uses the resource isolation features of the Linux kernel such as cgroups and kernel namespaces, and a union-capable file system such as OverlayFS and others to allow independent "containers" to run within a single Linux instance, avoiding the overhead of starting and maintaining virtual machines (VMs). + +Docker uses the resource isolation features of the Linux kernel such as cgroups and kernel namespaces, and a union-capable file system such as OverlayFS and others to allow independent containers to run within a single Linux instance, avoiding the overhead of starting and maintaining virtual machines (VMs).