From c246ea85172e158f44fc1703624592e2755cfc00 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 May 2023 00:09:39 +0200 Subject: [PATCH 1/3] docs: remove boot2docker and docker-machine from glossary boot2docker is deprecated, and so is docker-machine Signed-off-by: Sebastiaan van Stijn --- docs/reference/glossary.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/docs/reference/glossary.md b/docs/reference/glossary.md index 533b78185c..12c3370386 100644 --- a/docs/reference/glossary.md +++ b/docs/reference/glossary.md @@ -26,11 +26,6 @@ Docker supports as a storage backend. It implements the An image that has no parent is a **base image**. -## boot2docker - -[boot2docker](https://boot2docker.io/) is a lightweight Linux distribution made -specifically to run Docker containers. The boot2docker management tool for Mac and Windows was deprecated and replaced by [`docker-machine`](#machine) which you can install with the Docker Toolbox. - ## bridge In terms of generic networking, a bridge is a Link Layer device which forwards @@ -214,15 +209,6 @@ links provide a legacy interface to connect Docker containers running on the same host to each other without exposing the hosts' network ports. Use the Docker networks feature instead. -## Machine - -[Machine](https://github.com/docker/machine) is a Docker tool which -makes it really easy to create Docker hosts on your computer, on -cloud providers and inside your own data center. It creates servers, -installs Docker on them, then configures the Docker client to talk to them. - -*Also known as : docker-machine* - ## node A [node](https://docs.docker.com/engine/swarm/how-swarm-mode-works/nodes/) is a physical or virtual From e4211c91ed95d85cd68dc640450c61f726f8c259 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 May 2023 00:15:00 +0200 Subject: [PATCH 2/3] docs: remove Docker Toolbox from glossary Signed-off-by: Sebastiaan van Stijn --- docs/reference/glossary.md | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docs/reference/glossary.md b/docs/reference/glossary.md index 12c3370386..b656bae729 100644 --- a/docs/reference/glossary.md +++ b/docs/reference/glossary.md @@ -314,19 +314,6 @@ containers. ![services diagram](https://docs.docker.com/engine/swarm/images/services-diagram.png) -## Toolbox - -[Docker Toolbox](https://docs.docker.com/toolbox/overview/) is a legacy -installer for Mac and Windows users. It uses Oracle VirtualBox for -virtualization. - -For Macs running OS X El Capitan 10.11 and newer macOS releases, [Docker for -Mac](https://docs.docker.com/docker-for-mac/) is the better solution. - -For Windows 10 systems that support Microsoft Hyper-V (Professional, Enterprise -and Education), [Docker for -Windows](https://docs.docker.com/docker-for-windows/) is the better solution. - ## Union file system Union file systems implement a [union From b222900520005f0b3133ae60094853929475de80 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 May 2023 00:15:56 +0200 Subject: [PATCH 3/3] docs: remove AuFS from glossary The AuFS storage driver was deprecated and now removed. Signed-off-by: Sebastiaan van Stijn --- docs/reference/glossary.md | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/docs/reference/glossary.md b/docs/reference/glossary.md index b656bae729..e21ef64334 100644 --- a/docs/reference/glossary.md +++ b/docs/reference/glossary.md @@ -16,12 +16,6 @@ keywords: "glossary, docker, terms, definitions" A list of terms used around the Docker project. -## aufs - -aufs (advanced multi layered unification filesystem) is a Linux [filesystem](#filesystem) that -Docker supports as a storage backend. It implements the -[union mount](https://en.wikipedia.org/wiki/Union_mount) for Linux file systems. - ## base image An image that has no parent is a **base image**. @@ -178,7 +172,7 @@ and assign them locations for efficient storage and retrieval. Examples : -- Linux : ext4, aufs, btrfs, zfs +- Linux : ext4, btrfs, zfs - Windows : NTFS - macOS : HFS+ @@ -316,23 +310,16 @@ containers. ## Union file system -Union file systems implement a [union -mount](https://en.wikipedia.org/wiki/Union_mount) and operate by creating +Union file systems implement a [union mount](https://en.wikipedia.org/wiki/Union_mount) and operate by creating layers. Docker uses union file systems in conjunction with [copy-on-write](#copy-on-write) techniques to provide the building blocks for containers, making them very lightweight and fast. -For more on Docker and union file systems, see [Docker and AUFS in -practice](https://docs.docker.com/engine/userguide/storagedriver/aufs-driver/), -[Docker and Btrfs in -practice](https://docs.docker.com/engine/userguide/storagedriver/btrfs-driver/), -and [Docker and OverlayFS in -practice](https://docs.docker.com/engine/userguide/storagedriver/overlayfs-driver/) +For more on Docker and union file systems, see [OverlayFS storage driver](https://docs.docker.com/storage/storagedriver/overlayfs-driver/), +and [Btrfs storage driver](https://docs.docker.com/storage/storagedriver/btrfs-driver/). Example implementations of union file systems are -[UnionFS](https://en.wikipedia.org/wiki/UnionFS), -[AUFS](https://en.wikipedia.org/wiki/Aufs), and -[Btrfs](https://btrfs.wiki.kernel.org/index.php/Main_Page). +[UnionFS](https://en.wikipedia.org/wiki/UnionFS), and [Btrfs](https://btrfs.wiki.kernel.org/index.php/Main_Page). ## virtual machine