toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,947 Commits 3 Branches 295 Tags
ae18180fac82e885cc14d0906fb9239cd8462bbc
Commit Graph
16947 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Murdaca f215de06a3 Refactor missed dockerCmd changes 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: bd328da55549dd71b3c24f27c660f1c26f277c15
Component: engine
 2015-07-20 20:55:57 +02:00
Antonio Murdaca 09a470656b Remove reference to docker/libcontainer 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 691e3a3e7070ca43a9ad8f5f99c2563ccdce98a5
Component: engine
 2015-07-20 20:30:22 +02:00
Harald Albers 62e6e49ea2 Driver-specific completions for --log-opt 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: faa8b658e7e7a0e827cf7e05f64dcd2e843452ac
Component: engine
 2015-07-20 20:24:01 +02:00
Sevki Hasirci 27f60d9502 fix mixed typo TlS -> TLS 
Signed-off-by: Sevki Hasirci <s@sevki.org>
Upstream-commit: ce3156f1ebab0857b686682b317410f0eb27f6d5
Component: engine
 2015-07-20 21:14:45 +03:00
Harald Albers b663092054 Add missing log drivers to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e09d0febe644f440e95a7a87e6fdfae8104743d6
Component: engine
 2015-07-20 20:13:59 +02:00
Sevki Hasirci e13211498b golint fix TLs->TLS in docker/ 
Signed-off-by: Sevki Hasirci <s@sevki.org>
Upstream-commit: 16ea3cf3a3cd0ce19f6c55138992442cd6cfddc8
Component: engine
 2015-07-20 20:50:03 +03:00
David Calavera e45c5f53f4 Merge pull request #14746 from jfrazelle/remove-rhel-centos-6-rpm 
remove centos/rhel 6 from rpm builder
Upstream-commit: 46cbfcb168e046041fe79f8294223402d7396021
Component: engine
 2015-07-20 10:44:18 -07:00
David Calavera 42d9d20733 Merge pull request #14741 from HuKeping/ci-refactor 
CI: use dockercmd when possible
Upstream-commit: fc2f90fc63014db95fd9d9052218d72d5ca1d82c
Component: engine
 2015-07-20 09:49:40 -07:00
Hu Keping 56aba58eb4 CI: use dockercmd when possible 
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 27ac154d05cf9f7aa1e9cbebe3c7769fa746de1e
Component: engine
 2015-07-21 04:40:15 +08:00
David Calavera f5db7bfda7 Merge pull request #14671 from hqhq/hq_use_dockerCmd 
Use dockerCmd when possible
Upstream-commit: ee7af0d2cbefac944bcad387a1dad65cf70691aa
Component: engine
 2015-07-20 09:44:42 -07:00
Dan Walsh 923a8e8307 Fix man pages 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 732141442affc096342801900641d9b303c24dbc
Component: engine
 2015-07-20 11:47:59 -04:00
Tibor Vass 308bd57d37 Merge pull request #14716 from LK4D4/update_libcontainer 
Update libcontainer to v0.0.2
Upstream-commit: 77bbee3d00fd32f0843e4dc9bb12d366883222b5
Component: engine
 2015-07-20 11:33:19 -04:00
Antonio Murdaca 45b325ef2e Merge pull request #14724 from coolljt0725/14603-dockerCmd-integration-cli-3 
Refactor: use dockerCmd when possible in integraiton-cli tests
Upstream-commit: c6a3517246f8b94158270f68955d966f902c8ab0
Component: engine
 2015-07-20 16:00:38 +02:00
Vincent Bernat 0be39dfb3a 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>
Upstream-commit: 3a1596f0f5e004f59b0d140b728ca255206ef68f
Component: engine
 2015-07-20 14:25:48 +02:00
Sebastiaan van Stijn 9a4caf4c8f Merge pull request #14614 from hqhq/hq_simplify_swappiness 
Simplify swappiness check
Upstream-commit: 46d7762f26adcb51b29538ec81cb29ef0e3e626e
Component: engine
 2015-07-20 13:51:39 +02:00
Qiang Huang da9ff50d73 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>
Upstream-commit: 6f8ddec1d0e67058c7a4a15c7d4d9a75bc1e5dea
Component: engine
 2015-07-20 16:10:10 +08:00
Qiang Huang 0b00c6ae1a 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>
Upstream-commit: 668e2369cc5d57d634d0e559241ea4c4cbde65d8
Component: engine
 2015-07-20 14:55:40 +08:00
Lei 9e76137f40 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>
Upstream-commit: eef6eda7d295a7577bdbe2e4630ce3350c6d7701
Component: engine
 2015-07-20 14:44:22 +08:00
Sven Dowideit 2591c62680 Merge pull request #14747 from moxiegirl/update-docs-dockerfile 
Updating to use the new base
Upstream-commit: 008d57bf7f8c70a11f194d1cfaf940775534c278
Component: engine
 2015-07-20 12:00:02 +10:00
