Harald Albers
d5aeb3398b
Second level completions for --log-opt
...
Advanced completion for some log driver options:
gelf-address, syslog-address, syslog-facility.
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-21 08:25:14 +02:00
Sven Dowideit
2eda00c861
Merge pull request #14757 from rhatdan/man
...
Fix man pages
2015-07-21 16:08:02 +10:00
Brian Goff
d241d2f36c
vendor fsnotify
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-07-20 22:47:03 -04:00
David Calavera
37209190c7
Docker ps custom formatting.
...
Docker-DCO-1.1-Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-20 22:46:55 -04:00
Jeff Mickey
de0e883331
docker ps: add fields for ordering and column selection
...
* api/client/ps.go: Refactor CmdPs to use a fields list of
characters to determine which columns to print on `docker ps`
invocation.
This adds an ability for the docker command to print the columns of
output in arbitrary order.
Signed-off-by: Jeff Mickey <j@codemac.net>
Docker-DCO-1.1-Signed-off-by: Jeff Mickey <j@codemac.net>
2015-07-20 22:45:21 -04:00
Tibor Vass
efd56bbe6f
Merge pull request #14779 from duglin/BetterErrMsg14774
...
Add better output for TestLinksEtcHostsContentMatch to help debug #14774
2015-07-20 20:40:06 -04:00
Doug Davis
4d0990a753
Merge pull request #14762 from LK4D4/lint_reexec
...
Add docstring to reexec.Command
2015-07-20 20:37:27 -04:00
Antonio Murdaca
4c0fb85729
Merge pull request #14776 from MHBauer/cliconfig-lint
...
golint fixes for cliconfig
2015-07-21 02:22:09 +02:00
Doug Davis
09a3b57f94
Merge pull request #14775 from runcom/move-nat-tests
...
move nat tests from container's unit test to nat's ones
2015-07-20 20:06:34 -04:00
Alexander Morozov
9738b9319b
Add docstring to reexec.Command
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-20 17:00:18 -07:00
Morgan Bauer
dea49b7474
golint for cliconfig
...
- fully capitalize HTTP in HTTPHeaders
- comment for CONFIGFILE
- camelcase and privatize oldConfigfile, defaultIndexserver
- remove unused var errConfigFileMissing
- comments for methods and functions throughout
- external references to renamed variables changed
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-07-20 16:48:58 -07:00
Doug Davis
6751a49d14
Add better output for TestLinksEtcHostsContentMatch to help debug #14774
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-20 16:46:51 -07:00
Sebastiaan van Stijn
18ca5d7c0e
Remove reference to CENTOS6 from generate script
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-07-21 01:21:33 +02:00
Antonio Murdaca
37d737fc2c
Merge pull request #14691 from Microsoft/10662-start
...
Windows: hostconfig on start
2015-07-21 00:52:19 +02:00
Antonio Murdaca
f2aff58483
move nat tests from container's unit test to nat's ones
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-21 00:29:24 +02:00
Arnaud Porterie
cc7fe0d2d9
Merge pull request #14771 from Microsoft/10662-image2image
...
Fixing Image struct to no longer use Graph.
2015-07-20 15:25:06 -07:00
Sebastiaan van Stijn
8b7923620a
Merge pull request #14768 from fredlf/style-guide-edits
...
Small edits and clean up
2015-07-21 00:23:56 +02:00
John Howard
9001ea26e7
Fixing Image struct to no longer use Graph.
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-20 13:59:53 -07:00
David Calavera
bd8386c127
Merge pull request #14764 from sevki/14756-lint
...
golint fix TLs->TLS in docker/
2015-07-20 13:19:42 -07:00
Harald Albers
38acec94c4
Completion: Add support for '=' in arguments to __docker_pos_first_nonflag
...
This solves several problems that arise from the special treatment of
"=" in Bash.
The fix was required as some log drivers have options in a key=value
form. It also addresses the --option=value and the negated boolean syntax
(--boolean=false).
Note that this is not a general fix for these problems, it is limited to
the __docker_pos_first_nonflag function.
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-20 21:22:56 +02:00
Fred Lifton
6609cfb5e7
Small edits and clean up
...
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2015-07-20 11:59:48 -07:00
Antonio Murdaca
bd328da555
Refactor missed dockerCmd changes
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-20 20:55:57 +02:00
Antonio Murdaca
691e3a3e70
Remove reference to docker/libcontainer
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-20 20:30:22 +02:00
Harald Albers
faa8b658e7
Driver-specific completions for --log-opt
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-20 20:24:01 +02:00
Sevki Hasirci
ce3156f1eb
fix mixed typo TlS -> TLS
...
Signed-off-by: Sevki Hasirci <s@sevki.org>
2015-07-20 21:14:45 +03:00
Harald Albers
e09d0febe6
Add missing log drivers to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-20 20:13:59 +02:00
Sevki Hasirci
16ea3cf3a3
golint fix TLs->TLS in docker/
...
Signed-off-by: Sevki Hasirci <s@sevki.org>
2015-07-20 20:50:03 +03:00
David Calavera
46cbfcb168
Merge pull request #14746 from jfrazelle/remove-rhel-centos-6-rpm
...
remove centos/rhel 6 from rpm builder
2015-07-20 10:44:18 -07:00
David Calavera
fc2f90fc63
Merge pull request #14741 from HuKeping/ci-refactor
...
CI: use dockercmd when possible
2015-07-20 09:49:40 -07:00
Hu Keping
27ac154d05
CI: use dockercmd when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-07-21 04:40:15 +08:00
David Calavera
ee7af0d2cb
Merge pull request #14671 from hqhq/hq_use_dockerCmd
...
Use dockerCmd when possible
2015-07-20 09:44:42 -07:00
Dan Walsh
732141442a
Fix man pages
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-07-20 11:47:59 -04:00
Tibor Vass
77bbee3d00
Merge pull request #14716 from LK4D4/update_libcontainer
...
Update libcontainer to v0.0.2
2015-07-20 11:33:19 -04:00
Antonio Murdaca
c6a3517246
Merge pull request #14724 from coolljt0725/14603-dockerCmd-integration-cli-3
...
Refactor: use dockerCmd when possible in integraiton-cli tests
2015-07-20 16:00:38 +02:00
Flavio Castelli
f95b3a6b6a
ZFS driver: raise better errors during init
...
The ZFS driver should raise proper errors when the ZFS utility is
missing or when there's no zfs partition active on the system. Raising the
proper errors make possible to silently ignore the ZFS storage
driver when no default storage driver is specified.
Previous to this commit it was no longer possible to start the
docker daemon in that way:
docker -d --storage-opt dm.loopdatasize=2GB
The above command resulted in an exit error because the ZFS driver
tried to use the storage options.
Signed-off-by: Flavio Castelli <fcastelli@suse.com>
2015-07-20 15:24:48 +02:00
Vincent Bernat
3a1596f0f5
zsh: update zsh completion for docker command
...
zsh completion is updated with the content of
felixr/docker-zsh-completion.
- felixr/docker-zsh-completion@a93e1cb7bd Fix completion of repositories with tags
- felixr/docker-zsh-completion@590ea70596 Respect provided `--host` flag when invoking docker
- felixr/docker-zsh-completion@6c557babaa Several cosmetic improvements
- felixr/docker-zsh-completion@5b63cc591a Update completion for `inspect`
- felixr/docker-zsh-completion@b7d8f2f7cc Order completions alphabetically
- felixr/docker-zsh-completion@63f6a06224 Factor completion for `build`, `create` and `run`
- felixr/docker-zsh-completion@ade49ee47f Enforce positional arguments being last
- felixr/docker-zsh-completion@850b6b6d95 Update completion for build/commit/export/exec/history/import
- felixr/docker-zsh-completion@01bfd8c075 Remove completion for `insert` and duplicate of `import`
- felixr/docker-zsh-completion@c64a1d730a Update completion for `stats` to add `--no-stream` flag
- felixr/docker-zsh-completion@5e81d78b52 Update completion for `log` to add `--since` flag
- felixr/docker-zsh-completion@b3c146a1a2 Update completion for `run` to add `--group-add` flag
- felixr/docker-zsh-completion@8d4f196ad8 Don't trigger expensive completion function for flags
- felixr/docker-zsh-completion@bd5aaa124d Add completion for `--help` everywhere
- felixr/docker-zsh-completion@3a67a0e8c4 Return appropriate status code on completion
- felixr/docker-zsh-completion@4dfcb450ea Add Steve as a regular contributor.
- felixr/docker-zsh-completion@996a1c6def Add completion for top-level flags
- felixr/docker-zsh-completion@b6df75905f Ensure short/long option are not allowed twice
- felixr/docker-zsh-completion@75b6a500a0 Complete repositories with tags only on repository match
- felixr/docker-zsh-completion@5e6292135f Factorize completion of images/repositories/tags
- felixr/docker-zsh-completion@1c504eb677 Handle repositories with ":"
- felixr/docker-zsh-completion@0a05bf818b Update completion for `pause' and `unpause'
- felixr/docker-zsh-completion@b3a63253e2 Containers name can include Swarm host
In summary:
- Swarm support
- Handling repositories with ":"
- Rework how completion of images/repositories/tags work:
- felixr/docker-zsh-completion@5e6292135f
- felixr/docker-zsh-completion@75b6a500a0
- felixr/docker-zsh-completion@a93e1cb7bd
The remaining changes are here to sync changes done in Docker repository
(mostly from PR #14074 and #14555 , by @sdurrheimer). With some minor changes:
- boolean flags don't complete their arguments (true/false)
- reuse of `--host` argument is done with `$opt_arg` to avoid parsing
error
- build/create/run common options are factorized out
- `--help` flag is handled differently
- `pause` and `unpause` accepts several containers as far as I know, so
the change is reverted
- some more, but difficult to notice (more completion for some flags I think)
Some labels are reverted, mostly because I did the merge by copy/pasting
new options instead of modifying existing options.
This commit is partial. The way the `--help` option is handled triggered
a major change due to the way things are quoted. Those changes were
partially and programmaticaly reverted in this commit only to minimize
the changes to review. The next commit will restore the full changes.
Signed-off-by: Vincent Bernat <vincent@bernat.im>
2015-07-20 14:25:48 +02:00
Sebastiaan van Stijn
46d7762f26
Merge pull request #14614 from hqhq/hq_simplify_swappiness
...
Simplify swappiness check
2015-07-20 13:51:39 +02:00
Qiang Huang
6f8ddec1d0
Simplify swappiness check
...
As suggested in https://github.com/docker/docker/pull/14004/files#r34022527
The concern there is we can't differentiate whether user explicitly
asked for an invalid value of -1 or he did not specify anything.
I don't think this would be a problem, because:
- like all other default values like zero, we can't differentiate
user specify it or not, most of which, zeros are also invalid, so
default is default, we show these default values in help info,
so users would know if they set value as default, it'll be like
they set nothing.
- we can't do this kind of string check in REST api request, so
it'll make the behave different from docker command and RESTapi.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-20 16:10:10 +08:00
Qiang Huang
668e2369cc
dockerCmd when possible
...
Addresses: #14603
integration-cli/docker_cli_daemon_experimental_test.go (hqhq)
integration-cli/docker_cli_daemon_test.go (hqhq)
integration-cli/docker_cli_diff_test.go (hqhq)
integration-cli/docker_cli_events_test.go (hqhq)
integration-cli/docker_cli_events_unix_test.go (hqhq)
integration-cli/docker_cli_exec_test.go (hqhq)
integration-cli/docker_cli_exec_unix_test.go (hqhq)
integration-cli/docker_cli_experimental_test.go (hqhq)
integration-cli/docker_cli_export_import_test.go (hqhq)
integration-cli/docker_cli_help_test.go (hqhq)
integration-cli/docker_cli_history_test.go (hqhq)
integration-cli/docker_cli_images_test.go (hqhq)
integration-cli/docker_cli_import_test.go (hqhq)
integration-cli/docker_cli_info_test.go (hqhq)
integration-cli/docker_cli_inspect_test.go (hqhq)
integration-cli/docker_cli_kill_test.go (hqhq)
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-20 14:55:40 +08:00
Lei
eef6eda7d2
Recfactor: Use dockerCmd when possible in integration-cli tests
...
Part of #14603
integration-cli/docker_cli_links_test.go (coolljt0725)
integration-cli/docker_cli_links_unix_test.go (coolljt0725)
integration-cli/docker_cli_logs_test.go (coolljt0725)
integration-cli/docker_cli_nat_test.go (coolljt0725)
integration-cli/docker_cli_network_test.go (coolljt0725)
integration-cli/docker_cli_stats_test.go (coolljt0725)
integration-cli/docker_cli_tag_test.go (coolljt0725)
integration-cli/docker_cli_top_test.go (coolljt0725)
integration-cli/docker_cli_version_test.go (coolljt0725)
integration-cli/docker_cli_wait_test.go (coolljt0725
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-07-20 14:44:22 +08:00
Sven Dowideit
008d57bf7f
Merge pull request #14747 from moxiegirl/update-docs-dockerfile
...
Updating to use the new base
2015-07-20 12:00:02 +10:00
Ankush Agarwal
9847c0c8b0
Add support for 15.04, add systemd note for 15.04
...
Fixes #12002
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-07-19 18:33:55 -07:00
Mary Anthony
e0bceb7064
Updating to use the new base
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-19 15:39:43 -07:00
Jessica Frazelle
af5fb9b7d0
remove centos6 from rpm builder
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-19 14:30:48 -07:00
Arnaud Porterie
ccc78c9968
Merge pull request #14715 from icecrime/14365_remove_rhel6_from_docs
...
Update RHEL/Centos/Fedora installation docs
2015-07-19 13:00:50 -07:00
Tobias Gesellchen
a51684ff8f
add gradle-docker-plugin, update docker-client url
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-07-19 21:28:11 +02:00
Tobias Gesellchen
38e7069668
remove unused row-even and row-odd css classes
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-07-19 21:27:12 +02:00
Charles Chan
08d5424c04
Issue #14433
...
Try to improve the cache behavior for `ADD` and `COPY` commands.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-07-19 12:19:28 -07:00
moxiegirl
32764fe3b9
Merge pull request #14676 from duglin/Issue14675
...
Add missing 'Names' field to /containers/json API output
2015-07-19 06:53:25 -07:00
evalle
120c21c97c
Fixing ubuntu doc issue
...
Signed-off-by: evalle <shmarnev@gmail.com>
2015-07-18 18:24:45 +02:00