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

31289 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Demeester
613334eb50 Merge pull request #31736 from mlaventure/update-runc 
Update runc to 9c2d8d184e5da67c95d601382adf14862e4f2228
 2017-03-12 10:52:32 +01:00
Sebastiaan van Stijn
8b02a15d52 Merge pull request #31176 from adshmh/29662-stack-deploy-error-if-external-combined-with-other-volume-options 
stack deploy exits with error if both 'external' and other options are specified for a volume
 2017-03-11 01:59:43 +01:00
Tibor Vass
e10f9db26d Merge pull request #30047 from duglin/distError 
Add the mediaType to the error
 2017-03-10 16:44:49 -08:00
Tibor Vass
43f8bce876 Merge pull request #31743 from aaronlehmann/vendor-swarmkit-0e2d9eb 
Vendor swarmkit 0e2d9eb
 2017-03-10 16:33:15 -08:00
Kenfe-Mickael Laventure
6cea6d40fc Update runc to 9c2d8d184e5da67c95d601382adf14862e4f2228 
This fix a conflict with systemd daemon-reload (see
https://github.com/opencontainers/runc/pull/1344)

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-10 14:07:56 -08:00
Victor Vieux
b6c5b4730b Merge pull request #31739 from mlaventure/update-containerd 
Update containerd to 9f68f96b8c0746e254b52bc1defcf7cc0c1a62eb
 2017-03-10 14:04:53 -08:00
Aaron Lehmann
79bf23845b Vendor swarmkit 0e2d9eb 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-10 11:15:44 -08:00
Brian Goff
c29c2a9a70 Merge pull request #31679 from allencloud/put-secret-in-swarm-thing 
move secret into swarm thing in swagger
 2017-03-10 13:50:25 -05:00
Brian Goff
05e7f956bd Merge pull request #31532 from aboch/vnd 
Vendoring libnetwork @1a01921
 2017-03-10 12:55:19 -05:00
Kenfe-Mickael Laventure
07ad8c6640 Update containerd to 9f68f96b8c0746e254b52bc1defcf7cc0c1a62eb 
This include ensure that containerd GRPC healthcheck service is
register before the restore process is done as this can take a while.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-10 09:16:12 -08:00
Brian Goff
2c2983cd8e Merge pull request #31665 from mlaventure/aufs-lsof-oob 
Remove aufs debugEBusy()
 2017-03-10 11:51:14 -05:00
Justin Cormack
400d154737 Merge pull request #31703 from jen20/solaris-cflags 
pkg/system: Set appropriate CFLAGS on Solaris
 2017-03-10 14:34:53 +00:00
Sebastiaan van Stijn
61f7f0fc9e Merge pull request #31730 from thaJeztah/cherry-autoremove-it 
Add integration tests for client- and daemon-side auto-remove
 2017-03-10 15:00:14 +01:00
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
b3e4412ab4
Add integration tests for client- and daemon-side auto-remove 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 32dbb5c465)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-10 11:04:00 +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
allencloud
6918624985 move secret into swarm thing in swagger 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-03-10 10:20:55 +08: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
eac66b67be Remove aufs debugEBusy() 
Since it was introduced no reports were made and lsof seems to cause
issues on some systems.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-09 14:35:13 -08: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
James Nugent
4683f588ce pkg/system: Set appropriate CFLAGS on Solaris 
The cgo in `meminfo_solaris.go` initializes variables in for loops, and
therefore requires a `-std=c99` `CFLAG` in order to compile (at least on
modern SmartOS).

Signed-off-by: James Nugent <james@jen20.com>
 2017-03-09 13:40:05 -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