Commit Graph

250 Commits

Author SHA1 Message Date
da4bfdb14a add wildcard support to copy/add
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1a83c9f87e
Component: cli
2017-06-02 00:06:35 +00:00
dc7a961ff2 Adding details on how to use .dockerignore file
Addresses #7724

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 62cc00b765
Component: cli
2017-06-02 00:06:35 +00:00
6df89ee708 Pull all image aliases for id. Closes #8141.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 3e3d368b74
Component: cli
2017-06-02 00:06:35 +00:00
20728b1521 Updated output from the docker cli help
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 5c9bb30d90
Component: cli
2017-06-02 00:06:35 +00:00
ce71b7d929 builder: Fix handling of VOLUME command where multiple volumes are
specified in a space delimited list.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 82ff6f0c9f
Component: cli
2017-06-02 00:06:35 +00:00
97a4071f4e Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: b6e3153734
Component: cli
2017-06-02 00:06:35 +00:00
dcdc597a18 Adding new Dockerfile Best Practices doc, and links thereto.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 85808d776d
Component: cli
2017-06-02 00:06:35 +00:00
f3ef53c1fa That URL isn't there anymore
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 056efbbe14
Component: cli
2017-06-02 00:06:35 +00:00
e34558a69d Doc update to clarify random port mapping on docker run -P
Signed-off-by: Dan Cotora <d@bluevision.ro>
Upstream-commit: d6d5dcd55a
Component: cli
2017-06-02 00:06:35 +00:00
83f8fd461d Adding additional documentation for fixed-cidr networking
Docker-DCO-1.1-Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu> (github: fkautz)

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: e938ac9e78
Component: cli
2017-06-02 00:06:35 +00:00
8116c5ab68 Implement allocating IPs from CIDR within bridge network
Fixes #4986

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 1798f72254
Component: cli
2017-06-02 00:06:34 +00:00
8abff83092 Fix detaching from attached container
Text was copied from man-pages https://raw.githubusercontent.com/docker/docker/master/docs/man/docker-attach.1.md

Signed-off-by: Jyrki Puttonen <jyrkiput@gmail.com>
Upstream-commit: 5afc964a9e
Component: cli
2017-06-02 00:06:34 +00:00
8c8167747e Cleanup: Fix cli docs: Sorted command headers.
Signed-off-by: Andrey Petrov <andrey.petrov@shazow.net>
Upstream-commit: 9c74cf01e2
Component: cli
2017-06-02 00:06:34 +00:00
17eed5a7b8 Add support for copy/add with multiple src files
Part one of solution for issue #6820

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 6ea2cc5e0e
Component: cli
2017-06-02 00:06:34 +00:00
ff2b882022 Add an option to disable IP masquerading
For the cases where --bip option is used it is sometimes best to disable
IP masquerading as the provided bridge IP range may be routable.

Signed-off-by: Eugene Yakubovich <eugene.yakubovich@coreos.com>
Upstream-commit: a492b97cd0
Component: cli
2017-06-02 00:06:34 +00:00
409eb6c388 'an file' -> 'a file' grammar fix
Signed-off-by: Albert Callarisa Roca <albert@acroca.com>
Upstream-commit: 54f5e16a38
Component: cli
2017-06-02 00:06:34 +00:00
279a61f613 Allow extra lines in /etc/hosts
This adds a --add-host host:ip flag which appends lines to /etc/hosts.  This is needed in places where you want the container to get a different name resolution than it would through DNS.  This was submitted before as #5525, closed, and now I am re-opening.  It has come up 2 or 3 times in the last couple days.

Signed-off-by: Tim Hockin <thockin@google.com>
Upstream-commit: 14c0f0781d
Component: cli
2017-06-02 00:06:34 +00:00
a9323afb14 docs fix
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 7786198ec8
Component: cli
2017-06-02 00:06:34 +00:00
9771e188f6 Add "docker create" support
This exposes the already existing "create container" operation.  It is
very similar to "docker run -d" except it doesn't actually start the
container, but just prepares it. It can then be manually started using
"docker start" at any point.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)

Conflicts:
	api/client/commands.go
	runconfig/parse.go
	server/container.go

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 5886a02980
Component: cli
2017-06-02 00:06:34 +00:00
56a0339c7a Fix for issue 7902.
Use utils.RFC3339NanoFixed ("2006-01-02T15:04:05.000000000Z07:00")
instead of time.RFC3339Nano to format our log timestamps - this way
things are aligned, in particular the nano seconds are padded with zeros

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: dbb8b6e280
Component: cli
2017-06-02 00:06:34 +00:00
3c778ccf71 Adding docker exec support in CLI.
Fixed a bug in daemon that resulted in accessing of a closed pipe.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: aa62097042
Component: cli
2017-06-02 00:06:34 +00:00
ba8f0967ab Removing 'exec' feature from the CLI until the docker daemon supports resizing of
tty sessions for exec'ed commands.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 09bfb139f1
Component: cli
2017-06-02 00:06:34 +00:00
129d7e93da Address review comments.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 733ac4b1e7
Component: cli
2017-06-02 00:06:34 +00:00
7bf6085352 Update cli.md to include 'docker exec' feature.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 4b80189b3b
Component: cli
2017-06-02 00:06:34 +00:00
c6cd0c88d2 Consistently use 'sudo docker' in examples
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 3ca630d381
Component: cli
2017-06-02 00:06:34 +00:00
644aab3397 Override prettyPrint's colour choice (red) for strings in quotes.
I've moved the docs.css to last so it can tweak any existing css, and
then set that to the same grey colour used for 'normal' text.

