1
0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Commit Graph

426 Commits

Author SHA1 Message Date
Sven Dowideit
2cd1fe2d7b Add @ArikaChen's tip for using HTTPS proxy to pull
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 2b97e7c82e
Component: cli
2017-06-02 00:06:44 +00:00
Jan Koprowski
c0e17b6f88 Specify ENV variables are also used for CMD.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: fbe252581a
Component: cli
2017-06-02 00:06:44 +00:00
Doug Davis
a07f74111e Allow for Dockerfile to be named something else.
Add a check to make sure Dockerfile is in the build context
Add docs and a testcase
Make -f relative to current dir, not build context

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 350d2e33b7
Component: cli
2017-06-02 00:06:44 +00:00
Doug Davis
d5c66b30ea Have .dockerignore support Dockerfile/.dockerignore
If .dockerignore mentions either then the client will send them to the
daemon but the daemon will erase them after the Dockerfile has been parsed
to simulate them never being sent in the first place.

an events test kept failing for me so I tried to fix that too

Closes #8330

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: c88762b38b
Component: cli
2017-06-02 00:06:44 +00:00
Christian Stefanescu
5119c5b376 Fixed minor typo
Signed-off-by: Christian Stefanescu <st.chris@gmail.com>
Upstream-commit: c5bd80c738
Component: cli
2017-06-02 00:06:44 +00:00
Sven Dowideit
f57d12a5d7 Explicitly mention that '-P' maps to random ports
as noted in https://github.com/boot2docker/boot2docker/issues/690

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: d8d520cfbc
Component: cli
2017-06-02 00:06:44 +00:00
Dan Walsh
87fbe5d3b9 --help option and help command should print to stdout not stderr
--help and help are successful commands so output should not go to error.

    QE teams have requested this change, also users doing docker help | less
    or docker run --help | less would expect this to work.

    Usage statement should only be printed when the user asks for it.
    Errors should print error message and then suggest the docker COMMAND --help
    command to see usage information.

    The current behaviour causes the user to have to search for the error message
    and sometimes scrolls right off the screen.  For example a error on a
    "docker run" command is very difficult to diagnose.

    Finally erros should always exit with a non 0 exit code, if the user
    makes a CLI error.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: ea4024d2bd
Component: cli
2017-06-02 00:06:44 +00:00
Sven Dowideit
c998ef06dc Add docs Cloudfront cache invalidation
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: bc5dd0cd32
Component: cli
2017-06-02 00:06:44 +00:00
Srini Brahmaroutu
b19512b38c add ability to publish range of ports
Closes #8899
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: c33d198609
Component: cli
2017-06-02 00:06:44 +00:00
Harald Albers
8339d95317 Sort options in bash completion alphabetically
This introduces a sort order for options:

Arrange options sorted alphabetically by long name with the short
options immediately following their corresponding long form.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3fb5792b25
Component: cli
2017-06-02 00:06:44 +00:00
Harald Albers
e3a5916d4a Add missing options to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1d3be0eae9
Component: cli
2017-06-02 00:06:44 +00:00
Sven Dowideit
978d20a4ab Document that there is a delay before the --restart policy restart, and that its double the last one
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 6345932ff1
Component: cli
2017-06-02 00:06:44 +00:00
Sven Dowideit
23e65f459b Talk up the 1.4 change to initialise volumes at time
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 04e44cef6b
Component: cli
2017-06-02 00:06:44 +00:00
Phil Estes
1fa3bb9676 Add "OOM killed" event based on OOM state information
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: bd4bbf0034
Component: cli
2017-06-02 00:06:43 +00:00
Doug Davis
f021a10a56 Allow for relative paths on ADD/COPY
Moved Tianon's PR from: https://github.com/docker/docker/pull/7870
on top of the latest code

