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

31268 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Demeester
83e29a5d87 Merge pull request #31582 from dnephin/misc-flag-cleanup 
Cleanup some memory flags used in the CLI
 2017-03-10 14:16:42 +01:00
Sebastiaan van Stijn
6c31abde20 Merge pull request #30870 from ripcurld0/fix_msg_rm 
Fix the rm error message when a container is restarting/paused
 2017-03-10 10:04:49 +01:00
Sebastiaan van Stijn
18163a42ec Merge pull request #31718 from aaronlehmann/broken-resp 
cluster: Fix shadowed resp variable
 2017-03-10 08:36:12 +01:00
Aaron Lehmann
9d127f8de3 cluster: Fix shadowed resp variable 
The response would never reach the client because it was being
redeclared in the current scope.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-09 17:58:12 -08:00
Akihiro Suda
239645c08d Merge pull request #31701 from jlaswell/master 
Fix typo in run.md documentation
 2017-03-10 10:15:49 +09:00
Michael Crosby
abb0fec9d0 Merge pull request #31704 from mlaventure/handle-paused-container-on-non-live-restore 
Handle paused container when restoring without live-restore set
 2017-03-09 15:59:02 -08:00
Boaz Shuster
0ec8f56a3d Fix the rm error message when a container is restarting/paused 
Running the rm command on a paused/restarting container
will give an error message saying the container is running
which is incorrect.

To fix that, the error message will have the correct
container state and a procedure to remove it accordingly.

Notice: docker-py was bumped to:
        4a08d04aef0595322e1b5ac7c52f28a931da85a5

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-10 00:39:16 +02:00
Kenfe-Mickael Laventure
c458d3bb98 Handle paused container when restoring without live-restore set 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-09 13:37:08 -08:00
Brian Goff
9bf36cb443 Merge pull request #31667 from mlaventure/update-runc 
Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe
 2017-03-09 15:50:12 -05:00
John Laswell
4a20252137
Fix typo in run.md documentation 
Signed-off-by: John Laswell <john.n.laswell@gmail.com>
 2017-03-09 13:08:48 -05:00
Sebastiaan van Stijn
705e031b98 Merge pull request #31396 from kevinfeyrer/patch-2 
Update vlan-networks.md
 2017-03-09 15:02:58 +01:00
Brian Goff
89b4c1d353 Merge pull request #31681 from lixiaobing10051267/masterLayer 
modify ID to ChainID to avoid confusing
 2017-03-09 08:45:35 -05:00
Sebastiaan van Stijn
6cf8ff5d1d Merge pull request #31684 from albers/fix-stop-signal-help-message 
Fix description of `docker run|create --stop-signal` in help message
 2017-03-09 11:36:26 +01:00
lixiaobing10051267
1b0f2d71a1 modify ID to ChainID to avoid confusing 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2017-03-09 16:59:04 +08:00
Harald Albers
b303e229ca Fix description of docker run|create --stop-signal in help message 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-09 09:32:16 +01:00
Kenfe-Mickael Laventure
49131f3ad4 Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-08 14:56:29 -08:00
kevinfeyrer
6ea36d7d48 Update vlan-networks.md 
Some small changes to get the examples so that they run without error for me.
Improve consistency of presentation of the examples.
Fix some typos

Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com>

Update vlan-networks.md

Restore "ip" accidentally removed

Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com>

Update vlan-networks.md

Change prompt from container "$$" to host "$"

Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com>

Update vlan-networks.md

Some changes suggested by cpuguy83 and thaJeztah

Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com>
 2017-03-08 21:53:24 +00:00
Tõnis Tiigi
3fe2730ab3 Merge pull request #31535 from aaronlehmann/vendor-swarmkit-7fc7503 
Vendor swarmkit d60ccf3
 2017-03-08 09:52:28 -08:00
Brian Goff
71f249967e Merge pull request #31654 from dnephin/add-missing-validate 
Add compose-bindata validation to default
 2017-03-08 10:57:05 -05:00
Daniel Nephin
18e0a327ca Add compose-bindata validation to default. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-08 10:23:40 -05:00
Sebastiaan van Stijn
fb1890fb95 Merge pull request #31177 from allencloud/donot-allow-subsecond-in-dockerfile-healthcheck 
do not allow sub second in healthcheck options in Dockerfile
 2017-03-08 15:18:09 +01:00
Sebastiaan van Stijn
fb024df8f0 Merge pull request #31443 from james-nesbitt/export-more-compose-methods 
exported add. cli compose loader parsing methods
 2017-03-08 15:12:42 +01:00
Sebastiaan van Stijn
58e787602d Merge pull request #31641 from amatsus/master 
Fix typo in CHANGELOG.md
 2017-03-08 15:10:45 +01:00
Justin Cormack
ab8a22de36 Merge pull request #31611 from tophj-ibm/skip-plugin-test 
skip plugin test on non x86 architectures
 2017-03-08 14:00:15 +00:00
