docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Code Activity
13,998 Commits 12 Branches 297 Tags
9e396b31ce8ebe339a7a08e40cb7095eaf7ccfab
Commit Graph

1077 Commits

Author SHA1 Message Date
Jessie Frazelle
6be1b45eff Merge pull request #11545 from cpuguy83/remove_allocator_warning 
Don't warn when ip_local_port_range not found
Upstream-commit: ccd4181d10752c41603fcc03bb6b576603b24271
Component: engine
 2015-03-23 14:19:57 -07:00
Alexander Morozov
b2d8692608 Merge pull request #11660 from paulbellamy/11626-portallocator 
Refactoring portallocator away from a global var
Upstream-commit: d852e5fde89ecd5eec53983be3c62e371147ad8c
Component: engine
 2015-03-23 14:10:56 -07:00
Paul Bellamy
4df1193b38 Refactor global portallocator state into a global struct 
Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
Upstream-commit: 12576798769081823a3f660b46290da808630616
Component: engine
 2015-03-23 20:41:41 +00:00
Brian Goff
f2b00f6fe1 Improve err message when parsing kernel port range 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8e4d9f3cf9669f45b0591eea27c47b6f64d89c2d
Component: engine
 2015-03-23 13:29:25 -07:00
Alexander Morozov
974bfa30e6 Merge pull request #11654 from runcom/11650-syslog-close-redunant-nil-check 
syslog Close() - Remove redunant nil check, s.writer cannot be nil
Upstream-commit: 2717302cc69c865cfec02fb48b3cb173d6980364
Component: engine
 2015-03-23 12:32:26 -07:00
Antonio Murdaca
84d2a9e3ec Remove redunant nil check, s.writer cannot be nil 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: e600df2d9732b8c40d056563e361ded6cd5ce773
Component: engine
 2015-03-23 20:03:24 +01:00
Antonio Murdaca
1ef60888a8 Refactor syslog Log else clause 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 8f025aae36fd040d8d2617890b258b5460ae44db
Component: engine
 2015-03-23 20:01:01 +01:00
Alexander Morozov
dad3640059 Merge pull request #11458 from ibuildthecloud/syslog 
Add syslog logging driver
Upstream-commit: 65e21f570358f46f6ad0f8fa2cd3394706ba169d
Component: engine
 2015-03-23 11:34:33 -07:00
Jessie Frazelle
2ae5f5eb68 Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind 
Allow path from normal volume existing to overwrite in start Binds
Upstream-commit: 1fe55b2f8bc966c0784527b30f507cbc90325df7
Component: engine
 2015-03-23 10:43:02 -07:00
sidharthamani
a7d21898b0 add syslog driver 
Signed-off-by: wlan0 <sid@rancher.com>
Upstream-commit: eaecd8b1b5871a4d17be27e3615106587eec1d3a
Component: engine
 2015-03-21 18:01:18 -07:00
Jessie Frazelle
8a89ab91de Merge pull request #11454 from hqhq/fix_memoryswap_warning 
do not warning when we disable memoryswap
Upstream-commit: b6e20a67f915c8be0b2829742ab32dea3d342905
Component: engine
 2015-03-21 15:23:25 -07:00
Michael Crosby
b2b558afeb Merge pull request #11492 from coolljt0725/fix_hostname_missing_in_container_netmode 
Fix hostname missing when a container's net mode is contaienr mode
Upstream-commit: 84d3ab30d48a5194f7af93bccbd3b230b5115104
Component: engine
 2015-03-20 16:49:37 -07:00
Jessie Frazelle
4137db45c7 Merge pull request #11507 from crosbymichael/container-state 
Cleanup libcontainer container state
Upstream-commit: 5a239c0022212d657313bc8d15af3b835dedbda1
Component: engine
 2015-03-19 16:02:24 -07:00
Michael Crosby
a5bb86caaa Merge pull request #11428 from vishh/parent-cgroup 
Adding '--cgroup-parent' option.
Upstream-commit: 455a272aef4e109ce57c20f9ea224e4d4b32ece7
Component: engine
 2015-03-19 14:41:57 -07:00
Michael Crosby
ec306144db Mount libcontainer state dir in tmpfs 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2b12b099b8c60f02142ab8ece68987a8fba00292
Component: engine
 2015-03-19 14:27:17 -07:00
Michael Crosby
cb0e64d97b Ensure the container state is removed on daemon boot 
This ensures that the libcontainer state is fully removed for a
container after it is terminated.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 06c939e5279eb62b9088202a27d02d67c1cba6a5
Component: engine
 2015-03-19 14:21:19 -07:00
Mrunal Patel
67dd189d62 Update libcontainer to 4a72e540feb67091156b907c4700e580a99f5a9d 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 60ef4ae6fcb015546a646eb3b613344a9c4fc27b
Component: engine
 2015-03-19 14:42:23 -04:00
