Import man pages #68
Closed
Import man pages #68
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Instead of just showing the number of containers this patch will show the number of running, paused and stopped containers as well. Signed-off-by: Kim Eik <kim@heldig.org> (cherry picked from commit a9804ab1cb117a132cbf460067d55f5146d50956)
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Remove the experimental docs for user namespaces and add similar content to the `docker daemon` command documentation. Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Signed-off-by: Chun Chen <ramichen@tencent.com> Signed-off-by: David Calavera <david.calavera@gmail.com>
…ice size on daemon restart Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Alessandro Boch <aboch@docker.com>
docker's network disconnect api now supports `Force` option which can be used to force cleanup an endpoint from any host in the cluster. Signed-off-by: Madhu Venugopal <madhu@docker.com>
Fixes issue #19089 Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
Read configuration after flags making this the priority: 1- Apply configuration from file. 2- Apply configuration from flags. Reload configuration when a signal is received, USR2 in Linux: - Reload router if the debug configuration changes. - Reload daemon labels. - Reload cluster discovery. Signed-off-by: David Calavera <david.calavera@gmail.com>
* If user doesn't specify the subnets to create a network, it will pick subnets from inside preferred pool. This PR aims to inspect these subnets info * Add integration tests for docker inspect the subnets. * docker-py project is already synchronized. * jenkins checks depend on docker/docker-py#888 Fixes issue #18626 Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
It is possible to invoke `docker ps -f status=dead`, but the documentation for docker-ps does not mention `dead` as a valid option. This commit fixes that. Signed-off-by: Kareem Khazem <karkhaz@karkhaz.com>
This makes it so when calling `docker run --rm`, or `docker rm -v`, only volumes specified without a name, e.g. `docker run -v /foo` instead of `docker run -v awesome:/foo` are removed. Note that all volumes are named, some are named by the user, some get a generated name. This is specifically about how the volume was specified on `run`, assuming that if the user specified it with a name they expect it to persist after the container is cleaned up. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
We cannot rely on the tar command for this type of operation because tar versions, flags, and functionality can very from distro to distro. Since this is in the container execution path it is not safe to have this as a dependency from dockers POV where the user cannot change the fact that docker is adding these pre and post mount commands. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Fixes issue #18410 Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Signed-off-by: Vincent Woo <me@vincentwoo.com> Signed-off-by: David Calavera <david.calavera@gmail.com>
In new content addressable model, image no longer have virtual size column, it is now 'size'. So we need to update related docs about them. Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Also adds internal network tests for bridge network Signed-off-by: Chun Chen <ramichen@tencent.com>
In the NAME section: "confg.json" -> "config.json" Signed-off-by: Tom X. Tobin <tomxtobin@tomxtobin.com>
The at sign (`@`) was being referred to in the documentation as an ampersand (`&`). Signed-off-by: Tom X. Tobin <tomxtobin@tomxtobin.com>
Signed-off-by: Evan Allrich <evan@unguku.com>
It is difficult to gather information about docker volumes command without a parent man page. This man page attempts to explain docker volumes and then references the command man pages. Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Signed-off-by: mapk0y <mapk0y@gmail.com>
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This does some minor fix-ups in the CLI reference for "history", and copies the formattting section to the man-pages. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: David Sheets <dsheets@docker.com>
Instead of forcing users to manually configure a block device to use with devmapper, this gives the user the option to let the devmapper driver configure a device for them. Adds several new options to the devmapper storage-opts: - dm.directlvm_device="" - path to the block device to configure for direct-lvm - dm.thinp_percent=95 - sets the percentage of space to use for storage from the passed in block device - dm.thinp_metapercent=1 - sets the percentage of space to for metadata storage from the passed in block device - dm.thinp_autoextend_threshold=80 - sets the threshold for when `lvm` should automatically extend the thin pool as a percentage of the total storage space - dm.thinp_autoextend_percent=20 - sets the percentage to increase the thin pool by when an autoextend is triggered. Defaults are taken from [here](https://docs.docker.com/engine/userguide/storagedriver/device-mapper-driver/#/configure-direct-lvm-mode-for-production) The only option that is required is `dm.directlvm_device` for docker to set everything up. Changes to these settings are not currently supported and will error out. Future work could support allowing changes to these values. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This is synonymous with `docker run --cidfile=FILE` and writes the digest of
the newly built image to the named file. This is intended to be used by build
systems which want to avoid tagging (perhaps because they are in CI or
otherwise want to avoid fixed names which can clash) by enabling e.g. Makefile
constructs like:
image.id: Dockerfile
docker build --iidfile=image.id .
do-some-more-stuff: image.id
do-stuff-with <image.id
Currently the only way to achieve this is to use `docker build -q` and capture
the stdout, but at the expense of losing the build output.
In non-silent mode (without `-q`) with API >= v1.29 the caller will now see a
`JSONMessage` with the `Aux` field containing a `types.BuildResult` in the
output stream for each image/layer produced during the build, with the final
one being the end product. Having all of the intermediate images might be
interesting in some cases.
In silent mode (with `-q`) there is no change, on success the only output will
be the resulting image digest as it was previosuly.
There was no wrapper to just output an Aux section without enclosing it in a
Progress, so add one here.
Added some tests to integration cli tests.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Contributor
|
LGTM stuff works: |
tiborvass
force-pushed
the
import_man
branch
4 times, most recently
from
9c1657c to
f44743c
Compare
Removes the use of glide, and uses vndr instead. Signed-off-by: Tibor Vass <tibor@docker.com>
dnephin
reviewed
May 11, 2017
| .PHONY: test | ||
| test: | ||
| @go test -tags daemon -v $(shell go list ./... | grep -v /vendor/) | ||
| @go test -tags daemon -v $(shell go list ./... | grep -vE '/vendor/|github.com/docker/cli/man$$') |
Contributor
There was a problem hiding this comment.
Why is it necessary to exclude the man directory from testing?
Collaborator
Author
There was a problem hiding this comment.
Because of missing packages, that are included only after the vendor-on-the-fly part of generate.sh
| "Deadline": "2m", | ||
| "Sort": ["linter", "severity", "path"], | ||
| "Exclude": ["cli/compose/schema/bindata.go"], | ||
| "Exclude": ["cli/compose/schema/bindata.go", "man/generate.go"], |
Contributor
There was a problem hiding this comment.
Why is this necessary? I don't think we should exclude it from linting
Collaborator
Author
There was a problem hiding this comment.
Because packages are missing when linting.
| ## Generate man pages from go source and markdown | ||
| .PHONY: manpages | ||
| manpages: | ||
| @man/generate.sh |
Contributor
There was a problem hiding this comment.
This doesn't need to be .PHONY, this is one of the rare cases when a Makefile is actually appropriate.
I believe something like this would be correct:
man/man*: man/
@man/generate.sh
manpages: man/man*
Contributor
There was a problem hiding this comment.
Can you use wildcards in Makefile rules like that? I didn't think so, you would need $(wildcard man/man*), I think.
But be careful: this:
foo bar: baz
make-foo-and-bar baz
Does not cause make-foo-and-bar baz to run once whenever baz changes. It will be run once for foo and once for bar. That is unlikely to be what you wanted, at least judging from the lack of parameters to man/generate.sh in your example (if it had been passed $@ then it might be correct).
Contributor
There was a problem hiding this comment.
I guess this would be easier to do if we wrote the man pages to man/dist/ then the target would be just that string without the need for wildcards.
Contributor
There was a problem hiding this comment.
Not entirely sure how make deals with targets or dependencies which are directories rather then files, but if that sort of thing works (I guess it just stats and uses the mtime just like for a file), sure.
Contributor
There was a problem hiding this comment.
Yes, I think that's how it works. I did it for vendor (in this Makefile) and it seems to work so far.
|
|
||
| grep -v '^#' man/vendor.tmp | while read dep; do | ||
| vndr $(echo "$dep" | cut -d' ' -f1) | ||
| done |
Contributor
There was a problem hiding this comment.
There has to be a better way to do this.
Why not keep this as a separate Dockerfile? Now that we have ARG in FROM I think we can have a single file.
Collaborator
|
@tiborvass needs a rebase 👼 |
nobiit
pushed a commit
to nobidev/docker-cli
that referenced
this pull request
Nov 19, 2025
Update changelog for 17.06.0-ce-rc3
nobiit
pushed a commit
to nobidev/docker-cli
that referenced
this pull request
Nov 19, 2025
Do not terminate on missing build-ids Upstream-commit: 8457a25900698f1bdef844c22fb19900de1a5bc7 Component: packaging
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Imports the man/ folder from moby/moby, preserving history.
Reuses main Dockerfile to generate man pages
Removes the use of glide, and uses vndr instead.
947efe9 is the merge commit that imports the history
019a052 is the commit that makes the relevant changes to make it work.
Run
make -f docker.Makefile manpagesto test