From 41ef7c45ccb4559a6fcf911d0163301bd3842830 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 May 2023 00:09:39 +0200 Subject: [PATCH 1/5] docs: remove boot2docker and docker-machine from glossary boot2docker is deprecated, and so is docker-machine Signed-off-by: Sebastiaan van Stijn (cherry picked from commit c246ea85172e158f44fc1703624592e2755cfc00) 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 7a269817b5ffa341c9d6f2c709ea35e364ee55f2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 May 2023 00:15:00 +0200 Subject: [PATCH 2/5] docs: remove Docker Toolbox from glossary Signed-off-by: Sebastiaan van Stijn (cherry picked from commit e4211c91ed95d85cd68dc640450c61f726f8c259) 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 405be90634ec8ae20eb9ef100be42554da03b76f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 May 2023 00:15:56 +0200 Subject: [PATCH 3/5] docs: remove AuFS from glossary The AuFS storage driver was deprecated and now removed. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit b222900520005f0b3133ae60094853929475de80) 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 From beb0330a7234066ba78c4b6005153bea8047fd8e Mon Sep 17 00:00:00 2001 From: "A. Lester Buck III" Date: Thu, 11 May 2023 17:28:20 -0500 Subject: [PATCH 4/5] Correct "ps --no-trunc" example output Signed-off-by: A. Lester Buck III (cherry picked from commit 988e37956d0b473e7db080f9dde8a57d0d7e0a1d) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/ps.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference/commandline/ps.md b/docs/reference/commandline/ps.md index c6761e971e..53b4f9cee0 100644 --- a/docs/reference/commandline/ps.md +++ b/docs/reference/commandline/ps.md @@ -32,9 +32,9 @@ Running `docker ps --no-trunc` showing 2 linked containers. ```console $ docker ps --no-trunc -CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES -4c01db0b339c ubuntu:22.04 bash 17 seconds ago Up 16 seconds 3300-3310/tcp webapp -d7886598dbe2 crosbymichael/redis:latest /redis-server --dir 33 minutes ago Up 33 minutes 6379/tcp redis,webapp/db +CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES +ca5534a51dd04bbcebe9b23ba05f389466cf0c190f1f8f182d7eea92a9671d00 ubuntu:22.04 bash 17 seconds ago Up 16 seconds 3300-3310/tcp webapp +9ca9747b233100676a48cc7806131586213fa5dab86dd1972d6a8732e3a84a4d crosbymichael/redis:latest /redis-server --dir 33 minutes ago Up 33 minutes 6379/tcp redis,webapp/db ``` ### Show both running and stopped containers (-a, --all) From 9175ffa9b24bd31512ddc9df77cd4954f97c88be Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 May 2023 01:42:17 +0200 Subject: [PATCH 5/5] man: remove devicemapper from examples Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 4c11f73dcbb28516b7c679b4a90906526b181611) Signed-off-by: Sebastiaan van Stijn --- man/src/inspect.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/man/src/inspect.md b/man/src/inspect.md index d0a2a68378..b2d048d0fc 100644 --- a/man/src/inspect.md +++ b/man/src/inspect.md @@ -80,7 +80,7 @@ To get information on a container use its ID or instance name: "LogPath": "/var/lib/docker/containers/d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47/d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47-json.log", "Name": "/adoring_wozniak", "RestartCount": 0, - "Driver": "devicemapper", + "Driver": "overlay2", "MountLabel": "", "ProcessLabel": "", "Mounts": [ @@ -89,7 +89,7 @@ To get information on a container use its ID or instance name: "Destination": "/data", "Mode": "ro,Z", "RW": false - "Propagation": "" + "Propagation": "" } ], "AppArmorProfile": "", @@ -136,12 +136,13 @@ To get information on a container use its ID or instance name: "CgroupParent": "" }, "GraphDriver": { - "Name": "devicemapper", "Data": { - "DeviceId": "5", - "DeviceName": "docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47", - "DeviceSize": "171798691840" - } + "LowerDir": "/var/lib/docker/overlay2/44b1d1f04db6b1b73a86f9a62678673bf5d16d9a6b62c13e859aa34a99cce5ea/diff:/var/lib/docker/overlay2/ef637181eb13e30e84b7382183364ed7fd7ff7be22d8bb87049e36b75fb89a86/diff:/var/lib/docker/overlay2/64fb0f850b1289cd09cbc3b077cab2c0f59a4f540c67f997b094fc3652b9b0d6/diff:/var/lib/docker/overlay2/68c4d1411addc2b2bd07e900ca3a059c9c5f9fa2607efd87d8d715a0080ed242/diff", + "MergedDir": "/var/lib/docker/overlay2/c7846fe68c6f18247ab9b8672114dde9f506bc164081a895c465716eeb10f2bc/merged", + "UpperDir": "/var/lib/docker/overlay2/c7846fe68c6f18247ab9b8672114dde9f506bc164081a895c465716eeb10f2bc/diff", + "WorkDir": "/var/lib/docker/overlay2/c7846fe68c6f18247ab9b8672114dde9f506bc164081a895c465716eeb10f2bc/work" + }, + "Name": "overlay2" }, "Config": { "Hostname": "d2cc496561d6", @@ -275,12 +276,12 @@ about the image: "Size": 186507296, "VirtualSize": 186507296, "GraphDriver": { - "Name": "devicemapper", "Data": { - "DeviceId": "3", - "DeviceName": "docker-253:1-2763198-ded7cd95e059788f2586a51c275a4f151653779d6a7f4dad77c2bd34601d94e4", - "DeviceSize": "171798691840" - } + "LowerDir": "/var/lib/docker/overlay2/44b1d1f04db6b1b73a86f9a62678673bf5d16d9a6b62c13e859aa34a99cce5ea/diff:/var/lib/docker/overlay2/ef637181eb13e30e84b7382183364ed7fd7ff7be22d8bb87049e36b75fb89a86/diff:/var/lib/docker/overlay2/64fb0f850b1289cd09cbc3b077cab2c0f59a4f540c67f997b094fc3652b9b0d6/diff:/var/lib/docker/overlay2/68c4d1411addc2b2bd07e900ca3a059c9c5f9fa2607efd87d8d715a0080ed242/diff", + "MergedDir": "/var/lib/docker/overlay2/c7846fe68c6f18247ab9b8672114dde9f506bc164081a895c465716eeb10f2bc/merged", + "UpperDir": "/var/lib/docker/overlay2/c7846fe68c6f18247ab9b8672114dde9f506bc164081a895c465716eeb10f2bc/diff", + "WorkDir": "/var/lib/docker/overlay2/c7846fe68c6f18247ab9b8672114dde9f506bc164081a895c465716eeb10f2bc/work" + }, + "Name": "overlay2" } - } - ] + }]