Closes: #3936

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: c5bc505744
Component: cli
2017-06-02 00:06:43 +00:00
Sven Dowideit
4b167499c3 Update the documentation for #9356 fix
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 8b6198a7f2
Component: cli
2017-06-02 00:06:43 +00:00
Sven Dowideit
b39e021d90 add Scott's link checker script, and fix what it finds
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 1cc7a4eb81
Component: cli
2017-06-02 00:06:43 +00:00
Fred Lifton
0f45110f91 Additions for 1.4.1 release
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 0ed37792d6
Component: cli
2017-06-02 00:06:43 +00:00
Harald Albers
a5eb2e896f Refactor completion for docker run and docker create
_docker_run and _docker_create had only one differing line.

This refactoring features:

- direct completion for both commands to the same function
- factor out the common arguments, sort & format them nicely
- compute the argument for _docker_pos_first_nonflag.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ce7267e597
Component: cli
2017-06-02 00:06:43 +00:00
Barnaby Gray
58884a83d3 Update fish shell completions.
Fixes #9550

Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk>
Upstream-commit: 6a94570d5a
Component: cli
2017-06-02 00:06:43 +00:00
Jessica Frazelle
f6a50ae86c add note to docs about overlay + btrfs
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: e6d8a17cf5
Component: cli
2017-06-02 00:06:43 +00:00
shishir-a412ed
d686976ec8 Added description for 'docker run' command, -c/--cpu-shares flag
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 41d3d7dc72
Component: cli
2017-06-02 00:06:43 +00:00
Arnaud Porterie
d82196393d Forbid client piping to tty enabled container
Forbid `docker run -t` with a redirected stdin (such as `echo test |
docker run -ti busybox cat`). Forbid `docker exec -t` with a redirected
stdin. Forbid `docker attach` with a redirect stdin toward a tty enabled
container.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 76daef2b9a
Component: cli
2017-06-02 00:06:43 +00:00
Sven Dowideit
c804d95895 Add a fuse example, combining both SYS_ADMIN and --device
inspired by #9448 and #9487

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: acd8287c74
Component: cli
2017-06-02 00:06:43 +00:00
Sven Dowideit
a4952d1f24 add --cap-add=NET_ADMIN to make a new network device
inspired by #9452

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: c5e525eb4c
Component: cli
2017-06-02 00:06:43 +00:00
Michael Crosby
0463b47ef4 Return docker's root dir in docker -D info
This adds the docker daemon's root directory to docker info when running
in debug mode.  This allows the user to view the root directory where
docker is writing and storing state.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f96a52c955
Component: cli
2017-06-02 00:06:43 +00:00
Sven Dowideit
aedc6dbfed Note that using -lxc-conf to change things Docker manages has pitfalls
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: dc2868ee11
Component: cli
2017-06-02 00:06:43 +00:00
Sven Dowideit
c792fd44dd fixes as per feedback
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 640fabe8da
Component: cli
2017-06-02 00:06:43 +00:00
Sven Dowideit
84ddb26bc1 Try out a different phrase for --icc
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 87353ddc98
Component: cli
2017-06-02 00:06:43 +00:00
Michal Minar
aaed4e0c16 Doc: described storage-driver options in cli reference
Documented --storage-opt=[] option in cli reference page. Content taken
from:

  daemon/graphdriver/devmapper/README.md

Signed-off-by: Michal Minar <miminar@redhat.com>

Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com> (github: SvenDowideit)
Upstream-commit: 716e639748
Component: cli
2017-06-02 00:06:43 +00:00
Michal Minar
31e804025e Man: describe --icc option better
Current description is misleading. It make an impression the --icc=false
prevents containers to talk with each other.

