beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
20134 commits 14 branches 412 tags 338 MiB
Commit graph

1357 commits

Author SHA1 Message Date
David Calavera
aa22191093 Merge pull request #17356 from HuKeping/warn-on-oom 
Warning out when disalbe oom killer but not set the memory limit
 2015-11-23 12:43:04 -08:00
Doug Davis
a70079ea23 Add more to tag's -f flag's help 
Was noticed in #9798

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-11-23 07:20:10 -08:00
Vincent Demeester
a600bf4eab Merge pull request #17489 from WeiZhang555/network-rm-multi 
Enhance `docker network rm` to delete multi net
 2015-11-23 08:25:33 +01:00
Zhang Wei
e7eb6687ef Enhance docker network rm to delete multi net 
This commit enhance `docker network rm` command to allow user to delete
multi networks at the same time.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-22 05:37:00 +08:00
Antonio Murdaca
3ff9bb5332 Merge pull request #16613 from WeiZhang555/docker-cp-symlink 
Add option `-L` to allow `docker cp` follow symbol link
 2015-11-21 17:03:24 +01:00
Antonio Murdaca
6653f82796 Merge pull request #17495 from mikebrow/docker-tz-and-nanosecond-updates 
modifying docker --since and --until to support nanoseconds and time …
 2015-11-20 23:37:44 +01:00
David Calavera
8fa09749fb Merge pull request #17718 from wenchma/17716_before_filter_doc 
Re-implement --before and --since as options for --filter
 2015-11-20 11:24:19 -08:00
Zhang Wei
92600bdec1 Add '-L' option for cp 
Fixes #16555

Original docker `cp` always copy symbol link itself instead of target,
now we provide '-L' option to allow docker to follow symbol link to real
target.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-21 00:36:56 +08:00
Wen Cheng Ma
1921c62938 Re-implement --before and --since as options for --filter 
* This commit will mark --before and --since as deprecated, but leave their behavior
  unchanged until they are removed, then re-implement them as options for --filter.

* And update the related docs.

* Update the integration tests.

Fixes issue #17716

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-11-20 13:10:13 +08:00
NIWA Hideyuki
5aeaf2a0c4 Addition of "--shm-size" to which size of /dev/shm is changed. 
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
  when container is made.
- Being able to specify is a numerical value that applies number,
  b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.

Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com>
 2015-11-20 09:24:18 +09:00
Michael Crosby
104dab87ea Merge pull request #17478 from vdemeester/pr-13921 
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
 2015-11-17 15:44:57 -08:00
Alexander Morozov
f18d5da6a7 Merge pull request #17300 from kunalkushwaha/plugin-info 
Patch for Plugin drivers in docker info
 2015-11-17 10:46:29 -08:00
David Calavera
d507acb175 Merge pull request #17724 from runcom/remove-depreciated-cli-flags 
Remove depreciated cli flags
 2015-11-17 16:40:06 +01:00
Sebastiaan van Stijn
7c5cdda74e Merge pull request #17604 from RyanDeng/fix_cpuPercent_extremelyHigh 
fix the bug: cpu percent will extremely high
 2015-11-16 17:26:29 +01:00
Kunal Kushwaha
aa7fd884e6 Supported added for reterving Plugin list for Network and Volume. 
Also, plugin information in docker info output.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2015-11-16 15:28:09 +09:00
Antonio Murdaca
7929888214 Remove deprecated cli flags 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-15 10:40:01 +01:00
Olle Jonsson
4e8fcd4002 /info: Add keys Architecture, OSType 
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
 2015-11-14 22:21:45 +01:00
Antonio Murdaca
ad8a66573c Merge pull request #17851 from Microsoft/10662-ArgumentEscaping 
Prevent double escaping of Dockerfile commands on Windows
 2015-11-14 17:25:53 +01:00
Arnaud Porterie
7a6f2cdeeb Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration 
New version of notary with pkcs11 client integration
 2015-11-14 12:03:29 +01:00
Antonio Murdaca
dc136b710b Merge pull request #17211 from endocode/kayrus/docker_fd_https 
Added possibility to use TLS with systemd socket activation
 2015-11-14 08:36:54 +01:00
Michael Crosby
1f53bf9097 Merge pull request #17859 from liusdu/remove-rebundent 
remove unnecessary logs from daemon
 2015-11-13 16:45:30 -08:00
Jessica Frazelle
94ea6af8cd
update vendor.sh and notary api for vendored changes 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-13 13:19:11 -08:00
Alexander Morozov
a4acb1db4a Merge pull request #17615 from WeiZhang555/17404-net-inspect-name 
Include container names in `network inspect`
 2015-11-13 11:54:59 -08:00
Darren Stahl
9db5db1b94 This fixes the case where arguments are escaped twice from Dockerfiles on 
Windows

