1
0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Commit Graph

112 Commits

Author SHA1 Message Date
Guillaume J. Charmes
193815be0d Update docs. Make PULL up to date, remove deprecated falg and update PUSH
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: bf4255afd0
Component: cli
2017-06-02 00:06:25 +00:00
Barnaby Gray
08510746bd Update fish completions for docker master.
Docker-DCO-1.1-Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk> (github: barnybug)
Upstream-commit: ba5970e101
Component: cli
2017-06-02 00:06:24 +00:00
Vincent Batts
c879b080f5 --env-file: simple line-delimited
match dock functionality, and not try to achieve shell-sourcing compatibility

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 40f100517d
Component: cli
2017-06-02 00:06:24 +00:00
Vincent Batts
ac56da908c env-file: update functionality and docs
Multiple flags allowed. Order prescribed. Examples provided. Multiline
accounted for.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 552c1d2899
Component: cli
2017-06-02 00:06:24 +00:00
Vincent Batts
2a3c84db1a Fixing doc references to --env-file
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 46d697f30b
Component: cli
2017-06-02 00:06:24 +00:00
Vincent Batts
d2ac18c773 --env-file instead of --envfile
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 39880a5829
Component: cli
2017-06-02 00:06:24 +00:00
Vincent Batts
a31b818bc7 support for docker run environment variables file
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: f29511550b
Component: cli
2017-06-02 00:06:24 +00:00
Jason Plum
1b0f4b1bcc Fix daemon's documentation for -bip flag
Upstream-commit: 1c21055985
Component: cli
2017-06-02 00:06:24 +00:00
Justin Simonelis
4d868008c3 typo fix
Upstream-commit: 3d29e3bf8e
Component: cli
2017-06-02 00:06:24 +00:00
Guillaume J. Charmes
8c65da71a3 Fix fish completion when having alias on awk or grep
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 69ddbf7e0b
Component: cli
2017-06-02 00:06:24 +00:00
Vincent Batts
abce3a4614 docker load: added example of a multiple tag image
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: bdebc378c9
Component: cli
2017-06-02 00:06:24 +00:00
Vincent Batts
7823153bd9 docker load: doc clarification
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: c7e8b69f3f
Component: cli
2017-06-02 00:06:24 +00:00
Vincent Batts
32468b6f39 docker load: add --input flag
for those that do not care to read from redirected stdin

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: de4aba1b65
Component: cli
2017-06-02 00:06:24 +00:00
Sven Dowideit
9a6562434c I'm not looking forward to documenting cli arguments that may or may not show depending on what plugins / drviers you choose
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 5fdc8456ca
Component: cli
2017-06-02 00:06:24 +00:00
Vincent Batts
2352760bdd docker save: add and improve docs
add usage examples for `docker save ...`

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: dd1f12fe6c
Component: cli
2017-06-02 00:06:24 +00:00
Michael Crosby
8dc9fb0dfd Revert "Disable automatic killing of containers when docker stop fails"
This reverts commit 8b5cf51d600dc4f3611cf063c52cf3448e7b01e5.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ea3cd0f065
Component: cli
2017-06-02 00:06:24 +00:00
Daniel Norberg
9be85b3bcc fix typo in documentation
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: e12226771d
Component: cli
2017-06-02 00:06:24 +00:00
Daniel Norberg
77591854c6 configurable dns search domains
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: ac0787dbab
Component: cli
2017-06-02 00:06:24 +00:00
Johannes 'fish' Ziemke
f0d1986616 Add authenticated TLS support for API
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
Upstream-commit: f07cb7c233
Component: cli
2017-06-02 00:06:23 +00:00
Tianon Gravi
3288817f4c Add some documentation about relative WORKDIR values
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: dfd2d9f1ea
Component: cli
2017-06-02 00:06:23 +00:00
Michael Crosby
afcb2e8d58 Add image size to history docs
Fixes #3147
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ec1254275d
Component: cli
2017-06-02 00:06:23 +00:00
LK4D4
5b2ede5a33 Using names in docker ps --since-id/--before-id, resolves #3565
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 41429fd727
Component: cli
2017-06-02 00:06:23 +00:00
Brian Goff
9b65da7cef Disable automatic killing of containers when docker stop fails
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: d45a91a56b
Component: cli
2017-06-02 00:06:23 +00:00
Victor Vieux
66f102baf2 Add missing client doc
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e4111339bb
Component: cli
2017-06-02 00:06:23 +00:00
Victor Vieux
93d2d22d18 move git clone from daemon to client
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)

add a little doc
Upstream-commit: 2f33a8e6bd
Component: cli
2017-06-02 00:06:23 +00:00
Tianon Gravi
f634f55d67 Fix sphinx header underline warnings I introduced...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 974b760644
Component: cli
2017-06-02 00:06:23 +00:00
Tianon Gravi
2c842723a1 Update to double-dash everywhere
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 6f6214866a
Component: cli
2017-06-02 00:06:23 +00:00
Ken ICHIKAWA
6b2c58a6bf Add missing options -t and -v to images subcommand doc
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
Upstream-commit: fb3a8f17c3
Component: cli
2017-06-02 00:06:23 +00:00
Ken ICHIKAWA
e884a45d8d Remove duplicated description of --mtu
commit baa70e975186bb0ee8a4b16b9374cb6e794f8975 duplicates
the description of --mtu.
This patch removes the duplicated description.

Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
Upstream-commit: cdd5e423aa
Component: cli
2017-06-02 00:06:23 +00:00
Wes Morgan
0507fef3f4 merge existing config when committing
Fixes #1141