Ankush Agarwal 691236dacd Add support for 15.04, add systemd note for 15.04 
Fixes #12002

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 9847c0c8b0409d85a1f79a8d7316ba48d6a3ef9a
Component: engine
 2015-07-19 18:33:55 -07:00
Mary Anthony e8c2670622 Updating to use the new base 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e0bceb70647499ec3660204731a1b42ced927492
Component: engine
 2015-07-19 15:39:43 -07:00
Jessica Frazelle 30e998cb02 remove centos6 from rpm builder 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: af5fb9b7d0722783d6ffcc9d36e36e158d1b84b0
Component: engine
 2015-07-19 14:30:48 -07:00
Arnaud Porterie 6212ad7f28 Merge pull request #14715 from icecrime/14365_remove_rhel6_from_docs 
Update RHEL/Centos/Fedora installation docs
Upstream-commit: ccc78c9968b6cfd6cdf85c28953453c2cd0aa95b
Component: engine
 2015-07-19 13:00:50 -07:00
Tobias Gesellchen d824694b36 add gradle-docker-plugin, update docker-client url 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Upstream-commit: a51684ff8f44a8c54a8724847fe345487f478d14
Component: engine
 2015-07-19 21:28:11 +02:00
Tobias Gesellchen e480c92f68 remove unused row-even and row-odd css classes 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Upstream-commit: 38e7069668e4a690bd47108db26f8d6f9966e414
Component: engine
 2015-07-19 21:27:12 +02:00
Charles Chan c651defcad Issue #14433 
Try to improve the cache behavior for `ADD` and `COPY` commands.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 08d5424c049dd67119cf0019ccb7fbc58bf27ec2
Component: engine
 2015-07-19 12:19:28 -07:00
moxiegirl a68f23c05d Merge pull request #14676 from duglin/Issue14675 
Add missing 'Names' field to /containers/json API output
Upstream-commit: 32764fe3b907dfe4d3e833c19fc605859adba47e
Component: engine
 2015-07-19 06:53:25 -07:00
evalle 46887eda31 Fixing ubuntu doc issue 
Signed-off-by: evalle <shmarnev@gmail.com>
Upstream-commit: 120c21c97c5cb83bc2384d3b76faf949c67db0a2
Component: engine
 2015-07-18 18:24:45 +02:00
Sebastiaan van Stijn 2138eae5bf Merge pull request #14667 from charleswhchan/patch-5 
Trim excess from image. Based on the context, the email itself is sufficient.
Upstream-commit: a89370039a65f235d3dde5d36f20d0f463c615e9
Component: engine
 2015-07-18 11:14:28 +02:00
Lei 4c5a8b7b16 Add dockerCmdWithStdoutStderr function 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: c6cde91b7d2cb3671dc55cafc5ab693f9cb17cc8
Component: engine
 2015-07-18 10:48:28 +08:00
Alexander Morozov f610796e09 Merge pull request #14722 from duglin/FixInspectExecIDTest 
Move inspect into the loop on InspectExecID test
Upstream-commit: a0a0b8499e068c5c9a4caf5bab83d39ddd362078
Component: engine
 2015-07-17 18:21:49 -07:00
Doug Davis 68f2260858 Move inspect into the loop on InspectExecID test 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: f06620ece3557eb263b221e476cef2955235ba75
Component: engine
 2015-07-17 17:30:24 -07:00
David Calavera 4cbf8e8120 Merge pull request #13681 from tiborvass/carry-11784 
Carry 11784: rmi dangling is unsafe when pulling
Upstream-commit: 7f353a11e4d40d08d1bd15df24c87a95d8cd9a02
Component: engine
 2015-07-17 16:17:18 -07:00
Alexander Morozov d9c672b3bd Update libcontainer to v0.0.2 
This is fix for proper setup of nested containers cgroups.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f0f261a899acf3c11d01c97e2503ec0ddb200232
Component: engine
 2015-07-17 15:05:17 -07:00
Jessie Frazelle a752ea3772 Merge pull request #14706 from duglin/FixInspectTest 
Fix InspectExecID test
Upstream-commit: 465192cb2885acfe71509827ff2011042e0c99b9
Component: engine
 2015-07-17 14:37:23 -07:00
Arnaud Porterie 428f8fb7db Update RHEL/Centos/Fedora installation docs 
Remove mentions of older systems.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 340bd135ddf9a053dc6106a874e70e021a9e6acb
Component: engine
 2015-07-17 14:04:19 -07:00
Sebastiaan van Stijn c4955551ce Merge pull request #11485 from wlan0/rollover_log 
Add rollover log driver, and --log-driver-opts flag
Upstream-commit: 415f744d0c5980d332ab54c80f1521a0e5b4d401
Component: engine
 2015-07-17 22:41:26 +02:00
