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

26550 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Demeester
a5809ddd2a Merge pull request #25715 from thaJeztah/update-changelog-for-userland-proxy-binary 
Add note about new binaries to changelog
 2016-08-15 21:48:21 +02:00
Sebastiaan van Stijn
4105cff4d8 Merge pull request #25707 from thaJeztah/move-sysctls-to-correct-api-version 
Move sysctls to correct API version
 2016-08-15 20:29:51 +02:00
Sebastiaan van Stijn
0f838cc523 Merge pull request #25710 from thaJeztah/restore-missing-ps-example 
Restore missing ps example for killed containers
 2016-08-15 16:02:16 +02:00
Brian Goff
bfc3f121f1 Merge pull request #25700 from lixiaobing10051267/masterSwarmRmService 
command "docker service remove" not consistent
 2016-08-15 09:55:52 -04:00
Sebastiaan van Stijn
2806b3b6c7 Merge pull request #25712 from thaJeztah/carry-25613-fix-capitalization 
Fix capitalization
 2016-08-15 15:53:36 +02:00
Sebastiaan van Stijn
32b8a6e735
Add note about new binaries to changelog 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-15 15:23:14 +02:00
Sebastiaan van Stijn
75e60fbe09
Fix capitalization 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-15 14:14:41 +02:00
Sebastiaan van Stijn
8d5818a693
Restore missing ps example for killed containers 
This example was added in b0b2f979c7,
but got lost during splitting up the cli.md docs into separate files;
561bfb268d

This restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-15 13:41:18 +02:00
Sebastiaan van Stijn
7cdd693d5d
Move sysctls to correct API version 
Commit 067b510dfc move the
sysctls feature to the right API version, but
missed this one.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-15 12:02:54 +02:00
lixiaobing10051267
078e2aa157 command "docker service remove" not insistant 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-15 15:11:37 +08:00
Tõnis Tiigi
5ac0342e82 Merge pull request #25675 from DieterReuter/master 
Fix build deb for ARMv6
 2016-08-13 10:16:29 -07:00
Sebastiaan van Stijn
856fa571d0 Merge pull request #25678 from tonistiigi/clear-wal 
Clear raft state file after every test
 2016-08-13 17:44:56 +02:00
Vincent Demeester
28c20592b6 Merge pull request #25677 from friism/tweak-logout-message 
tweak logout message
 2016-08-13 09:37:56 +02:00
Vincent Demeester
7fddf51aa4 Merge pull request #25673 from SvenDowideit/remove-dead-link 
James' site has been dead for a while - removing links
 2016-08-13 09:35:04 +02:00
Tonis Tiigi
34f779dbc3 Clear raft state file after every test 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-08-12 17:30:37 -07:00
Michael Friis
f9443aa2a5 tweak logout message 
Signed-off-by: Michael Friis <friism@gmail.com>
 2016-08-12 17:00:06 -07:00
Michael Crosby
2faeebc750 Merge pull request #24311 from ShevYan/incorrect-comments-in-dockerfile 
Dockerfile's comments for "Run the test suite" are out of date becaus…
 2016-08-12 15:53:06 -07:00
Dieter Reuter
5907e4a872 Fix build deb for ARMv6 
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
 2016-08-13 00:40:29 +02:00
Michael Crosby
05d1dcfca2 Merge pull request #23116 from glensc/mkimage-pld 
add script to make base image for PLD Linux
 2016-08-12 15:38:36 -07:00
Charles Smith
84ef31a79c Merge pull request #25420 from sfsmithcha/add_networking_guide 
per @mavenugo , merging after addressing comments
add overlay networking guide
 2016-08-12 15:29:34 -07:00
Charles Smith
e56dd0e0e7 add overlay networking guide 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-12 15:18:21 -07:00
Michael Crosby
2a10899c16 Merge pull request #25216 from aanand/deploy-error-when-not-in-swarm-mode 
Better error on 'docker deploy' when not in Swarm mode
 2016-08-12 14:17:47 -07:00
Sven Dowideit
a9b08f3102 James' site has been dead for a while - removing links 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-08-12 21:16:57 +00:00
Charles Smith
ccf3dd85f0 Merge pull request #25135 from sfsmithcha/add_overlay_networking_note 
per @mavenugo , merging after addressing his comments:
add swarm mode overlay networking security model
 2016-08-12 13:25:07 -07:00
Charles Smith
cc5debcb2e add overlay networking security model node 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-12 13:17:24 -07:00
Brian Goff
838db8852c Merge pull request #25669 from dlech/patch-2 
Move export from image commands to container commands
 2016-08-12 15:52:07 -04:00
Brian Goff
c6e3818dd1 Merge pull request #24814 from samuelkarp/awslogs 
awslogs: Record log line insert order for sorting
 2016-08-12 15:51:06 -04:00
