toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,981 Commits 3 Branches 295 Tags
6d357aac9cb3c1ef17c51a2a121ba62d2599c6fa
Commit Graph
18981 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jess Frazelle 6d357aac9c Merge pull request #16221 from flavio/get-docker-update-suse-installation 
Update SUSE/openSUSE installation script
Upstream-commit: b22f89cb770ca54e219cb7c5aac590b13ed606d1
Component: engine
 2015-10-14 13:02:45 -07:00
Flavio Castelli 7ca814e803 Update SUSE/openSUSE installation script 
Fix installation on SUSE Linux Enterprise machine, the updated Docker RPMs have
been moved to a different location.

Update both openSUSE and SUSE Linux Enterprise scripts to allow the
installation of experimental builds.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
Upstream-commit: 400ac8a66cf3c40f162153dcecd44b4fa8e3453f
Component: engine
 2015-10-14 20:55:28 +02:00
Sebastiaan van Stijn f672c8b33c Merge pull request #16617 from zhangjianfnst/15869-improve-commandline-doc 
Improve the way we deliver Examples in command line.
Upstream-commit: 2b4128e904cf5ffc288e45dbc049de73a905e4e6
Component: engine
 2015-10-14 11:05:27 -07:00
Brian Goff 0165544fe0 Merge pull request #17025 from albers/completion-inspect-size 
[Fix #15796] Add bash completion for `docker inspect --size`
Upstream-commit: adb37a1b390a0cb54d620c3f9c9719a44d2078b6
Component: engine
 2015-10-14 13:48:43 -04:00
Vincent Demeester 9be0d4300b Merge pull request #16968 from MHBauer/network-refactor 
refactor use of container struct from daemon
Upstream-commit: aaa8cae34537eb9bddacacc8bce61c91ca76d7d2
Component: engine
 2015-10-14 17:48:08 +02:00
Harald Albers cce0231be7 Add bash completion for docker inspect --size 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 29714ee836fa263143986de8dc04bbf821277eab
Component: engine
 2015-10-14 17:34:56 +02:00
Brian Goff 4b1e8fe9a1 Merge pull request #17006 from echo33/docker_cli_v2_only 
use of checkers on docker_cli_v2_only.go
Upstream-commit: d60883eb1041668771a1e94c0d7405693c71b486
Component: engine
 2015-10-14 10:27:37 -04:00
weiyan 06e65682ca use of checkers on docker_cli_v2_only.go 
Signed-off-by: weiyan <weiyan3@huawei.com>
Upstream-commit: 899ca94ce8d78229195213d1558917eb98cbc7de
Component: engine
 2015-10-14 20:10:34 +08:00
Jian Zhang 556b9df83a Improve the way we deliver Examples in command line. (Add descriptive titles) 
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
Upstream-commit: cc653b5d616ee8823c13b1b35ecf5f00e15463a8
Component: engine
 2015-10-14 11:04:51 +08:00
Tibor Vass 1fa1874ac9 Merge pull request #16995 from jfrazelle/lxc-i-loathe-you 
Fix lxc
Upstream-commit: 7a19164c179601898e748f1b45d0c82b949a6433
Component: engine
 2015-10-13 19:00:24 -07:00
Jess Frazelle 7da77f50b2 Merge pull request #16999 from tiborvass/bump_apiversion_to_v1.22 
Bump API Version to v1.22
Upstream-commit: 22a0b0a4f926af6e73beb279e390e6333989c9bc
Component: engine
 2015-10-13 18:59:09 -07:00
Tibor Vass 98858eadeb Bump API Version to v1.22 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 22a0ea555069c47a132ac1579324e70d2bcde39d
Component: engine
 2015-10-13 17:27:33 -07:00
Michael Crosby 1dd7cd942b Merge pull request #16989 from tiborvass/bump-libcontainer-for-docker-1.9 
Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
Upstream-commit: 3ad9cc996a3daf0c3f05972141bdfc6d8126d705
Component: engine
 2015-10-13 16:56:19 -07:00
Morgan Bauer 182a4806ba refactor use of container struct from daemon 
- do existence check instead of get container
 - new connect method on daemon.
 - cli network disconnect integration test

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: a0398fbd197b5c4cf261b702ba1a1f924d6134e8
Component: engine
 2015-10-13 16:34:28 -07:00
Tibor Vass 095021089e Merge pull request #16863 from dhiltgen/bump_libkv 
Bump to latest libkv + dependencies
Upstream-commit: 9c94dcea3dbbe09fbd90e763bfbf19d687bff6c0
Component: engine
 2015-10-13 15:57:42 -07:00
Jessica Frazelle 332d97bdef update tests 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 28ad7c588f5ebaf5a41950b42a61759cf47c8de7
Component: engine
 2015-10-13 15:52:14 -07:00
Tibor Vass 055fc64475 Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: a17e53038d15ebb82f2dcdafb5c429609cccfb0d
Component: engine
 2015-10-13 15:48:13 -07:00
Michael Crosby 00439678a1 Merge pull request #16996 from jfrazelle/cleanup-no-reprepro 
update release-deb from the reprepro stuff we don't use
Upstream-commit: 6ae6371d113737b383b389d7ce54b6692e99f9c4
Component: engine
 2015-10-13 15:46:58 -07:00
Jessica Frazelle d72c4d5a02 update release-deb from the reprepro stuff we don't use 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 3057f0f0a7edd4d38485c5528cc2c991240e6b1c
Component: engine
 2015-10-13 15:42:39 -07:00
Tibor Vass 08f1b17342 Merge pull request #16991 from Microsoft/10662-fixuserns 
Windows: [TP4] Fix AV due to userns
Upstream-commit: 2465ab8814f46ec4381008ba2737b253cd762211
Component: engine
 2015-10-13 15:16:36 -07:00
Antonio Murdaca 50f40c819d daemon: execdriver: lxc: fix cgroup paths 
When running LXC dind (outer docker is started with native driver)
cgroup paths point to `/docker/CID` inside `/proc/self/mountinfo` but
these paths aren't mounted (root is wrong). This fix just discard the
cgroup dir from mountinfo and set it to root `/`.
This patch fixes/skip OOM LXC tests that were failing.
Fix #16520

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: cfcddefacd125af4d909df653bccc8e3089a03b0
Component: engine
 2015-10-13 14:46:59 -07:00
Antonio Murdaca 1a998995c2 daemon: execdriver: lxc: fix set memory swap 
On LXC memory swap was only set to memory_limit*2 even if a value for
memory swap was provided. This patch fix this behavior to be the same
as the native driver and set correct memory swap in the template.
Also add a test specifically for LXC but w/o adding a new test
requirement.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 06f0d03cede5f6cdaca87f6b786555b023d5286f
Component: engine
 2015-10-13 14:46:59 -07:00
Daniel Hiltgen 22d67b7818 Bump to latest libkv/libnetwork + dependencies 
The latest libkv uses a different etcd library.  Unfortunately
that library uses some funky import paths, so I've added a new cleanup
routine for our vendor scripts to be able to normalize the imports
to be consistent with how imports work in this tree.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 7078e7ddf42ad0beeb61e82cb1544d74def98adf
Component: engine
 2015-10-13 14:41:43 -07:00
Alexandre Beslic 0e3861a2d2 Merge pull request #16910 from mavenugo/ipam 
Vendoring libnetwork for the pluggable IPAM driver support
Upstream-commit: 4ea3ff70618d28520d2ae787bd00206d05c9f1db
Component: engine
 2015-10-13 14:41:19 -07:00
Vincent Demeester 019ffb819f Merge pull request #15796 from azurezk/add-size-to-inspect 
add container size info to inspect
Upstream-commit: ce607916e9b4e294e66188bbaf50acaa86e3909f
Component: engine
 2015-10-13 23:16:10 +02:00
John Howard 486257052d Windows: Fix AV in build due to userns 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6d71f277608b2a655df0942d00607f47dbcaa37b
Component: engine
 2015-10-13 14:02:25 -07:00
moxiegirl 517874fd19 Merge pull request #16965 from mikebrow/docs-improvement-for-expose-16634 
updating docs for EXPOSE option on run command
Upstream-commit: 9be87c9a96ba902214609bf486951a7dc171b82f
Component: engine
 2015-10-13 11:33:28 -07:00
Jess Frazelle 6ed533b627 Merge pull request #16922 from albers/completion-network 
[Fix #16919] Add bash completion for `docker network`
Upstream-commit: 3fc75c97399676ae2ac6e667a517ecee640d9138
Component: engine
 2015-10-13 11:25:54 -07:00
Sven Dowideit 28ef1f3885 Merge pull request #16981 from sallyom/typos-man 
various man page typos
Upstream-commit: dd43c23812612987c0cbda0d5c489578ed66d09d
Component: engine
 2015-10-14 04:25:26 +10:00
Madhu Venugopal 7a285e518e IPAM API & UX 
introduced --subnet, --ip-range and --gateway options in docker network
command. Also, user can allocate driver specific ip-address if any using
the --aux-address option.
Supports multiple subnets per network and also sharing ip range
across networks if the network-driver and ipam-driver supports it.
Example, Bridge driver doesnt support sharing same ip range across
networks.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: cc6aece1fdefbc10638fe9e462a15608c6093115
Component: engine
 2015-10-13 11:03:03 -07:00
Madhu Venugopal 2cd0b95af5 Docker side changes for the newly introduced IPAM driver 
* Made use of IPAM driver primitives for legacy IP configurations
* Replaced custom Generics with backend labels

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 0f351ce3643a97d4b6af0021826b851f9ba41967
Component: engine
 2015-10-13 10:52:59 -07:00
Madhu Venugopal b5732f7da4 Vendoring in libnetwork ipam support 
* Pluggable IPAM driver support
* Performance and Scalability enhancements
* Libkv fixes in multiple backend stores

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2e3113aeef08c9e7fa4f9cb0fd3d53185d492b99
Component: engine
 2015-10-13 10:52:49 -07:00
moxiegirl 21b8dc752f Merge pull request #16946 from pwnall/cpu_quota_docs 
Document CFS CPU period / quota support in the API
Upstream-commit: 9ead1663c3c4e9841cd4fb9f8517e5a88cd3f0b6
Component: engine
 2015-10-13 10:51:48 -07:00
Brian Goff b3621750e0 Merge pull request #16963 from Microsoft/10662-kill-partone 
Windows: Enable kill (part one)
Upstream-commit: b7d921e1b5d2a20050dbeb58c190e5fdbd37236c
Component: engine
 2015-10-13 13:02:58 -04:00
Sebastiaan van Stijn 24b60c48d3 Merge pull request #16985 from moxiegirl/carry-dup-text-16961 
Centralize discussion of behavior label and env.
Upstream-commit: e766a3505cce19e05e52c44f88f2d20463240cec
Component: engine
 2015-10-13 09:48:44 -07:00
Mary Anthony ba16a5cc21 Centralize discussion of behavior label and env. 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 39a71acf7e18c2d00d32b01db3daaebc7392d92a
Component: engine
 2015-10-13 09:44:17 -07:00
Sebastiaan van Stijn d174ec9645 Merge pull request #16961 from vdemeester/pr-15975-carry-for-docs 
Carry #15975 - Add extra fields based on label and env for gelf/fluentd/json-file/journald log drivers
Upstream-commit: 3856c5efa685013b5e82347d5812de4c7788d4ff
Component: engine
 2015-10-13 09:30:32 -07:00
Tibor Vass bdf64e8384 Merge pull request #16956 from runcom/16665-fix-inspect-Config-api120 
Return old Config fields for API < v1.20
Upstream-commit: 0bc748bba33a00c20cedf24786f772536177725c
Component: engine
 2015-10-13 09:08:26 -07:00
Sally O'Malley a5e0a7cc96 various man page typos 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: d79860af87edb928f9509e03d3edbfbaaef5a24f
Component: engine
 2015-10-13 11:52:14 -04:00
Mike Brown 00116420f7 updating docs for EXPOSE option on run command; fixes #16634 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: d955fdb9ac279d5ea8e5fd20719eda579cca97ed
Component: engine
 2015-10-13 10:43:27 -05:00
John Howard a6257190dd Windows: Enable kill (part one) 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2dca1bc6337043e25e626b4444da29b3ca5d3660
Component: engine
 2015-10-13 08:42:47 -07:00
Vincent Demeester 61e523114f Merge pull request #16303 from coolljt0725/add_docker_info_show_base_size 
Add docker info show base filesystem size of container/image when use devicemapper
Upstream-commit: 5ecbc9747fab243136402ea78d65e928e6d4678b
Component: engine
 2015-10-13 14:43:52 +02:00
Antonio Murdaca bc9fb8d7f3 Fix Config.Cpuset from API < 1.20 
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: 8c63ce4f6b78bd1d87c92ecfbcc20ccfd80f7d63
Component: engine
 2015-10-13 09:09:05 +02:00
Vincent Demeester 76cc1c235d Add docs for label/env log-opts 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cd426ebed79e29153eb29ea1ccb260e15db2fea5
Component: engine
 2015-10-13 08:39:47 +02:00
Tibor Vass 9b2f66b864 Merge pull request #16958 from tonistiigi/digest-collision 
Make sure tags and digests don’t collide
Upstream-commit: 9a13c2dc79cc868ba3a863137ba27297314167e4
Component: engine
 2015-10-12 15:45:34 -07:00
Tibor Vass 00df3b3fae Merge pull request #16962 from estesp/check-network-files-exist 
Make sure network files exist before adding them to mounts
Upstream-commit: 09ddb67dd416778b63f122cfbbf4fa335b7b504a
Component: engine
 2015-10-12 15:38:51 -07:00
Jess Frazelle 939faf2998 Merge pull request #16009 from azurezk/vol-create-conflict-option 
volume create error on conflict option
Upstream-commit: df79536769eab04a7f1c618f9a390b36be6c53be
Component: engine
 2015-10-12 15:27:36 -07:00
Sebastiaan van Stijn 8c9497957a Merge pull request #16942 from physicalit/master 
Add CMD and EXPOSE instruction example
Upstream-commit: dc500630ec0e6c69822bf6cd62a40ed6d029e2d3
Component: engine
 2015-10-12 15:26:30 -07:00
moxiegirl 0588337d9b Merge pull request #16888 from dhiltgen/discovery_tls 
Document updates for cluster-store-opt
Upstream-commit: c59e24ff12abf284ed179dcbc68fb8e7696ce6a7
Component: engine
 2015-10-12 15:26:08 -07:00
Tonis Tiigi bcec6f94b2 Make sure tags and digests don’t collide 
Tags and digests are kept in the same storage. We want to make sure that they are completely separated - tags are something users set and digests can only be set by pull-by-digest code path.

Reverts #14664

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d08ca5c2b65d442f37424957e53d81f96356d12c
Component: engine
 2015-10-12 14:20:11 -07:00