Arnaud Porterie 6e2e8208f2 Merge pull request #14413 from vbatts/vbatts-graph-cleanup 
graph: comment clarification about shadowed `err`
Upstream-commit: a192105d3b377ecb55f352a42079063f0d8f053f
Component: engine
 2015-07-17 13:39:27 -07:00
Doug Davis a9efb7a3af Remove panic in nat package on invalid hostport 
Closes #14621

This one grew to be much more than I expected so here's the story... :-)
- when a bad port string (e.g. xxx80) is passed into container.create()
  via the API it wasn't being checked until we tried to start the container.
- While starting the container we trid to parse 'xxx80' in nat.Int()
  and would panic on the strconv.ParseUint().  We should (almost) never panic.
- In trying to remove the panic I decided to make it so that we, instead,
  checked the string during the NewPort() constructor.  This means that
  I had to change all casts from 'string' to 'Port' to use NewPort() instead.
  Which is a good thing anyway, people shouldn't assume they know the
  internal format of types like that, in general.
- This meant I had to go and add error checks on all calls to NewPort().
  To avoid changing the testcases too much I create newPortNoError() **JUST**
  for the testcase uses where we know the port string is ok.
- After all of that I then went back and added a check during container.create()
  to check the port string so we'll report the error as soon as we get the
  data.
- If, somehow, the bad string does get into the metadata we will generate
  an error during container.start() but I can't test for that because
  the container.create() catches it now.  But I did add a testcase for that.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 12b6083c8f82db7e5db4c683cfe20151731ea851
Component: engine
 2015-07-17 13:02:54 -07:00
Arnaud Porterie 8a425b30fb Merge pull request #14693 from LK4D4/update_libcontainer 
Update libcontainer
Upstream-commit: 98ed9a55f42f7c86c7c9cddb27f6807e7e77c889
Component: engine
 2015-07-17 13:02:04 -07:00
David Calavera 63fd915fb7 Merge pull request #13680 from jfrazelle/new-apt-yum-repos 
WIP: new apt yum repos for release scripts
Upstream-commit: 25d9f38852173950a4a4192746a56bef39b24fd9
Component: engine
 2015-07-17 12:29:21 -07:00
Sebastiaan van Stijn 4daf251bed Merge pull request #13951 from calavera/plugins_path 
Separate plugin sockets and specs.
Upstream-commit: a763637eae7dcf5d870e9d035be5baf94d72e2c5
Component: engine
 2015-07-17 21:11:31 +02:00
Brian Goff 2d196d14b3 Merge pull request #14709 from rhvgoyal/base-size-100G 
devicemapper: Change default basesize to 100G
Upstream-commit: e939a3003910c705a662e53ee3c47aa718d25fa1
Component: engine
 2015-07-17 12:41:28 -04:00
Brian Goff b8696f7d26 Merge pull request #14685 from Microsoft/10662-revendorhcsshim 
Windows: Revendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
Upstream-commit: fb34537a9963b3fc3aa9c74046becbc90a1cba07
Component: engine
 2015-07-17 12:31:58 -04:00
Jessie Frazelle 124ac833af Merge pull request #14708 from icecrime/14445_remove_workflow_from_maintainers 
Remove reviewing process from MAINTAINERS
Upstream-commit: 97be366961ed31dd399d8cbb9f576a4a4e2a3f2b
Component: engine
 2015-07-17 09:03:53 -07:00
Ma Shimiao 371476f565 fix 8926: rmi dangling is unsafe when pulling 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 1b67c38f6f4a709e1d159445b56f0beee8cfad3a
Component: engine
 2015-07-17 11:39:57 -04:00
David Calavera 0bd2cb4373 Merge pull request #14445 from icecrime/reviewing_process_and_labels 
Document and adjust reviewing process and labels
Upstream-commit: ff05f9c285175eedfb663e0d4b7bd7cca29d7be3
Component: engine
 2015-07-17 08:25:41 -07:00
David Calavera 4b2f3f5f76 Merge pull request #14605 from brahmaroutu/gccgo_scheduler 
Go Scheduler issue with sync.Mutex
Upstream-commit: 7b83b0e15c4507871ed411aca5610aa7da751bd9
Component: engine
 2015-07-17 08:16:32 -07:00
Vivek Goyal 5fc55316cd devicemapper: Change default basesize to 100G 
Current default basesize is 10G. Change it to 100G. Reason being that for
some people 10G is turning out to be too small and we don't have capabilities
to grow it dyamically.

This is just overcommitting and no real space is allocated till container
actually writes data. And this is no different then fs based graphdrivers
where virtual size of a container root is unlimited.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 424d5e55a2f863b8eadab578e3ba647de09a4354
Component: engine
 2015-07-17 11:10:23 -04:00
Brian Goff 621d0f422a Merge pull request #14701 from charleswhchan/patch-6 
Add missing space
Upstream-commit: b900aaac46ec9a34a18d24bfa1072f46030da930
Component: engine
 2015-07-17 10:42:48 -04:00