Michael Crosby
5632768a0f Merge pull request #22208 from msabansal/staticip 
Enabling specifying static ip for predefined network on windows
 2016-08-12 11:39:25 -07:00
Michael Crosby
2c50035f93 Merge pull request #24717 from icaoweiwei/patch_2016-07-16_1 
Add output of integer argument
 2016-08-12 10:54:01 -07:00
Michael Crosby
5dbdc321dc Merge pull request #25657 from thaJeztah/update-image-load-api-docs 
Update API docs example for image load response
 2016-08-12 10:29:01 -07:00
Michael Crosby
a86b2376a0 Merge pull request #25070 from yongtang/24881-label-containers-with-stack-name 
Label containers with stack name when deploying stack/bundle
 2016-08-12 10:20:06 -07:00
David Lechner
43c8cc7bb4 Move export from image commands to container commands 
The export command operates on containers, not images, so it should be listed under the container commands, not the image commands.

Signed-off-by: David Lechner <david@lechnology.com>
 2016-08-12 12:15:32 -05:00
Tõnis Tiigi
f4646196b6 Merge pull request #25668 from LK4D4/remove_rewrite 
hack/vendor.sh: remove old hacks for etcd
 2016-08-12 10:12:50 -07:00
Brian Goff
b0431d63dc Merge pull request #25635 from dperny/rate-limit-swarm-pull-log 
Rate limit logspam during docker service pulls
 2016-08-12 13:06:39 -04:00
Tõnis Tiigi
b08a1c3fe4 Merge pull request #25660 from justincormack/no-fuse-dev 
Do not create /dev/fuse by default
 2016-08-12 10:05:16 -07:00
Michael Crosby
be045ee2da Merge pull request #25628 from cpuguy83/carry_21567_filter_vol_by_label 
Carry 21567 filter vol by label
 2016-08-12 09:43:45 -07:00
Michael Crosby
34cc19f670 Merge pull request #25509 from Microsoft/jjh/23079 
Windows: Block ReFS file systems
 2016-08-12 09:32:22 -07:00
Alexander Morozov
6623a5342c hack/vendor.sh: remove old hacks for etcd 
etcd uses standard vendoring now

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-08-12 08:50:52 -07:00
Vincent Demeester
64f83cee43 Merge pull request #25568 from thaJeztah/enhance-string-truncate 
Implement stringutils.Ellipsis()
 2016-08-12 17:19:50 +02:00
Justin Cormack
39ecc08f32 Do not create /dev/fuse by default 
This device is not required by the OCI spec.

The rationale for this was linked to docker/docker#2393

So a non functional /dev/fuse was created, and actual fuse use still is
required to add the device explicitly. However even old versions of the JVM
on Ubuntu 12.04 no longer require the fuse package, and this is all not
needed.

See also https://github.com/opencontainers/runc/pull/983 although this
change alone stops the fuse device being created.

Tested and does not change actual ability to use fuse.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-12 12:33:42 +01:00
Sebastiaan van Stijn
419d2ad0f8
Update API docs example for image load response 
Commit 353af0b3ec updated
the `/image/load` endpoint to consistendly return
JSON, but did not update the associated documentation.

This updates the example response in the documentation
to match the actual response.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-12 11:57:34 +02:00
Sebastiaan van Stijn
d8240c8e27 Merge pull request #25564 from coolljt0725/fix_inspect_network 
Fix inspect network show gateway with mask
 2016-08-12 11:11:09 +02:00
Vincent Demeester
4f20721c9a Merge pull request #25643 from aaronlehmann/vendor-swarmkit-etcd 
Vendor new swarmkit and etcd/raft
 2016-08-12 11:10:58 +02:00
Vincent Demeester
353af0b3ec Merge pull request #25557 from yongtang/25529-image-load-api 
Return `application/json` for image/load API (quiet=1)
 2016-08-12 11:07:43 +02:00
Tibor Vass
57cf20c2ca Merge pull request #25642 from anusha-ragunathan/plugin-shutdown-lock 
Fix deadlock on plugin shutdown.
 2016-08-11 21:07:34 -07:00
Tibor Vass
a9a6d4e214 Merge pull request #25646 from tiborvass/fix-network-flag-on-service-update 
Remove --network-add and --network-rm flags from service update
 2016-08-11 21:06:28 -07:00
Madhu Venugopal
7d6f671b23 Merge pull request #25648 from docker/libn-bump 
Vendoring libnetwork for 1.12.1-rc1
 2016-08-12 08:54:13 +05:30
Tibor Vass
3a7e90c743 Remove --network-add and --network-rm flags from service update 
These flags were not supported (daemon returns an error), and it was an
oversight. They were not present in completion scripts.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 19:37:21 -07:00
Anusha Ragunathan
4d009084de Fix deadlock on plugin shutdown. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-08-11 19:36:32 -07:00
Santhosh Manohar
b9c9fa2855 Vendoring libnetwork for 1.12.1-rc1 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-08-11 18:44:32 -07:00