Akihiro MATSUSHiMA
d9325e102c Fix typo in CHANGELOG.md 
Signed-off-by: Akihiro Matsushima <amatsusbit@gmail.com>
 2017-03-08 21:13:05 +09:00
Vincent Demeester
d4a8c3b438 Merge pull request #30856 from allencloud/make-secret-update-support-name-and-id-prefix 
make secret update support name and id prefix
 2017-03-08 12:31:44 +01:00
Sebastiaan van Stijn
7e031413f2 Merge pull request #31566 from AkihiroSuda/use-latest-vndr 
rerun vndr
 2017-03-08 12:16:50 +01:00
Brian Goff
c430aea83c Merge pull request #31623 from aaronlehmann/dropped-taskspec-field 
Fix dropped field in task translation from GRPC to REST
 2017-03-08 05:24:48 -05:00
Akihiro Suda
193730bec1 Merge pull request #31620 from justincormack/seccomp-up 
Seccomp Update
 2017-03-08 12:38:17 +09:00
Aaron Lehmann
39433318fe Vendor swarmkit d60ccf3 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-07 19:09:21 -08:00
Akihiro Suda
5a1b06d7fd rerun vndr 
* run latest vndr so as to collect more LICENSE files
 * remove unused packages
 * vendor github.com/philhofer/fwd with LICENSE.md (MIT)
 * vendor github.com/bsphere/le_go with LICENSE (MIT)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-08 02:29:34 +00:00
Aaron Lehmann
497c4f05b9 Fix dropped field in task translation from GRPC to REST 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-07 14:55:15 -08:00
Justin Cormack
9067ef0e32 Seccomp Update 
- Update libseccomp-golang to 0.9.0 release
- Update libseccomp to 2.3.2 release
- add preadv2 and pwritev2 syscalls to whitelist

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-03-07 22:19:46 +00:00
Brian Goff
fd5f9d7941 Merge pull request #31265 from cyli/remove_swarm_subdirs 
Rather than remove the swarm directory and re-create, remove the subdirs
 2017-03-07 14:30:34 -05:00
Brian Goff
dd221a1e17 Merge pull request #31258 from dnephin/fix-override-default-stack-network 
Support customizing the default network for a stack
 2017-03-07 14:28:16 -05:00
James Nesbitt
a1560a0cf2 exported cli compose loader parsing methods 
Signed-off-by: James Nesbitt <james.nesbitt@wunderkraut.com>
 2017-03-07 17:36:35 +02:00
Daniel Nephin
afcaeedbd4 Use opts.MemBytes for flags. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-07 10:32:49 -05:00
Brian Goff
ba5c0f88d5 Merge pull request #30568 from khudgins/nimbleplugin 
added listing for Nimble Storage's volume plugin
 2017-03-07 09:31:53 -05:00
Christopher Jones
e3c6cbed22 skip plugin test on non x86 architectures 
Because the plugins in dockerhub aren't multi-arch, they will
fail on non x86-64 platforms. Comment this test out like we do with
the others.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2017-03-07 09:28:10 -05:00
Vincent Demeester
7bf4085264 Merge pull request #31198 from docbobo/master-manpages-aarch64 
Improved aarch64 build
 2017-03-07 13:53:48 +01:00
allencloud
9d30525a04 make secret update support name and id prefix 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-03-07 16:01:21 +08:00
Tibor Vass
65068ea4c0 Merge pull request #31340 from anusha-ragunathan/plugin_nw_filter 
Add network plugin filter test
 2017-03-06 15:31:59 -08:00
Daniel Nephin
2e9f9d2c34 Some things just need to be line wrapped. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-06 16:01:57 -05:00
Vincent Demeester
de5ca681b5 Merge pull request #30807 from chchliang/networkproject 
Check parameter --ip --ip6 --link-local-ip in `docker network connect`
 2017-03-06 21:11:55 +01:00
Anusha Ragunathan
5e0e957061 Add network plugin filter test 
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
 2017-03-06 12:05:20 -08:00
Victor Vieux
a2bf823a94 Merge pull request #31577 from thaJeztah/update-changelog-17.03.0-ce 
Update changelog 17.03.0 ce
 2017-03-06 11:19:26 -08:00
Sebastiaan van Stijn
31930bdfe1 Merge pull request #31580 from thaJeztah/move-jana-to-alumni 
Move Jana to alumni
 2017-03-06 20:17:19 +01:00
Vincent Demeester
4e051181f7 Merge pull request #31578 from vdemeester/request-daemon-host 
[test-integration] Update request.* signature to remove the host
 2017-03-06 19:45:01 +01:00
Kenfe-Mickaël Laventure
c6e102c830 Merge pull request #31194 from albers/completion-volume-aliases 
Add support for command aliases to bash completion of `docker volume`
 2017-03-06 09:52:41 -08:00
Sebastiaan van Stijn
1aeb2cf7cb
Move Jana to alumni 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-06 18:22:00 +01:00