Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3405 from thaJeztah/update_daemon_docs 

docs/daemon: replace deprecated '-g' option for '--data-root'
This commit is contained in:
Sebastiaan van Stijn 2022-01-13 16:02:36 +01:00 committed by GitHub
parent a4787cfc27 ae3a61439b
commit 6e2838e186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/reference/commandline/dockerd.md
View File

@ -116,8 +116,8 @@ Options with [] may be specified multiple times.
uses different binaries for the daemon and client. To run the daemon you uses different binaries for the daemon and client. To run the daemon you
type `dockerd`. type `dockerd`.
To run the daemon with debug output, use `dockerd -D` or add `"debug": true` to To run the daemon with debug output, use `dockerd --debug` or add `"debug": true`
the `daemon.json` file. to [the `daemon.json` file](#daemon-configuration-file).
> **Enabling experimental features** > **Enabling experimental features**
> >
@ -313,7 +313,7 @@ article explains how to tune your existing setup without the use of options.
The `btrfs` driver is very fast for `docker build` - but like `devicemapper` The `btrfs` driver is very fast for `docker build` - but like `devicemapper`
does not share executable memory between devices. Use does not share executable memory between devices. Use
`dockerd -s btrfs -g /mnt/btrfs_partition`. `dockerd --storage-driver btrfs --data-root /mnt/btrfs_partition`.
The `zfs` driver is probably not as fast as `btrfs` but has a longer track record The `zfs` driver is probably not as fast as `btrfs` but has a longer track record
on stability. Thanks to `Single Copy ARC` shared blocks between clones will be on stability. Thanks to `Single Copy ARC` shared blocks between clones will be
@ -1234,14 +1234,14 @@ for `/var/lib/docker/tmp`. The `DOCKER_TMPDIR` and the data directory can be
set like this: set like this:
```console ```console
$ DOCKER_TMPDIR=/mnt/disk2/tmp /usr/local/bin/dockerd -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1 $ DOCKER_TMPDIR=/mnt/disk2/tmp /usr/local/bin/dockerd --data-root /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1
``` ```
or or
```console ```console
$ export DOCKER_TMPDIR=/mnt/disk2/tmp $ export DOCKER_TMPDIR=/mnt/disk2/tmp
$ /usr/local/bin/dockerd -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1 $ /usr/local/bin/dockerd --data-root /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1
```` ````
#### Default cgroup parent #### Default cgroup parent