mirror of https://github.com/docker/cli.git
Merge pull request #4308 from thaJeztah/24.0_backport_docs_fixes
This commit is contained in:
Sebastiaan van Stijn
GitHub
commit
aa40216965
|
|
@ -33,8 +33,8 @@ Running `docker ps --no-trunc` showing 2 linked containers.
|
|||
$ 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
|
||||
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
|
||||
```
|
||||
|
||||
### <a name="all"></a> Show both running and stopped containers (-a, --all)
|
||||
|
|
|
|||
|
|
@ -16,21 +16,10 @@ 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**.
|
||||
|
||||
## 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
|
||||
|
|
@ -183,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+
|
||||
|
||||
|
|
@ -214,15 +203,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
|
||||
|
|
@ -328,38 +308,18 @@ containers.
|
|||
|
||||
|
||||
|
||||
## 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
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -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": [
|
||||
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}]
|
||||
|
|
|
|||
Loading…
Reference in New Issue