Commit Graph
36672 Commits
Author SHA1 Message Date
Alexander Morozov 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
Vincent Demeester c3c70cc91a Merge pull request #23286 from yongtang/23211-spf13-cobra-port
Use spf13/cobra for docker port
Upstream-commit: 2002063bf2
Component: cli
2016-06-06 18:55:37 +02:00
Vincent Demeester 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
Kai Qiang Wu(Kennan) 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
Yong Tang f8e3edcba2 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: 0090463cab
Component: cli
2016-06-06 08:03:07 -07:00
Yong Tang 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
Zhang Wei a3b1f76002 Move attach command to cobra.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 096f7f72bf
Component: cli
2016-06-06 22:28:57 +08:00
Zhang Wei 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
Vincent Demeester 46902010b1 Merge pull request #23287 from yongtang/23211-spf13-cobra-wait
Use spf13/cobra for docker wait
Upstream-commit: 7a0628e01d72c9caa28e4daaab3d259944e1dfb3
Component: engine
2016-06-06 16:08:40 +02:00
Yong Tang fb1223adc0 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: 6829d53a08
Component: cli
2016-06-06 06:38:43 -07:00
Yong Tang 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
Yong Tang b6dfddf0e2 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: c289179c99
Component: cli
2016-06-06 05:32:34 -07:00
Yong Tang 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
Sebastiaan van Stijn a49a6cbc00 network docs cleanup
This fixes some Markup and formatting
issues in the network documentation;

- wrap text to 80 chars
- add missing language hints for code examples
- add missing line continuations (\)
- update USAGE output for Cobra

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: feabf71dc1cd5757093c5887b463a6cbcdd83cc2
Component: engine
2016-06-06 14:20:41 +02:00
Michael Holzheu 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
Yong Tang 3075856642 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: b4421407a0
Component: cli
2016-06-06 05:09:41 -07:00
Yong Tang 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
Vincent Demeester 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
Vincent Demeester afe109a57d Migrate import command to cobra
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: bbf4cd7b56
Component: cli
2016-06-06 13:58:23 +02:00
Vincent Demeester 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
Vincent Demeester 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
Sebastiaan van Stijn 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
Vincent Demeester 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
Vincent Demeester 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Vincent Demeester 231ae1a7df 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: fac425608a
Component: cli
2016-06-06 10:28:52 +02:00
Vincent Demeester 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
Vincent Demeester 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
Harald Albers 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
Vincent Demeester 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
Vincent Demeester 795d56105b Merge pull request #23284 from yongtang/23211-spf13-cobra-logs
Use spf13/cobra for docker logs
Upstream-commit: c23f4c9b48
Component: cli
2016-06-06 09:06:51 +02:00
Vincent Demeester 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
Steve Durrheimer 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
Vincent Demeester 56191eeebf Merge pull request #23283 from yongtang/23211-spf13-cobra-diff
Use spf13/cobra for docker diff
Upstream-commit: 168b0d7f98
Component: cli
2016-06-06 09:05:18 +02:00
Vincent Demeester 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
Vincent Demeester a8c6900c5e Merge pull request #23268 from WeiZhang555/cobra-start
Migrate start command to cobra
Upstream-commit: dd2c65392f
Component: cli
2016-06-06 08:59:42 +02:00
Vincent Demeester 787bdacdff Merge pull request #23268 from WeiZhang555/cobra-start
Migrate start command to cobra
Upstream-commit: c35d9f2611c4b1e43403010210708d9c50b838db
Component: engine
2016-06-06 08:59:42 +02:00
Shijiang Wei f0fedf722a docs: correct network create command
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 041aad6d7200a5b53204d95e9cc5505bf4d201cf
Component: engine
2016-06-06 13:50:29 +08:00
Vincent Demeester f3da357c3a Merge pull request #23279 from yongtang/23211-spf13-cobra-unpause
Use spf13/cobra for docker unpause
Upstream-commit: b70dd0e04c621dc524397b0ef4583667b92df42c
Component: engine
2016-06-06 05:17:59 +02:00
Zhang Wei 87f6d1f046 Bug fix: docker run -i --restart always hangs.
e.g.
```
$ docker run -i --restart always busybox sh
pwd
/
exit 11

<...hang...>
```

This is because Attach(daemon side) and Run(client side) both hangs on
WaitStop, if container is restarted too quickly, wait won't have chance
to get exit signal.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: c498d4700df8216ccefd6d2f03b5ebe6d6e9fd47
Component: engine
2016-06-06 10:16:07 +08:00
Zhang Wei 3a2d4ddfd6 Log and print original error for start
Currently `start` will hide some errors and throw a consolidated error,
which will make it hard to debug because developer can't find the
original error.

This commit allow daemon to log original errors first.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: b4740e3021a39a502ffc82f0f70e9b7ed2f0875f
Component: engine
2016-06-06 10:13:49 +08:00
Zhang Wei 91b39330c0 Migrate start command to cobra
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 217e98c710
Component: cli
2016-06-06 09:53:18 +08:00
Zhang Wei 33bb9696ad Migrate start command to cobra
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 4f3625a2889aef4ea97e366fa0ed1e2383dd3aad
Component: engine
2016-06-06 09:53:18 +08:00
Yong Tang 3b0881ed77 Use spf13/cobra for docker unpause
This fix is part of the effort to convert commands to spf13/cobra #23211.

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

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 316ab12eed
Component: cli
2016-06-05 17:29:52 -07:00
Yong Tang 3fc5fabb4a Use spf13/cobra for docker unpause
This fix is part of the effort to convert commands to spf13/cobra #23211.

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

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 8ea7733a6390a67d6981888b857ab78b11c4c076
Component: engine
2016-06-05 17:29:52 -07:00
Yong Tang fd4182f4a4 Use spf13/cobra for docker logs
This fix is part of the effort to convert commands to spf13/cobra #23211.

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

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a5c6af94b1
Component: cli
2016-06-05 15:51:35 -07:00
Yong Tang 58f3ee3285 Use spf13/cobra for docker logs
This fix is part of the effort to convert commands to spf13/cobra #23211.

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

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4f4b59cc435fbfef236017f3aa36145c1187426b
Component: engine
2016-06-05 15:51:35 -07:00
Alexander Morozov 03f6e5fc67 Merge pull request #23242 from vdemeester/migrate-rmi-to-cobra
Use spf13/cobra for docker rmi
Upstream-commit: e94be2f639804c5223ebb127faec845683410eb1
Component: engine
2016-06-05 15:29:01 -07:00
Yong Tang c16e4d5a76 Use spf13/cobra for docker diff
This fix is part of the effort to convert commands to spf13/cobra #23211.

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

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 65fed1bca2
Component: cli
2016-06-05 15:13:55 -07:00