Signed-off-by: Michal Minar <miminar@redhat.com>

Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com> (github: SvenDowideit)
Upstream-commit: 0f2e87fcf8
Component: cli
2017-06-02 00:06:42 +00:00
Sven Dowideit
d332fa764a Auto-update documentation from the output of the cli.
I've re-jigged the run man page so that each option's text begins with the
cli's help text for that flag, and then ay subsequent lines in the man page
are carried forward.

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: f79055e610
Component: cli
2017-06-02 00:06:42 +00:00
Sven Dowideit
86a734c304 Something changed, broke the docs release script, and it seems that --exclude still doesn't work, so I'm removing it
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: bc4f74bc1d
Component: cli
2017-06-02 00:06:42 +00:00
Lénaïc Huard
080c97a25c Rename the overlay storage driver
so that docker is started with `docker -d -s overlay` instead of `docker -d -s overlayfs`

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
Upstream-commit: 12a763ba5a
Component: cli
2017-06-02 00:06:42 +00:00
Sindhu S
4736be8026 Fix dead link cli.md
Upstream-commit: f7c051492c
Component: cli
2017-06-02 00:06:42 +00:00
Tomas Tomecek
90939c9f0c docs: man docker-images: inconsistent naming
Synopsis is mentioning "NAME" while description is describing "REPOSITORY".

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
Upstream-commit: 82436ff167
Component: cli
2017-06-02 00:06:42 +00:00
Sindhu S
10e21c9024 Fix dead link build.md
Upstream-commit: 5d4d002c23
Component: cli
2017-06-02 00:06:42 +00:00
Alexander Boyd
819c49ea5c Correct inaccuracy in docker pull documentation
Signed-off-by: Alexander Boyd <alex@opengroove.org>
Upstream-commit: ed00fc5e27
Component: cli
2017-06-02 00:06:42 +00:00
Jacob Atzen
9fe52b1bc3 Update documentation for EXPOSE
The documentation for EXPOSE seems to indicate, that EXPOSE is only relevant in
the context of links, which is not the case.

Signed-off-by: Jacob Atzen <jatzen@gmail.com>
Upstream-commit: d40014d096
Component: cli
2017-06-02 00:06:42 +00:00
James Turnbull
1edc2957dc Removed extraneous )
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 407a4a1916
Component: cli
2017-06-02 00:06:42 +00:00
Sven Dowideit
efb266cb50 Add an example of how to add your client IP to the container hosts file
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 00a5a3fa8a
Component: cli
2017-06-02 00:06:42 +00:00
Michael Steinert
53c6a1a222 Fix a small typo
Signed-off-by: Michael Steinert <mike.steinert@gmail.com>
Upstream-commit: ab60926400
Component: cli
2017-06-02 00:06:42 +00:00
Sven Dowideit
61fcd6e040 Explain what the VIRTUAL SIZE means
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 11d4be9719
Component: cli
2017-06-02 00:06:42 +00:00
Victor Vieux
3c97fbae98 docs nits
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 3b475ff060
Component: cli
2017-06-02 00:06:42 +00:00
Victor Vieux
4eba96b318 events filtering
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 8434115c69
Component: cli
2017-06-02 00:06:42 +00:00
Harald Albers
f6d19e6000 Minor bash completion cleanup
The -n and --networking options were removed because they are
unsupported. 
Bash completion should not reveal the existence of otherwise
undocumented unsupported options.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3addb4d642
Component: cli
2017-06-02 00:06:42 +00:00
Harald Albers
17cd5ae6d6 Add missing options to bash completion for the run and create commands
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 055b224c90
Component: cli
2017-06-02 00:06:42 +00:00
Aidan Hobson Sayers
e486807e94 Allow git@ prefixes for any hosted git service
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 923e1ecbc5
Component: cli
2017-06-02 00:06:41 +00:00
Vincent Bernat
138a6b67c4 zsh: correctly parse available subcommands
A lot of flags have been added on the output of `docker help`. Use a
more robust method to extract the list of available subcommands by
spotting the `Command:` line and the next blank line.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 69d7e8443d
Component: cli
2017-06-02 00:06:41 +00:00
Dmitry V. Krivenok
2c34b10f2b Made wording a bit more generic.
Upstream-commit: 536f41a73e
Component: cli
2017-06-02 00:06:41 +00:00