Commit Graph

23156 Commits

Author SHA1 Message Date
94abb34940 add support for filtering by network ID
This adds support for filtering by network ID, to be
consistent with other filter options.

Note that only *full* matches are returned; this is
consistent with other filters (e.g. volume), that
also return full matches only.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7c46ba02e694ae540866b29ebf0dab76e556cc13
Component: engine
2016-06-07 16:50:31 +02:00
4e024e3e7d Adding network filter to docker ps command
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
Upstream-commit: 912af1ae8f22c4d9d7e478d0985a40b41ded2027
Component: engine
2016-06-07 16:43:11 +02:00
3cb88d591b Fix TestRenameInvalidName
Change the test back to what it was before
e83dad090a1e890ac870808d776fa584276bf7ab

And added an extra test-case to check the
output if an incorrect number of arguments
is passed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 085f41b6a5764cba33fb5bda387f8ebe165d5828
Component: engine
2016-06-07 15:42:48 +02:00
593816f86f Merge pull request #23307 from WeiZhang555/cobra-restart
Migrate restart command to cobra
Upstream-commit: 88323c861a70f94b88870b7614bc91d2fdfd98e0
Component: engine
2016-06-07 15:28:35 +02:00
8dabf407a1 Merge pull request #23297 from WeiZhang555/cobra-kill
Migrate kill command to cobra
Upstream-commit: 4f9e2f9fb4a3b6594a8ae094eeb3494d6b6ef2f9
Component: engine
2016-06-07 13:44:22 +02:00
08ad8f3172 Merge pull request #23269 from vdemeester/migrate-import-to-cobra
Use spf13/cobra for docker import
Upstream-commit: f061f556f2d3819f293e76a434c8212d613eca6b
Component: engine
2016-06-07 13:07:30 +02:00
fcec050c14 Merge pull request #23236 from runcom/fix-spec
Fix spec and man
Upstream-commit: 8e63de1f63ac6bb8b0eefad4836599255d1eaea6
Component: engine
2016-06-07 12:54:42 +02:00
54aa4a7bec Merge pull request #22149 from vdemeester/deprecated-copy-endpoint
Deprecate /containers/(id or name)/copy endpoint
Upstream-commit: 148d2b8e4a7e4f669ba9e8db2adc2413fde27a07
Component: engine
2016-06-07 12:50:04 +02:00
582dec773d Merge pull request #23172 from michael-holzheu/PR-s390x-seccomp
Enable seccomp for s390x and ppc: s390x part
Upstream-commit: eb6b5a6448efe7a9450abb98f9a0ea1c4cf51913
Component: engine
2016-06-07 12:04:13 +02:00
5680e33f57 Migrate kill command to cobra
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 732f08a822567aedeb9c9b27a84d8028c9ebb365
Component: engine
2016-06-07 17:20:33 +08:00
118d1a775e Migrate restart command to cobra
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 264462d601ecd5d5e0d9e063e3d380a1e47d470a
Component: engine
2016-06-07 17:13:53 +08:00
5879215fd4 Merge pull request #23226 from HackToday/fixnetinspectId
Fix the network inspect id
Upstream-commit: f9021838b61f17b2de6c42e459a732652ee2d207
Component: engine
2016-06-07 10:02:17 +02:00
9b4d5c68b5 Merge pull request #23285 from yongtang/23211-spf13-cobra-pause
Use spf13/cobra for docker pause
Upstream-commit: 6d4a7213e66145552af31fa0c88aebdd70eb5700
Component: engine
2016-06-07 10:01:42 +02:00
ec9cb4d4e9 Merge pull request #23291 from yongtang/23211-spf13-cobra-history
Use spf13/cobra for docker history
Upstream-commit: 804536df25fb8b3819a42e88da4fc94b3e449000
Component: engine
2016-06-07 10:00:39 +02:00
d313694ba9 Merge pull request #23290 from yongtang/23211-spf13-cobra-rename
Use spf13/cobra for docker rename
Upstream-commit: e83dad090a1e890ac870808d776fa584276bf7ab
Component: engine
2016-06-07 08:28:27 +02:00
45b2203529 Fix a couple of typos in the docs of docker attach
This fix fixed a couple of typos in the docs of `docker attach`:
docs/reference/commandline/attach.md
man/docker-attach.1.md

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 2e506039ff9f6502670d42570f835c0d51fcda20
Component: engine
2016-06-06 19:06:50 -07:00
e6c6c92dca Merge pull request #23316 from dnephin/error_on_invalid_docker_host
Fix a panic when the DOCKER_HOST was invalid using cobra commands
Upstream-commit: c077d4cc1e2f888d645520d1f7f68619b2f85ecc
Component: engine
2016-06-06 21:17:47 -04:00
69e243a9fc Merge pull request #23274 from WeiZhang555/cobra-attach
Move attach command to cobra
Upstream-commit: ab821f9f9bf15cb7d356c6e48729f706807488db
Component: engine
2016-06-06 21:16:45 -04:00
61f6798519 Merge pull request #23323 from tiborvass/debug-ci
Cleanup
Upstream-commit: afc3cb03f4fc88f2826960a6ba3341a2b1ddeaef
Component: engine
2016-06-06 21:03:30 -04:00
3ff13f560e Merge pull request #22866 from jstarks/foreign_layers
Support layers from external URLs
Upstream-commit: 7d08f3a5ad16446952b9b461feb0895a5c73ea58
Component: engine
2016-06-07 00:27:40 +00:00
545244368d Cleanup
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: ccaea227e0e9356ab293610784b635c643e9a15e
Component: engine
2016-06-06 15:57:51 -07:00
83ae608b78 Use spf13/cobra for docker rename
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker rename` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 70f7ccb304f9246bc9c2bfe0e30d3a2bd8fd42f8
Component: engine
2016-06-06 12:39:11 -07:00
13b554cbab Use spf13/cobra for docker pause
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker pause` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 91731706c2c7d7efba78045ff8080f2b38d07c4f
Component: engine
2016-06-06 12:37:18 -07:00
9cd9d4349d ioutils: fix race in access closeErr in bytespipe
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: b32478488ce6d373e44bb8a6c9cb986c773ad48e
Component: engine
2016-06-06 11:29:47 -07:00
9d8e920601 Fix a panic when the DOCKER_HOST was invalid using cobra commands.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 90244abc5bfc3be3f97bef16f15079c4fb96c1ff
Component: engine
2016-06-06 14:17:04 -04:00
812d9d1e28 Merge pull request #23306 from yongtang/23211-spf13-cobra-top
Use spf13/cobra for docker top
Upstream-commit: 5ce2f14f9bd12f1a66ad8f6f75d82d8fa8adc5e0
Component: engine
2016-06-06 10:14:10 -07:00
0c22cb98b8 Merge pull request #23217 from clnperez/speedup-pushfail-tests
test trusted push: use a nonexistant hostname
Upstream-commit: 4f1c5772a8da16ac66fbf838b782af76fa4185a6
Component: engine
2016-06-06 10:12:42 -07:00
92cdf5f459 Merge pull request #23286 from yongtang/23211-spf13-cobra-port
Use spf13/cobra for docker port
Upstream-commit: 52da20b839f0de34c107ca80f3be1df89dcd698c
Component: engine
2016-06-06 18:55:37 +02:00
cfcc9cde2b Fix the network inspect id
This fixes #22231

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 864e362aa05ed2207d71471780068e951fe9d02e
Component: engine
2016-06-06 15:26:07 +00:00
6a387aef09 Use spf13/cobra for docker history
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker history` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a76d387cdaa0b44d7d2b7550c2eb4c0fc53e7a47
Component: engine
2016-06-06 08:03:07 -07:00
9a954be4f2 Move attach command to cobra.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: eceb8625a94e3504fca7b27d8156bcf11a93bf4f
Component: engine
2016-06-06 22:28:57 +08:00
0ca5072a60 Use spf13/cobra for docker top
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker top` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0f3866926763447c247bb24268923b5e50c006e1
Component: engine
2016-06-06 06:38:43 -07:00
1f876c8511 Use spf13/cobra for docker port
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker port` to use spf13/cobra

Note: As part of this fix, a new function `RequiresMinMaxArgs(min int, max int)`
has been added in cli/required.go. This function restrict the args
to be at least min and at most max.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d5971c230dc91fa8764dd5e9bc4124346ad06e02
Component: engine
2016-06-06 05:32:34 -07:00
5cb7befa00 Enable seccomp for s390x
To implement seccomp for s390x the following changes are required:

1) seccomp_default: Add s390 compat mode

   On s390x (64 bit) we can run s390 (32 bit) programs in 32 bit
   compat mode. Therefore add this information to arches().

2) seccomp_default: Use correct flags parameter for sys_clone on s390x

   On s390x the second parameter for the clone system call is the flags
   parameter. On all other architectures it is the first one.

   See kernel code kernel/fork.c:

   #elif defined(CONFIG_CLONE_BACKWARDS2)
   SYSCALL_DEFINE5(clone, unsigned long, newsp, unsigned long, clone_flags,
                   int __user *, parent_tidptr,

   So fix the docker default seccomp rule and check for the second
   parameter on s390/s390x.

3) seccomp_default: Add s390 specific syscalls

  For s390 we currently have three additional system calls that should
  be added to the seccomp whitelist:

  - Other architectures can read/write unprivileged from/to PCI MMIO memory.
    On s390 the instructions are privileged and therefore we need system
    calls for that purpose:

    * s390_pci_mmio_write()
    * s390_pci_mmio_read()

  - Runtime instrumentation:

    * s390_runtime_instr()

4) test_integration: Do not run seccomp default profile test on s390x

   The generated profile that we check in is for amd64 and i386
   architectures and does not work correctly on s390x.

   See also: 75385dc216e ("Do not run the seccomp tests that use
   default.json on non x86 architectures")

5) Dockerfile.s390x: Add "seccomp" to DOCKER_BUILDTAGS

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: bf2a577c131d8998eb6ecac986d80e1289e6c801
Component: engine
2016-06-06 08:13:22 -04:00
49b97bdc07 Use spf13/cobra for docker wait
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker wait` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 82f84a67d6d40d4a076927c618db475191f97da0
Component: engine
2016-06-06 05:09:41 -07:00
b9600bdf73 Fix TestDiffEmptyArgClientError O:)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7878705dcc26804b5f6a562410aecdb8f3485b91
Component: engine
2016-06-06 13:58:29 +02:00
c5eb1854fa Migrate import command to cobra
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9d2e8abd302ae72e4dd5bddf325eb921a9e73a1b
Component: engine
2016-06-06 13:58:23 +02:00
d04d755b65 Update cobra to 75205f23b3ea70dc7ae5e900d074e010c23c37e9
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ca01e57d55699ab9e30f120a1de9d00a477547ad
Component: engine
2016-06-06 13:58:18 +02:00
278d68e5ce Merge pull request #23210 from vdemeester/migrate-network-command-to-cobra
Use spf13/cobra for docker network and subcommands
Upstream-commit: 07a7c0632f7b1ae70b5261565742756b76df7402
Component: engine
2016-06-06 13:51:57 +02:00
d678f7748b Merge pull request #23129 from WeiZhang555/print-detailed-error
Print original error for `start`
Upstream-commit: 9d449d89f7949aea708125badfbaebc65440b98d
Component: engine
2016-06-06 13:43:52 +02:00
4be970b656 Merge pull request #23299 from albers/completion-dockerd-path
fix bash completion for dockerd invoked with path
Upstream-commit: 4b2b5214a46563caedab0c30314fe2c0e8849516
Component: engine
2016-06-06 13:40:15 +02:00
977029fee5 Merge pull request #23293 from mountkin/network-docs
docs: correct network create command
Upstream-commit: ac14aa11b6f9172c744affa9823d05fde721c5e0
Component: engine
2016-06-06 12:07:23 +02:00
3928864f0e Merge pull request #23295 from sdurrheimer/zsh-completion-search-limit
Add zsh completion for 'docker search --limit'
Upstream-commit: ab0c683f5db26a16c91687ac8798129ca0840b30
Component: engine
2016-06-06 11:46:57 +02:00
62fb401985 Migrate network command to cobra
- Migrates network command and subcommands (connect, create, disconnect,
  inspect, list and remove) to spf13/cobra