Docker-DCO-1.1-Signed-off-by: Wes Morgan <cap10morgan@gmail.com> (github: cap10morgan)
Upstream-commit: 60cd5ec3b7
Component: cli
2017-06-02 00:06:23 +00:00
Ken ICHIKAWA
24e02aede3 Update daemon docs and help messages for --iptables and --ip-forward
Fix docs and help messages of --iptables and --ip-forward to describe the true case behaviour

Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
Upstream-commit: bb64095f4b
Component: cli
2017-06-02 00:06:23 +00:00
Scott Collier
e68a8b4863 Removing HEAD tag from last commit
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
Upstream-commit: 771de961bf
Component: cli
2017-06-02 00:06:23 +00:00
Scott Collier
af9cc6c294 Adding CLI options to the commandline reference documentation.
Fixing bad DCO sig

URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
Upstream-commit: f07bd8fb8a
Component: cli
2017-06-02 00:06:23 +00:00
Scott Collier
bd2a743fb5 Adding the new options to the docker ps documentation.
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

Adding the new options to the `docker ps` documentation.

URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

Adding CLI options to the commandline reference documentation.

URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

changing indention

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
Upstream-commit: 9fbf050286
Component: cli
2017-06-02 00:06:23 +00:00
Scott Collier
dfe7f7a2ea Adding options to docker restart documentation
URL of page is: http://docs.docker.io/en/latest/reference/commandline/cli/#restart

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
Upstream-commit: f742182359
Component: cli
2017-06-02 00:06:23 +00:00
Scott Collier
1723872d9b Adding the new options to the docker ps documentation.
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
Upstream-commit: 151dd6d3f1
Component: cli
2017-06-02 00:06:23 +00:00
Guillaume J. Charmes
a24ad753f5 Update email + add self to pkg/signal
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 939dd00e47
Component: cli
2017-06-02 00:06:23 +00:00
Tom Fotherby
62e9d22281 Correct Docker run --host param to --hostname
Upstream-commit: 5348fdca04
Component: cli
2017-06-02 00:06:22 +00:00
Brian Goff
8fc343382c Add ability to force removal of running container via docker rm -f
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 1abc7e3c7c
Component: cli
2017-06-02 00:06:22 +00:00
Evan Krall
ed4cba1861 Create a -G option that specifies the group which unix sockets belong to.
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com> (github: EvanKrall)
Upstream-commit: 920d1683e2
Component: cli
2017-06-02 00:06:22 +00:00
James Turnbull
5a9e7304a2 Consistently capitalize CLI options
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a625f00d0d
Component: cli
2017-06-02 00:06:22 +00:00
Michael Crosby
63f57412e6 Update daemon docs for exec drivers
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 86b133528c
Component: cli
2017-06-02 00:06:22 +00:00
unclejack
5c992bcf4c handle symlinks for Docker's root dir & TMPDIR
This removes the incomplete symlink handling from engine.go and it adds
it one place in docker.go.

It also enables handling symlinks for TMPDIR.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 7bce027176
Component: cli
2017-06-02 00:06:22 +00:00
ILYA Khlopotov
c86e1760e7 Support json output in --format flag of docker inspect
Docker-DCO-1.1-Signed-off-by: ILYA Khlopotov <ilya.khlopotov@gmail.com> (github: khia)
Upstream-commit: 87b94808dc
Component: cli
2017-06-02 00:06:22 +00:00
Sven Dowideit
05adee5aca add a little bit mentioning commandline option combinations
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 0db1996a26
Component: cli
2017-06-02 00:06:22 +00:00
Barnaby Gray
acb1068850 Add fish shell completions from https://github.com/barnybug/docker-fish-completion.
Docker-DCO-1.1-Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk> (github: barnybug)
Upstream-commit: 45e2caf10e
Component: cli
2017-06-02 00:06:22 +00:00
Sven Dowideit
c72678e3e6 one ponted out by lukaspustina, and one that I bet I added
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 29d73de168
Component: cli
2017-06-02 00:06:22 +00:00
Victor Vieux
926294bc3b add missing doc
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 231c00296b
Component: cli
2017-06-02 00:06:22 +00:00
Brian Goff
f5af2eb8c7 make docker build -rm=true default #4292
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 730417f46f
Component: cli
2017-06-02 00:06:22 +00:00
Vincent Batts
4da3c798d1 execdriver flag for docker daemon
like the storage-driver flag, this implements a flag for choosing the
  execdriver to be used, defaulting to lxc.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 9d1894a44c
Component: cli
2017-06-02 00:06:21 +00:00