Commit Graph

73 Commits

Author SHA1 Message Date
1e48b3236d intermediate image layers are used for more than the build
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: df48712193
Component: cli
2017-06-02 00:06:25 +00:00
ee87b49e2c Deprecate 'docker insert'
'docker insert' is an old command which predates 'docker build'. We no
longer recommend using it, it is not actively maintained, and can be
replaced with the combination of 'docker build' and 'ADD'.

This removes the command from usage and documentation, and prints a
warning when it is called.

The command still works but it will be removed in a future version.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: a9ae270842
Component: cli
2017-06-02 00:06:25 +00:00
590bc608cd Deprecate 'docker images --tree' and 'docker images --viz'
* The commands are no longer listed or documented.
* The commands still work but print a deprecation warning.
* The commands should be removed in a future version.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 3a5697d52a
Component: cli
2017-06-02 00:06:25 +00:00
71f47020d0 docs: explain what docker run -a does
This adds a bit of documentation for the `-a` flag for docker run.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 8cf995efcf
Component: cli
2017-06-02 00:06:25 +00:00
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
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
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
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
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
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
1b0f4b1bcc Fix daemon's documentation for -bip flag
Upstream-commit: 1c21055985
Component: cli
2017-06-02 00:06:24 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
62e9d22281 Correct Docker run --host param to --hostname
Upstream-commit: 5348fdca04
Component: cli
2017-06-02 00:06:22 +00:00
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
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
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
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
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
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
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
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
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
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
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
28982b4453 Drop -mtu from docs in favor of --mtu only
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com> (github: dpb587)
Upstream-commit: dcea86eb25
Component: cli
2017-06-02 00:06:21 +00:00
b6ce0ab105 Fix cli argument usage typo for docker --mtu
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com> (github: dpb587)
Upstream-commit: 16e959358b
Component: cli
2017-06-02 00:06:21 +00:00