Signed-off-by: Darren Stahl <darst@microsoft.com>
 2015-11-13 10:43:06 -08:00
Alexander Morozov
cccf674943 Merge pull request #16873 from coolljt0725/expand_docker_info 
Add more cgroup config to docker info
 2015-11-13 09:37:06 -08:00
kayrus
0f2b3191d9 Added possibility to use TLS with systemd socket activation 
Signed-off-by: kayrus <kay.diam@gmail.com>
 2015-11-13 17:01:23 +01:00
Mike Brown
430d8ff611 modifying docker --since and --until to support nanoseconds and time zones 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2015-11-13 09:56:15 -06:00
Liu Hua
343e15fa3f remove unnecessary logs from daemon 
if daemon encounters removing-file error. It will record two
similar logs as following . The later is meaningful for client, But not for
daemon. So remove it.

Signed-off-by: Liu Hua <sdu.liu@huawei.com>
 2015-11-10 17:44:38 +08:00
David Calavera
58b270c338 Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again 
Another try at dockerversion placeholder for library import
 2015-11-09 13:15:50 -08:00
Vincent Demeester
8054a30387 dockerversion placeholder for library import 
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-09 19:32:46 +01:00
Shuwei Hao
6efa10f668 Modify improper comments in api/server/router/volume/volume.go 
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
 2015-11-08 04:05:59 +00:00
Sebastiaan van Stijn
fdc8cce070 Merge pull request #16742 from runcom/10772-docker-stats-all 
Allow docker stats without arguments
 2015-11-07 19:41:03 +00:00
Antonio Murdaca
ae818a820f Allow docker stats without arguments 
This patch adds the ability to run `docker stats` w/o arguments and get
statistics for all running containers by default. Also add a new
`--all` flag to list statistics for all containers (like `docker ps`).
New running containers are added to the list as they show up also.
Add integration tests for this new behavior.
Docs updated accordingly. Fix missing stuff in man/commandline
reference for `docker stats`.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-07 17:03:33 +01:00
David Calavera
f198334400 Merge pull request #17738 from Microsoft/jjh/login 
Windows: [TP4] Fix docker login
 2015-11-06 15:02:42 -08:00
Alexander Morozov
e37e329074 Return nice client-side message for docker logs 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-06 11:40:48 -08:00
Solomon Hykes
2519f46550 Merge pull request #17700 from calavera/remove_lxc 
Remove LXC support.
 2015-11-05 15:22:37 -08:00
John Howard
9c765040a5 Windows: Fix docker login 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-05 14:19:48 -08:00
David Calavera
157b66ad39 Remove exec-driver global daemon option. 
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-11-05 17:09:58 -05:00
Zhang Wei
fbed26297d Include container names in network inspect 
This commit makes `docker network inspect` print container names as
service discovery is based on container name.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-05 19:16:13 +08:00
Vincent Demeester
5baf56ca00 Merge pull request #17717 from WeiZhang555/docsAndTypo 
Fix docs typo and wrong word
 2015-11-05 11:35:33 +01:00
Zhang Wei
725b7c9d43 Fix docs typo and wrong word 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-05 14:17:37 +08:00
Brian Goff
72aeb63a47 Reutrn immediately when inspect connection failed 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-11-04 21:17:05 -05:00
Brian Goff
f18c5e9714 Merge pull request #17703 from aboch/np 
Verify Endpoint.Info() before accessing it
 2015-11-04 19:23:11 -05:00
Sebastiaan van Stijn
236913f4e8 Merge pull request #14012 from sallyom/exitCodes 
Change 'docker run' exit codes to distinguish docker/contained errors
 2015-11-05 00:50:08 +01:00
Jess Frazelle
9c1006c8bf Merge pull request #17673 from LK4D4/elim_str_comparison 
Do not rely on string comparison in truncindex
 2015-11-04 15:39:19 -08:00
Alessandro Boch
54d22cbd9a Verify Endpoint.Info() before accessing it 
- During concurrent operations in multihost environment,
  it is possible that the implementer of `EndpointInfo`
  is nil. It simply means the endpoint is no longer
  available in the datastore.

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-11-04 13:27:17 -08:00
Sally O'Malley
41de7a18d8 Change 'docker run' exit codes to distinguish docker/contained errors 
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise

Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-11-04 15:18:50 -05:00
Alexander Morozov
d4a8d09d1a Do not rely on string comparison in truncindex 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-04 11:34:05 -08:00
Shuwei Hao
11062ea177 Fixing wrong word spelling in api/client/network.go 
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
 2015-11-04 13:42:34 +00:00
Jess Frazelle
e704182c9c Merge pull request #17614 from LK4D4/fix_golint 
Update linting tools to latest versions
 2015-11-03 15:32:12 -08:00