Alexander Morozov
22d9cf2b19 Merge pull request #11459 from simonswine/10001-ipv6-tests 
[WiP] Adds testing for bridge's IPv6 support
Upstream-commit: d338c613bf7c9dc7e77bebf104ba83f69aaeb8a7
Component: engine
 2015-03-19 08:37:28 -07:00
Tibor Vass
2bcbb3285b Merge pull request #11274 from MabinGo/selinux_enable_verify 
Add logs when Docker enabled selinux (closes #11197)
Upstream-commit: fdf49d758f6f93d04077ad0c82a7fd7312b2ffdc
Component: engine
 2015-03-19 10:34:55 -04:00
Phil Estes
1d92cf5680 Merge pull request #11453 from duglin/HideDaemonDots 
Hide dots on daemon startup when loglevel != info
Upstream-commit: 9d5eab18737adc82e3191c7708e5df540d0b485e
Component: engine
 2015-03-19 10:10:18 -04:00
Lei Jitang
f2ad0ab09b Fix hostname missing when a container's net mode is contaienr mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 74664dabff906f42b9acfbad516eeae484b47af9
Component: engine
 2015-03-19 17:03:40 +08:00
Vishnu Kannan
1f50057df8 Adding '--cgroup-parent' flag to docker run. This feature helps users implement more complex 
resource isolation policies on top of what native docker provides.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 0b1e2b5a553565e99afd7ceda36beab098f506d0
Component: engine
 2015-03-19 02:34:15 +00:00
Mabin
ccb5c44c68 Add logs when Docker enabled selinux 
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: 1bf529a45674dc07de6efba806b854f63f3dc0bf
Component: engine
 2015-03-19 09:46:53 +08:00
Jessie Frazelle
7ce99f1b4f Merge pull request #11471 from LK4D4/wait_for_copier 
Wait for copier finishing it's work before closing logger
Upstream-commit: 474f58e2e73de477e6b9a827e100f3f22f52048a
Component: engine
 2015-03-18 15:41:12 -07:00
Jessie Frazelle
6d9a5811c0 Merge pull request #11474 from crosbymichael/null-masked-paths 
Do not mask /proc/kcore in privileged
Upstream-commit: e1a0bff6b8aefdea341d01a75a0c7e9235cda421
Component: engine
 2015-03-18 14:43:13 -07:00
Michael Crosby
dc45397f85 Do not mask /proc/kcore in privileged 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f4a458e67f9cedae9167cc70d15fd8bbe942f880
Component: engine
 2015-03-18 14:17:21 -07:00
Alexander Morozov
783795eacd Wait for copier finishing it's work before closing logger 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: b6a42673abb8c2df5920343b9144a4ce422b2d50
Component: engine
 2015-03-18 13:48:01 -07:00
Alexander Morozov
4af8cc6694 Protect jsonfilelog writes with mutex 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bd8661e8fafd5f80ce12fa966b9f8e990b7d7714
Component: engine
 2015-03-18 13:00:53 -07:00
Christian Simon
005b71267c [WiP] Adds testing for bridge's IPv6 support 
* fixes #10001
* test for global subnets <= 80
* test for global subnets > 80
* test link local allocations
* test duplicated addresses
* test regression from bug #11427

Signed-off-by: Christian Simon <simon@swine.de>
Upstream-commit: 4307ec283b817997bdcf989767a99d57f7361b9f
Component: engine
 2015-03-18 08:51:14 +01:00
Alexander Morozov
dc3c53ce55 Merge pull request #11450 from crosbymichael/rlimitfix 
Don't hardcode default rlimit
Upstream-commit: cf071bb9620cc36ab446c467a332a7c287856726
Component: engine
 2015-03-17 20:27:05 -07:00
Qiang Huang
49cb18395f do not warning when we disable memoryswap 
$ docker run -ti --rm -m 300M --memory-swap=-1 ubuntu:14.04
WARNING: Your kernel does not support swap limit capabilities. Limitation discarded.
root@813aafc019d5:/#

When we disable memoryswap, it should not warning swap limit not support.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 55cc166e53498a844cd5e96841a25ba1d19924ae
Component: engine
 2015-03-18 10:08:17 +08:00
Jessie Frazelle
883ebf04a4 Merge pull request #11320 from estesp/fix-daemon-startup 
Fix daemon shutdown on error after rework of daemon startup
Upstream-commit: a5269223a78d963774b12359a1e505b10fa9ac81
Component: engine
 2015-03-17 19:04:25 -07:00
Doug Davis
934073fd57 Hide dots on daemon startup when loglevel != info 
When the deamon starts up with log level set to INFO it will show something
like this:
```
INFO[0000] Loading containers: start.
................................................................
INFO[0000] Loading containers: done.
```
where the dots represent containers in the system.
When you run with log level set to "error" it will still show the dots
w/o the "Loading..." lines before and after which looks really odd.
This PR will fix it so that the dots are only shown IFF the "Loading..."
lines are also shown

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 88dc6cc2dfcc538f433c98c18652a5c84b0769d9
Component: engine
 2015-03-17 17:27:53 -07:00
Michael Crosby
b6b5f87d20 Don't hardcode default rlimit 
The default for rlimit handling should be to inherit the rlimit of the
daemon unless explicitly set.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f5a154f2d2b2bea5054ae35314d15021a8bf8ae4
Component: engine
 2015-03-17 16:04:15 -07:00
Phil Estes
26ddd6db93 Fix daemon shutdown on error after rework of daemon startup 
Currently the daemon will not stop on error because the serve API job is
blocking the channel wait for daemon init.  A better way is to run the
blocking serve API job as a goroutine and make sure that error
notification gets back to the main daemon thread (using the already
existing channel) so that clean shutdown can occur on error.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 459e58ffc9bff8206a860fb63f973e4f07129756
Component: engine
 2015-03-17 14:15:00 -04:00
Vishnu Kannan
8da4d5374d Reduce logging level from error to warning if "/proc/sys/net/ipv4/ip_local_port_range" proc file in not accessible. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 39d49ba7ba21f204f5fc174aaf319ed1cdad790f
Component: engine
 2015-03-17 17:39:17 +00:00
Arnaud Porterie
90fc12f567 Merge pull request #10568 from LK4D4/logging_drivers 
Logging drivers
Upstream-commit: 1ff5a91007f01d2d61a7b2066db2e164085f0d1b
Component: engine
 2015-03-17 09:45:58 -07:00
Arnaud Porterie
e296e8dc09 Merge pull request #11369 from coolljt0725/fix_link 
Fix --link to a container which net mode is container
Upstream-commit: cb77ad4757947adcff7bf4cd95969e75a7018614
Component: engine
 2015-03-17 08:36:33 -07:00
Alexander Morozov
987dfc1c4c Merge pull request #11401 from Mashimiao/11385-fix-lxc-conf-error 
fix not show error when using --lxc-conf without lxc driver
Upstream-commit: 8685af0b132f2b0a6ee79a4d9491e0d0496fa25c
Component: engine
 2015-03-17 08:35:18 -07:00
Lei Jitang
9e124c2aad Fix --link to a container which net mode is container mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 82e2e1a11af60a41100e2ced24f23cf2872e5604
Component: engine
 2015-03-17 07:50:12 -07:00
Andy Goldstein
d6d379e87a Add ability to refer to image by name + digest 
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: a2b0c9778feac970524b98ef7a91b5528fdeb9d5
Component: engine
 2015-03-17 10:10:42 +00:00
Arnaud Porterie
5f00f97ea0 Merge pull request #9882 from ibuildthecloud/labels 
Proposal: One Meta Data to Rule Them All => Labels
Upstream-commit: b6ac111abfbed628a80b67f0b092a248083b354c
Component: engine
 2015-03-16 20:20:05 -07:00
Ma Shimiao
97d21480be fix not show error when using --lxc-conf without lxc driver 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 703cab12e77189432e160772f67e5f131fd14baa
Component: engine
 2015-03-17 08:50:17 +08:00
Jessie Frazelle
9596e6f457 Merge pull request #11353 from mrunalp/override_default_mounts 
Filter out default mounts that are being overriden by the user.
Upstream-commit: 87a8658eb625d25d4d72bf65efc5629be4c99d40
Component: engine
 2015-03-16 16:40:32 -07:00
Jessie Frazelle
1820b54f91 Merge pull request #11427 from LK4D4/fix_alloc_ip6 
Fix IPv6 autoallocation from mac with --ipv6-cidr
Upstream-commit: 213be9ee2761828f56c7308bd85e4ca9fd33e34a
Component: engine
 2015-03-16 16:38:46 -07:00
Michael Crosby
7a404617a3 Merge pull request #11402 from miminar/err-cleanup 
Error formatting cleanups
Upstream-commit: 88f437d6c619f7b07a22cb5750814bce4d8d7164
Component: engine
 2015-03-16 16:13:16 -07:00
Mrunal Patel
9b00b0ac0c Filter out default mounts that are override by user. 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 7804cd36eec45c184dcabdbcb52033c1c0179c03
Component: engine
 2015-03-16 18:39:50 -04:00
Alexander Morozov
aeed74c156 Fix IPv6 autoallocation from mac with --ipv6-cidr 
We used slice globalIPv6Network.IP itself, not its copy as expected.

Fixes #10774

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 491f8ab14493babb1c06e240c7a9de64f34827a0
Component: engine
 2015-03-16 15:36:50 -07:00
Michael Crosby
bd0b1983fb Merge pull request #11343 from hqhq/hq_fix_panic_error 
fix panic error when docker stats a stopped container
Upstream-commit: a2fcae41efdc52087d733d962b9ee3ef37a81450
Component: engine
 2015-03-16 15:16:03 -07:00
Phil Estes
194d87a1e1 Merge pull request #10792 from larsks/bug/10781 
fix various problems with iptables.Exists
Upstream-commit: 1705ded1d208673ebd1a5fcc61a324da5f30411d
Component: engine
 2015-03-16 17:39:36 -04:00