- Create a RequiredExactArgs helper function for command that require an
  exact number of arguments.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4bd202b00f7859ebeb4ba87511a0618ad08d0605
Component: engine
2016-06-06 10:28:52 +02:00
fd0727c3a3 Merge pull request #22077 from cpuguy83/remote_volplugin_caps
Add support for volume scopes
Upstream-commit: 28dde09cdf2a48dcdb6ce665cd2b912175dfb871
Component: engine
2016-06-06 10:15:43 +02:00
82bf916d89 fix bash completion for dockerd with path
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e8c67e8d8d8d4570d78e21eae02451f27a372f83
Component: engine
2016-06-06 10:01:15 +02:00
a515195bc2 Merge pull request #23098 from capkurmagati/23097-fix-zsh-completion-docker-rm-f
fixes #23097 zsh completion on `docker rm -f`
Upstream-commit: 3ac1787b7e60f0ee3d09f4fd1cd95b416dfe4ac0
Component: engine
2016-06-06 09:20:16 +02:00
b24dce4b03 Merge pull request #23284 from yongtang/23211-spf13-cobra-logs
Use spf13/cobra for docker logs
Upstream-commit: 731bae674965a3ae8a300d8e285927f993727bab
Component: engine
2016-06-06 09:06:51 +02:00
2d5dd957d0 Add zsh completion for 'docker search --limit'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 41f2183f8afe6c1ee8cf650a33bfb8ac0fb5f255
Component: engine
2016-06-06 09:05:22 +02:00
bbcce85205 Merge pull request #23283 from yongtang/23211-spf13-cobra-diff
Use spf13/cobra for docker diff
Upstream-commit: 2becfab55fd8ad6ec1d02aea3cd6498a2f91ef68
Component: engine
2016-06-06 09:05:18 +02:00