While testing I found and fixed an over-zealous line wrap.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: b7cb370393
Component: cli
2017-06-02 00:06:34 +00:00
632772241e Add notes about single-quotes
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: f0b5f2601f
Component: cli
2017-06-02 00:06:34 +00:00
8473c65e11 Add daemon flag to specify public registry mirrors
Adds support for a --registry-mirror=scheme://<host>[:port]
daemon flag. The flag may be present multiple times. If
provided, mirrors are prepended to the list of endpoints used
for image pull. Note that only mirrors of the public
index.docker.io registry are supported, and image/tag resolution
is still performed via the official index.

Docker-DCO-1.1-Signed-off-by: Tim Smith <timbot@google.com> (github: timbot)
Upstream-commit: 7ecebf2877
Component: cli
2017-06-02 00:06:33 +00:00
b46d15a5d8 add -p PORT as a valid format specification
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 70abfec849
Component: cli
2017-06-02 00:06:33 +00:00
ed8d0aaefb Added --device flag to run reference
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 5547dedac3
Component: cli
2017-06-02 00:06:33 +00:00
4980a85e4f add a little documentation for docker pull
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: aa499ca76e
Component: cli
2017-06-02 00:06:33 +00:00
ee01ee5ef2 List all ports when calling docker port container
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 6f480a8667
Component: cli
2017-06-02 00:06:33 +00:00
c848822410 docker save: ability to save multiple images
Now from a single invocation of `docker save`, you can specify multiple
images to include in the output tar, or even just multiple tags of a
particular image/repo.

```
> docker save -o bundle.tar busybox ubuntu:lucid ubuntu:saucy fedora:latest
> tar tf ./bundle.tar | wc -l
42
> tar xOf ./bundle.tar repositories
{"busybox":{"latest":"2d8e5b282c81244037eb15b2068e1c46319c1a42b80493acb128da24b2090739"},"fedora":{"latest":"58394af373423902a1b97f209a31e3777932d9321ef10e64feaaa7b4df609cf9"},"ubuntu":{"lucid":"9cc9ea5ea540116b89e41898dd30858107c1175260fb7ff50322b34704092232","saucy":"9f676bd305a43a931a8d98b13e5840ffbebcd908370765373315926024c7c35e"}}
```

Further, this fixes the bug where the `repositories` file is not created
when saving a specific tag of an image (e.g. ubuntu:latest)

document multi-image save and updated API docs

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 28b535f825
Component: cli
2017-06-02 00:06:33 +00:00
48077e3b5b Update /etc/hosts when linked container is restarted
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: bbea6aa42d
Component: cli
2017-06-02 00:06:33 +00:00
3961f38c94 add the [OPTIONS] string automatically if there are flags defined
Signed-off-by: SvenDowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 8b869694be
Component: cli
2017-06-02 00:06:33 +00:00
a3daed06ec Revert "--help option and help command should print to stdout not stderr"
This reverts commit 61b129d81802e3c988cc0e67e488b24968dd748a.

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 116bf8fdfb
Component: cli
2017-06-02 00:06:33 +00:00
59c2a716ed --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: f646304808
Component: cli
2017-06-02 00:06:33 +00:00
f5cecee8a9 Update flag usages and docs for max restart count
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 496b9b1977
Component: cli
2017-06-02 00:06:33 +00:00
33b2b9f6b8 Fixed a typo and added a bit based on Sven's feedback
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: e06e910b87
Component: cli
2017-06-02 00:06:33 +00:00
6fe3a11825 Added warning re: using root for dockerfile root. Fixes #7612
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: f30add12fe
Component: cli
2017-06-02 00:06:33 +00:00
972e9fca2a Cleanup: correct cli --volumes-from description
issue #7580 volumes-from comma separated list mentioned this case.

Options like --volumes-from=[] indicate they can be specified multiple times:
docker run -it --rm --volumes-from TEST_DATA --volumes-from TEST_DATA2 ubuntu bash

Signed-off-by: Deshi Xiao <dxiao@redhat.com>
Upstream-commit: 46121c5edd
Component: cli
2017-06-02 00:06:32 +00:00
fe6c696a10 update the cli / man page docs based on what is in master right now
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: d8b3ccd869
Component: cli
2017-06-02 00:06:32 +00:00
0be916edb1 Deprecate --restart on the daemon
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 0142098e67
Component: cli
2017-06-02 00:06:32 +00:00
2a85b5d64f Update docs based on feedback from review for --restart
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 9d8d982e5c
Component: cli
2017-06-02 00:06:32 +00:00
37792aa6c2 Add documentation and update restart rules.
Implement time backed backoff for restarting and fix failure count when
the maximum is 0

Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 8f67e34cba
Component: cli
2017-06-02 00:06:32 +00:00
8af77489b3 Move remote API config out of daemon/
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 9f2253c926
Component: cli
2017-06-02 00:06:32 +00:00
214134c5dd docker ps: introducing filters
* starting with filtering for exit codes. `docker ps -a --filter 'exited=1'`
* API doc for filter parameter
* formatting filters for help usage
* tweaks for review

This requires https://github.com/dotcloud/docker/pull/4430

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: b1aa5d84a7
Component: cli
2017-06-02 00:06:32 +00:00
5e62cf124c fix for issue 7281
add missing comma per O.S. Tezer's commment

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: d31f289d22
Component: cli
2017-06-02 00:06:32 +00:00
ffe707ea52 fix command output examples in cli documentation
f87a97f accidentally added a few too many `$` line prefixes

Docker-DCO-1.1-Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com> (github: phemmer)
Upstream-commit: 827784fc31
Component: cli
2017-06-02 00:06:32 +00:00
14d1356fcf Make it clear that JSON array format should be used if CMD is used as default arguments
Signed-off-by: Xuecong Liao <satorulogic@gmail.com>
Upstream-commit: e778875858
Component: cli
2017-06-02 00:06:32 +00:00